diff --git a/.claude/skills/orca-profiles/SKILL.md b/.claude/skills/orca-profiles/SKILL.md index 259564e063..3b2130660f 100644 --- a/.claude/skills/orca-profiles/SKILL.md +++ b/.claude/skills/orca-profiles/SKILL.md @@ -58,6 +58,9 @@ Paths below are relative to this skill. Commands run from the repository root. 9. **Run the full profile checks before reporting completion.** A vendor-scoped pass is only a development loop. Review also covers version bumps, assets, non-default processes and hardware tuning that CI cannot establish. +10. **One all-printer preset per product; color is a runtime property, never a preset.** Never ship + presets that differ only by color — CI accepts them, so this is a review call. See + [color is a runtime property](references/filament-profiles.md#color-is-a-runtime-property). ## Creating or modifying a profile @@ -107,6 +110,7 @@ Paths below are relative to this skill. Commands run from the repository root. | A setting has no effect | Key spelling/type, `handle_legacy`, or a config key placed on a `machine_model` | | A preset exists but is not selectable | Index registration, `instantiation`, installation and compatibility | | A filament is missing, duplicated, or matches the wrong spool | [Compatibility and alias shadowing](references/filament-profiles.md#compatible_printers); [ids](references/ids.md) | +| Presets differ only by color, or an all-printer library preset lacks `@System` | [Color is a runtime property](references/filament-profiles.md#color-is-a-runtime-property) | | A bed temperature is ignored | [Plate-specific temperature keys](references/filament-profiles.md#bed-temperature-is-twelve-keys-not-one) | | A change is absent from the running app | Version bump and [installed profile location](references/validation.md#testing-in-the-app) | | A check fails | [Error → remedy](references/validation.md#error--remedy) | diff --git a/.claude/skills/orca-profiles/references/filament-profiles.md b/.claude/skills/orca-profiles/references/filament-profiles.md index d6679d9122..873e2a6510 100644 --- a/.claude/skills/orca-profiles/references/filament-profiles.md +++ b/.claude/skills/orca-profiles/references/filament-profiles.md @@ -52,6 +52,15 @@ a brand means adding a folder here; the folder name is a directory label only collection, so there is no duplicate-name error. - You may inherit from an instantiated preset as well as from a base; it is common. +## Color is a runtime property + +`filament_id` identifies a product, not a color; filament sync/AMS reads the color from the spool at +runtime. A product ships one all-printer preset and the color is chosen at runtime — never a sibling +preset that differs only by color. A material family (PLA vs PLA Matte vs PLA Silk) is a new product; a +color is not. A printer tune keeps the product alias and does not multiply per color either. + +CI does not catch this — per-color presets pass `check` — so it is a review call. + ## The two most common contributions **A printer vendor tuning a generic.** Keep the `Generic X` base name so the alias shadows the library diff --git a/.claude/skills/orca-profiles/references/naming.md b/.claude/skills/orca-profiles/references/naming.md index 502863f0c4..cad82ebb6b 100644 --- a/.claude/skills/orca-profiles/references/naming.md +++ b/.claude/skills/orca-profiles/references/naming.md @@ -35,9 +35,10 @@ toolhead, a multi-material build) may drop the suffix — still an exact referen ## `process` `mm @` — [process-profiles.md](process-profiles.md#naming) has the -quality ladder and the `fdm_process_*` base names. The `@` is a human label, not a reference: it -usually does not equal a real variant, and compatibility comes from the resolved `compatible_printers` -list or condition. +quality ladder and the `fdm_process_*` base names. The quality label stays before `@` and the printer +target after it: a printer model in the quality slot leaves the tier undescribed. The `@` is a +human label, not a reference: it usually does not equal a real variant, and compatibility comes from the +resolved `compatible_printers` list or condition. ## `filament` @@ -46,12 +47,41 @@ to the first `@`; the target half is a label except for reserved forms: - `@base` — a non-instantiated product root. `@base` is convention; a base is really identified by `instantiation: "false"` and no `setting_id` ([the three-part shape](filament-profiles.md#the-three-part-shape)). -- `@System` — the OrcaFilamentLibrary selectable shim. The literal `Generic @System` is - load-bearing for 3MF/project recovery, beyond the alias rule ([alias shadowing](filament-profiles.md#alias-shadowing)). +- `@System` — the OrcaFilamentLibrary selectable shim, and the convention for an all-printer product + (` @System`, empty `compatible_printers`); not enforced, so a deviation is worth a review + comment. The literal `Generic @System` is load-bearing for 3MF/project recovery, beyond the + alias rule ([alias shadowing](filament-profiles.md#alias-shadowing)). - `@`, `@ `, `@ nozzle` — printer tunes, BBL's shape. Other vendors differ (a bare model, a printer serial, Creality's `@-all`). Specificity is judged from `compatible_printers`, not the name ([one variant, one profile](filament-profiles.md#overlapping-coverage-one-variant-one-profile-per-product)). +- Color is not part of the product name: ` ` presets are not authored; the color is + chosen at runtime + ([color is a runtime property](filament-profiles.md#color-is-a-runtime-property)). + +## Checking names + +Check every newly added profile's `name` against its type and role: model, selectable preset or base. +Apply the same checks to an intentional name change. The human-readable naming shapes are not enforced +by `check`: inspect the added or renamed profiles in the diff, using neighbouring names as context and +following the bundle's established style where the type-specific conventions allow variation. + +For bases (`instantiation: "false"`), use the type-specific conventions: + +| Type | Base names | +| --- | --- | +| `machine` | `fdm_machine_common`, `fdm__common`, or an established machine-family base name | +| `process` | `fdm_process_*`, including shared roots and per-layer-height / per-nozzle bases such as `fdm_process_single_0.20` | +| `filament` | `fdm_filament_*` material roots or ` @base` product roots | + +Shared base names across bundles are intentional, including product roots such as `Fiberon PA6-CF @base`. +Investigate a newly authored base that retains an unrelated selectable preset's name from a copy. + +**Name uniqueness is checked by CI.** `check_preset_name_uniqueness` checks type + name within each +bundle. `check_machine_model_name_uniqueness` checks model names across the entire tree, even with +`--vendor`: `Preset::get_printer_type` matches `printer_model` against all vendors' models and returns +the first match, so a duplicate makes lookup depend on vendor order. Both run as part of +`python3 scripts/orca_profile_tool.py check`. ## Not the same as the filename diff --git a/.claude/skills/orca-profiles/references/review-checklist.md b/.claude/skills/orca-profiles/references/review-checklist.md index 43dc5091f8..1d49cf2524 100644 --- a/.claude/skills/orca-profiles/references/review-checklist.md +++ b/.claude/skills/orca-profiles/references/review-checklist.md @@ -15,7 +15,9 @@ The table highlights gaps that need human review. What CI *does* run: | Whether the intended default survived compatibility selection | The sweep can select a different compatible preset | | A dangling `compatible_printers` inside an `instantiation: "false"` base | A base never becomes a `Preset`, so the reference check never sees it (a bad `inherits` in a base *is* caught) | | A `renamed_from` whose old name is still a live preset | The redirect is inert while a live preset carries that name | +| A preset differentiated only by color, or an all-printer library preset without `@System` | Per-color presets split one product across ids and the selector fills with near-duplicates; CI stays green | | Per-extruder vector length on a multi-nozzle printer | Silently padded (with the **first** value) or truncated | +| A name that ignores its type's convention — a model in a `process` quality slot, or an unrelated target label left in a copied preset | The selector misrepresents the preset's quality or intended printer | ## 1. Was the vendor `version` bumped? @@ -168,6 +170,15 @@ vendor, and a filename that disagrees with the preset's `name` (common; the load Check for Windows-invalid characters, reserved device names, trailing path-component spaces/dots, and case mismatches in `sub_path` or asset paths. See [cross-platform paths](validation.md#cross-platform-paths). +## 16. Do the preset names follow the conventions? + +Check **every newly added profile and intentional name change**, including models and bases, +against [the naming conventions](naming.md#checking-names). Preserve shipped names during +ordinary tuning; renaming a shipped selectable preset requires the migration in item 4. + +*Why:* CI checks name uniqueness, but does not enforce the naming conventions. Catch naming +mistakes before the names ship and existing projects depend on them. + --- ## Reporting the review diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index ed106ec65e..24317b0add 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -413,6 +413,14 @@ jobs: GH_TOKEN: ${{ github.token }} run: | api="$GITHUB_API_URL/repos/$GITHUB_REPOSITORY/actions/caches" + # The save step reports success even when its tar failed, so keep + # the older entries unless the new one is listed. + if ! curl -sSf -H "Authorization: Bearer $GH_TOKEN" \ + "$api?ref=$GITHUB_REF&key=$CCACHE_ENTRY" \ + | jq -e --arg entry "$CCACHE_ENTRY" 'any(.actions_caches[]; .key == $entry)' > /dev/null; then + echo "$CCACHE_ENTRY was not saved; keeping the older entries." + exit 0 + fi curl -sSf -H "Authorization: Bearer $GH_TOKEN" \ "$api?ref=$GITHUB_REF&key=ccache-$CCACHE_LEG-&per_page=100" \ | jq -r --arg prefix "ccache-$CCACHE_LEG-" --argjson run "$GITHUB_RUN_ID" \ diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml index 85458615b4..2ea72d0773 100644 --- a/.github/workflows/build_orca.yml +++ b/.github/workflows/build_orca.yml @@ -798,6 +798,13 @@ jobs: env: GH_TOKEN: ${{ github.token }} run: | + # The save step reports success even when its tar failed, so keep + # the older entries unless the new one is listed. + if ! gh cache list --ref "$GITHUB_REF" --key "$CCACHE_ENTRY" --json key \ + | jq -e --arg entry "$CCACHE_ENTRY" 'any(.[]; .key == $entry)' > /dev/null; then + echo "$CCACHE_ENTRY was not saved; keeping the older entries." + exit 0 + fi gh cache list --ref "$GITHUB_REF" --key "ccache-$CCACHE_LEG-" --limit 100 --json id,key \ | jq -r --arg prefix "ccache-$CCACHE_LEG-" --argjson run "$GITHUB_RUN_ID" \ '.[] | select((.key | ltrimstr($prefix) | split("-")[0] | tonumber?) < $run) | .id' \ diff --git a/.github/workflows/parity_nightly.yml b/.github/workflows/parity_nightly.yml index 79f5c9b514..44937fdad5 100644 --- a/.github/workflows/parity_nightly.yml +++ b/.github/workflows/parity_nightly.yml @@ -5,8 +5,9 @@ # re-sliced on its own to see whether it changes the G-code # harness - the GUI-vs-CLI parity harness (metrics only, never fails) # Both test the latest successful build_all.yml Linux AppImage from main, with -# sources checked out at the commit that build was made from. Nothing here -# gates a build or a PR. +# sources checked out at the commit that build was made from; a manual run can +# name another branch, or pin one build by its run id. Nothing here gates a +# build or a PR. name: Parity Nightly on: @@ -20,9 +21,13 @@ on: required: false default: "main" build_branch: - description: "branch whose latest successful build_all artifact to test" + description: "branch whose newest successful build_all artifact to test (a PR build is the PR merged into its base; sources are checked out at the PR head)" required: false default: "main" + build_run_id: + description: "build_all run id to test instead of build_branch's newest (same PR caveat)" + required: false + default: "" fixtures: description: "harness fixture ids, space-separated (empty = all)" required: false @@ -50,14 +55,53 @@ jobs: env: GH_TOKEN: ${{ github.token }} GH_REPO: ${{ github.repository }} + BRANCH: ${{ inputs.build_branch || 'main' }} + RUN_ID: ${{ inputs.build_run_id }} + SCHEDULED: ${{ github.event_name == 'schedule' }} run: | set -euo pipefail - gh run list --workflow build_all.yml \ - --branch "${{ inputs.build_branch || 'main' }}" \ - --status success --limit 1 --json databaseId,headSha \ - --jq '"run_id=\(.[0].databaseId)\nhead_sha=\(.[0].headSha)"' \ - >> "$GITHUB_OUTPUT" + if [ -n "$RUN_ID" ]; then + [[ $RUN_ID =~ ^[0-9]+$ ]] || { echo "build_run_id must be a numeric run id, got '$RUN_ID'" >&2; exit 1; } + # a pinned build is read directly, not through a search; it must come + # from this repository, because the later jobs check out its commit here + found=$(gh api "repos/$GH_REPO/actions/runs/$RUN_ID" --jq \ + 'select(.path == ".github/workflows/build_all.yml" and .conclusion == "success" + and .head_repository.full_name == env.GH_REPO) + | "\(.id) \(.head_sha) \(.created_at)"') + [ -n "$found" ] || { echo "run $RUN_ID is not a successful build_all run of $GH_REPO" >&2; exit 1; } + else + # GitHub serves filtered run listings (branch=, status=, head_sha=, ...) + # from a search index that has returned weeks-old results, while the + # unfiltered listing stays current, so list unfiltered and filter here. + # The repository check keeps out fork PRs whose branch has the same + # name. A feature branch is normally built only for its PR, and a PR + # build compiles the PR merged into its base rather than head_sha, so + # a build of the branch itself (push or dispatch) is preferred when + # the same page has one. + pick='([.workflow_runs[] | select(.head_branch == env.BRANCH and .conclusion == "success" + and .head_repository.full_name == env.GH_REPO)] + | map(select(.event != "pull_request"))[0] // .[0]) + | select(.) | "\(.id) \(.head_sha) \(.created_at)"' + # a page of 100 runs spans about a day and a half; a manual run may + # target a branch that last built weeks ago + pages=3 + if [ "$SCHEDULED" != true ]; then pages=20; fi + found="" + for page in $(seq "$pages"); do + found=$(gh api "repos/$GH_REPO/actions/workflows/build_all.yml/runs?per_page=100&page=$page" --jq "$pick") + if [ -n "$found" ]; then break; fi + done + [ -n "$found" ] || { echo "no successful $BRANCH build among the last $((pages * 100)) build_all runs; pass build_run_id to test an older one" >&2; exit 1; } + fi + read -r run_id head_sha created <<< "$found" + # the nightly fails rather than report on a stale build + if [ "$SCHEDULED" = true ] && [ $(( $(date +%s) - $(date -d "$created" +%s) )) -gt 172800 ]; then + echo "newest $BRANCH build $run_id is from $created, over 48 hours old" >&2 + exit 1 + fi + printf 'run_id=%s\nhead_sha=%s\n' "$run_id" "$head_sha" >> "$GITHUB_OUTPUT" cat "$GITHUB_OUTPUT" + echo "Testing build [$run_id](https://github.com/$GH_REPO/actions/runs/$run_id) of \`$head_sha\`, built $created" >> "$GITHUB_STEP_SUMMARY" effect: name: Override sweep effect stage (shard ${{ matrix.shard }}) diff --git a/CMakeLists.txt b/CMakeLists.txt index e3547281f0..85e558a18c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1122,7 +1122,6 @@ function(orcaslicer_copy_dlls target config postfix output_dlls) ${_out_dir}/swresample-5.dll ${_out_dir}/swscale-8.dll ${_out_dir}/avutil-59.dll - PARENT_SCOPE ) list(APPEND _dll_list ${_occt_staged}) set(${output_dlls} ${_dll_list} PARENT_SCOPE) diff --git a/docs/HLSD/deferred-page-construction.md b/docs/HLSD/deferred-page-construction.md new file mode 100644 index 0000000000..748ca65d52 --- /dev/null +++ b/docs/HLSD/deferred-page-construction.md @@ -0,0 +1,220 @@ +# Deferred Page Construction: High Level Design + +## Why it exists + +The main window is a notebook of tabs. When the first frame appears, one tab is on +screen and the others are not; some of them are opened later in the session, some +never, and some only exist for certain printers. Building a tab before the first frame +adds its cost to every startup, whether or not the tab is used. + +This subsystem builds a tab's panel the first time the tab is shown. It also builds the +remaining tabs while the user is idle after startup, in units of tens of milliseconds, +so a click that lands in the middle of one waits for that unit and no longer. Startup +pays only for what the first frame shows, and the other tabs are usually built before +anyone opens them. + +## The parts + +`src/slic3r/GUI/Lazy.hpp`, `LazyPage.hpp`, `StagedBuild.hpp` and `IdleScheduler.hpp/.cpp` +(with its wx-free `PrebuildQueue.hpp`) are independent. A holder can hold anything a +factory makes, a page is a holder with a placeholder widget, a staged object can live +outside a holder, and the scheduler knows none of them; it runs tasks, which `MainFrame` +makes from the holders. + +### Lazy: the holder + +Holds an object that a factory makes on first use, under a name for the log and a place +in the idle queue, both given by the owner. The header has no wx dependency; the busy +cursor for an on-demand build lives in `Lazy.cpp` and is skipped when there is no app, +so the holder is unit-tested. + +- `get()` is null until the object is completely built; `built()` says the same. +- `ensure()` builds whatever is left now, under a busy cursor, and returns the object, or + null in the two cases below. A click on an unbuilt tab or a first open of a dialog goes + through this, and it logs the units and time it took. +- `build_step()` runs one unit of construction and returns true while more remain. The + first unit is the factory call, and each later unit is one `StagedBuild` step if the + type has them. +- `when_built(fn)` runs `fn(object)` now if it exists, otherwise once it is built. +- `pending()` says whether the idle prebuild has work here: not built, and the factory + has not returned null. A null factory result is logged and the holder stays unbuilt. +- A unit that pumps the event loop cannot re-enter the holder; a nested `build_step()` + does nothing and a nested `ensure()` returns null. +- After a unit throws, the holder and the scheduler still run the next one. + +The holder does not own the object; its wx parent does, as for any window. A type with +one instance in the app derives from `LazyInstance`, which points at that instance's +holder (the holder registers itself, and a recreated `MainFrame`'s holder replaces the +old frame's) and gives the type the static entry points the rest of the app uses, +`T::if_built()`, `T::ensure()` and `T::when_built(fn)`. They return null, or do +nothing, while no holder exists, so a caller needs no `mainframe` check. + +`built()` is an atomic flag, since a job worker reads it through the statics +(`MainFrame::get_calibration_curr_tab()`); it is set after the object is complete. + +`LazyBase` is the holder's type-free interface (`name()`, `built()`, `pending()`, +`build_step()`, `prebuild_order()`) and is what the scheduler side sees. + +### LazyPage: the placeholder + +A `wxPanel` placed in the parent in place of the real panel, and a `Lazy` whose +factory makes the panel inside it (by default `new Panel(parent)`). The notebook needs a +page object for the tab to exist and for `show_device()` to insert and remove tabs by +pointer, and the placeholder is that object. `MainFrame` creates every page once, named +after its `TAB_ID_*`, and keeps it for the frame's life; `show_device()` only moves +pages in and out of the book. + +- `Show()` is forwarded to the panel, so a panel's own `Show()` override stays its + activation hook (refresh timers, machine sync) and `SelectPageByName()` works + unchanged. A show builds the panel unless the frame itself is still hidden, because + the book selects its first page as it is inserted; `MainFrame::Show()` shows the + current page again when the frame becomes visible, which builds it. +- `in_book()` says whether the parent notebook currently lists the page, and + `pending()` is that and not built, so a tab `show_device()` has taken out of the book + is not prebuilt. +- A panel built while its page is hidden stays hidden, and a completed panel gets the + dark-mode pass the frame ran before it existed. + +The Compare presets dialog is a holder without a page. `MainFrame` keeps a +`Lazy` whose factory constructs the dialog and binds its events, the +dialog derives from `LazyInstance`, and its callers use +`DiffPresetDialog::ensure()->show()` and `DiffPresetDialog::if_built()` like a tab's +callers do. Saving a preset refreshes the dialog only while it is shown, since `show()` +reloads the presets. + +### StagedBuild: construction in units + +A mixin for a panel whose constructor is too big to be one unit. The constructor builds +the skeleton (sizers, and the parts other code may touch) and queues the rest with +`add_build_step()`. `build_step()` runs one step, and `add_build_steps_of(child)` +forwards a child's steps so a nested panel is spread the same way; the parent is built +only once the child is, including steps the child queues later. Steps run in order, on +the main thread. A `Lazy` recognises a staged type at compile time and runs its steps +one per unit. + +Nothing may touch what a step builds before the last step has run. In practice: + +- nothing paints the panel before it is complete, since a panel built at idle is hidden + with its page and one built on demand finishes inside `ensure()` before the event loop + runs again; +- members created in steps are initialised to null in the header, so a partially built + panel can be destroyed; +- timers and event handlers that use step content check `built()` first + (`MonitorPanel::update_all()`, `CalibrationPanel::update_all()`), and a child's steps + are queued before anything in the constructor can fire such a handler; +- a destructor that disconnects from step content checks `built()` first; +- a constructor or step does not take focus while the panel is off screen + (`IsShownOnScreen()` before `SetFocus()`), since it may run while the user is typing + elsewhere; +- where a step's widgets must keep their place in a sizer that later steps also fill, the + constructor adds an empty slot sizer in that position and the step fills the slot + (`StatusBasePanel`). + +### IdleScheduler: when to build + +A task is any `LazyBase`: a name for the log, `pending()`, `build_step()` and +`prebuild_order()`. `PrebuildQueue` holds the tasks by order (equal order in the order +added) and runs a slice, the units of the first pending task until it completes, the +budget is spent on the clock it is given, or the interrupt predicate says input arrived. +It has no wx dependency and is unit-tested with a fake clock. A task whose work is gone +is passed over and stays in the queue, so a tab that `show_device()` removes and later +re-inserts is pending again. + +`IdleScheduler` drives the queue with the real clock, the app's input timestamp and the +Windows queue check, and logs each unit and slice. Each slice is a timer message: a +period of 250 ms while waiting for the user to go quiet, and a one-shot of zero after a +slice that left work, so the event loop dispatches whatever it has queued (paint, +timers, input) before the next slice runs. Chaining slices with `CallAfter` would not do +this: wx drains pending events fully before the next native message, on every platform. +On GTK the one-shot is 5 ms, because a due GLib timeout runs ahead of the redraw and +idle sources that paint and deliver posted events. +A slice runs only once the user has been idle for the quiet time, and the timer stops +itself once no task is pending. The tick period, quiet time and slice length are +constants in `IdleScheduler.cpp`. A unit cannot be interrupted once started, so the +largest unit bounds click latency on Windows; on the other platforms a click also waits +for the rest of the slice. A unit that pumps the event loop lets the timer fire inside +its own slice, and that tick does nothing. + +The tasks are made by their owners. `MainFrame::prebuild_pages_when_idle()` registers +every `LazyPage` the frame created, in or out of the book (`pending()` is false for a +page out of the book), the Compare presets holder, and the Prepare sidebar's settings +page from `ParamsPanel::settings_page_prebuild()`, whose first unit selects the default +tab if none is selected yet and whose later units build one option group each. +`show_device()` only restarts the timer. `MainFrame` owns the scheduler because it owns +everything the tasks build, and clearing the queue with the frame is what keeps a task +from outliving its object. + +Idle time comes from `GUI_App::FilterEvent`, which timestamps mouse and keyboard events +(`wxEVT_CATEGORY_USER_INPUT` minus command events, which all claim that category), and +`GUI_App::input_idle_ms()` reports it. On Windows a slice additionally refuses to start +when the message queue holds keyboard, button, touch or pen input. Mouse moves are +excluded because Windows synthesises one whenever a window appears under the cursor, +which every unit does. Other platforms use the timestamp alone. + +Once every registered page is built the timer is stopped and the subsystem costs +nothing. + +## Rules + +**What builds before the first frame.** The Prepare tab's plater, because `post_init()` +needs its GL canvas on screen to initialise OpenGL in every startup state, and the start +page the user configured. Home is built by the first `MainFrame::Show()`, Prepare's +settings page by selecting the tab. `post_init()` passes through the Prepare tab for GL +init under `Freeze()` with `MainFrame::select_prepare_for_gl_init()`, which changes the +selection without the page-changed event, so nothing else is built for that pass. + +**Reaching a lazy object.** A caller uses the type's own statics. `T::if_built()` may +return null and is for telling the object something it can live without (a rescale, a +colour change, a status update). `T::ensure()` builds the object and is for navigating +to it or for a caller that is about to show it. A caller that tells the object something +it would not fetch for itself on construction uses `T::when_built()`, which keeps the +message until the object exists. A panel that pulls its state when constructed (the Home +page requests the recent list on load, the Device tab reads the device manager on show) +is reached with `if_built()`; one that cannot pull gets `when_built()`. + +**Unit size.** A unit cannot be interrupted, so it should stay within the slice length on +a fast machine. A constructor above that is staged. A single widget above it is the +floor unless the widget itself is split. + +**Order.** Cheapest and most likely to be opened first, given where `MainFrame` creates +each holder. The settings page is 0 (the Prepare tab's own content), Home 10, Device 20 +(a Bambu user's usual second stop), Calibration 30, Multi-device 40, the web Device +view 50, Project 60 (a second WebView2 instance) and the Compare presets dialog 100; +steps of ten so a new tab takes a value between its neighbours without renumbering +them. `MainFrame::prebuild_pages_when_idle()` registers the tasks once, from +`post_init()`. + +**Never prebuilt.** A holder with a negative order, for a tab that few sessions open +and that costs more to build unasked than it saves (the Design tab), and plugin-provided +tabs, which are Python-side and not lazy pages. + +## Adopting it + +A lazy tab needs: + +1. The panel derived from `LazyInstance`, since a tab's panel has one instance. +2. A `LazyPage*` member in `MainFrame`, created once in `init_tabpanel()` with + its `TAB_ID_*` as the name, its place by the order rule (and a factory if + `new Panel(parent)` is not enough), added to `m_lazy_pages`, and used wherever the + tab is added to or looked up in the notebook. +3. Every use of the panel outside `MainFrame` going through one of the panel's statics, + chosen by the rule above. When converting an existing member, `grep` for it; the + compiler finds the rest. +4. A constructor that copes with the frame already existing and the user being busy + elsewhere, since `wxGetApp().mainframe` is set, the frame may be shown, and the user + may be typing when a lazy panel is built: no `SetFocus()` while off screen, and + whatever the constructor did through a `MainFrame` accessor before (a mode update, a + deferred URL) done in the constructor itself. + +To stage a heavy constructor, inherit `StagedBuild`, keep the skeleton in the constructor, +move the rest into `add_build_step()` lambdas in the original order, and follow the +staged-panel rules above. Measure the units. A step that is still one big widget has to +be split inside that widget or accepted as the floor. + +Verification is by log. `MainFrame::prebuild_pages_when_idle` lists the queue it +registered, `IdleScheduler::tick` reports each completed task by name at info level and +each slice and unit at debug level, and `Lazy::ensure` reports an object a user built +on demand with the units and time it took. A run from the configured start +page shows every registered page complete, in order, with no unit longer than intended. +A click on a tab mid-prebuild shows the finished panel with an `ensure` line for what was +left, and the slices resume for the remaining tasks once the user is idle again. diff --git a/docs/HLSD/keyboard-shortcuts.md b/docs/HLSD/keyboard-shortcuts.md new file mode 100644 index 0000000000..7cfc72c30f --- /dev/null +++ b/docs/HLSD/keyboard-shortcuts.md @@ -0,0 +1,132 @@ +# Keyboard Shortcuts + +## Why it exists + +Key events arrive in several windows (the main frame's char hook, the 3D canvases, the +gizmo manager and the object list), and the same keys are shown again in menu labels, +toolbar tooltips, gizmo names and the shortcuts dialog. The registry is the one table all +of them read. Each binding is defined once; dispatchers look key events up there, labels +are derived from it, and a change the user makes updates all of them. + +## Data model + +`KeyChord` (`src/slic3r/GUI/KeyChord.hpp`) is one key press: the key code as +`wxEVT_KEY_DOWN` reports it, plus the `wxMOD_*` modifiers held with it. It has two +text forms. The canonical one (`Ctrl+Shift+S`) is platform-neutral and doubles as the wx +accelerator string and the config format. The display one uses translated modifier +names and the command and option glyphs on macOS. `KeyChord::from_event()` turns any wx +key event into the same key code and modifiers, so a chord recorded in the dialog is +equal to the chord a dispatcher builds from the key press. + +`Shortcut` is the enum of every user-facing binding. `shortcut_table` in +`src/slic3r/GUI/Shortcuts.cpp` gives each one a config key, a description, a context +mask, a default chord, a `repeatable` flag and a `modifier_variants` flag, in the order +the dialog lists them; a `static_assert` keeps the table and the enum in step. + +`ShortcutRegistry` overlays the user's overrides on the defaults and keeps a +chord-to-shortcut index for lookups. It reads and writes the `shortcuts` section of +`AppConfig`. Only overrides are stored, so a default can change between releases +without touching anyone's config; `none` records a shortcut the user unbound. + +## Contexts + +A key press is looked up in the context of the window that received it. + +| Context | Dispatcher | Examples | +|--------------|-----------------------------------------------------------|-------------------------------| +| `Global` | `MainFrame`'s `wxEVT_CHAR_HOOK`, before any child sees it | New project, camera views | +| `Plater` | `GLCanvas3D` of the 3D and assembly views | Arrange, gizmo activation | +| `Preview` | `GLCanvas3D` of the G-code preview | One-layer mode, jump to layer | +| `ObjectList` | the object list | Copy, delete, auto drop | +| `Painting` | `GLGizmosManager` while a painting gizmo is open | Circle, sphere, fill tools | + +A shortcut can belong to several contexts, which is how copy and paste are a single +binding for the canvas and the object list. Two shortcuts can share a chord when their +contexts do not overlap; `C` is the cut gizmo in the 3D view, the G-code window in the +preview and the circle tool while painting. A Global chord is dispatched before every +other context, so the dialog treats it as conflicting with all of them. + +A Global shortcut has to include Ctrl or Alt or use a key that types nothing, since a +bare printable key in the frame hook would swallow that character in every text field. +The dialog refuses such chords and `ShortcutRegistry::load()` drops them from the config. +Space counts as typing. The speed dial's default is the one bare Space, and +`MainFrame` leaves it to a focused control that uses Space itself (text fields, buttons, +combo boxes), so it opens the dial from the canvases and the tab strip only. + +## Which event a chord matches + +Letters, digits and special keys match on `wxEVT_KEY_DOWN`. Its key codes do not depend +on the keyboard layout: the key labelled `Q` on an AZERTY keyboard and the key in the +same position under a Cyrillic layout both report `Q`. Numpad keys fold onto their main +keyboard equivalents, so `Ctrl+1` and `Ctrl+Numpad 1` are one binding. + +Punctuation matches on `wxEVT_CHAR`, because only the char event knows which character +a key produced under the active layout. `+` is Shift and `=` on a US keyboard and a key +of its own on a German one, and the binding means the character in both cases. The +canvas looks a key up on key-down first and, when nothing matched, once more on the char +event, for punctuation chords only. The dialog records chords the same way: a printable +non-alphanumeric key pressed with nothing but Shift is taken from the char event that +follows. + +wxGTK does not report key auto-repeat, so the canvases share one record of the keys +seen going down and swallow the repeats of every shortcut not marked `repeatable`. Zoom +and undo repeat, for example; a toggle such as Tab does not. The record is shared because +a shortcut can move the focus to another canvas while its key is still held; a key +released while no canvas had the focus is dropped on the next press. + +A few shortcuts have `modifier_variants`: Shift or Ctrl added to their binding selects a +step of the same action (1 mm and camera-space moves of the selection, five-step slider +moves). Only a binding without Shift or Ctrl of its own has steps, so no two bindings +share one. `ShortcutRegistry::match()` looks the exact chord up first and only then, when +nothing is bound to it, looks for such a shortcut whose binding is the chord minus those +modifiers, reporting which were added; a binding on Ctrl+Shift+key therefore wins over +the combined step. The Shift and Ctrl steps themselves are reserved. `step_owner()` names +the shortcut they belong to, the capture dialog refuses to assign them, and +`conflicts()` reports exact chords only. A binding made before its key became a stepping +key keeps its chord and shadows that one step. A move or rotation of the selection +started from the keyboard runs until the key that started it is released, or the +canvas loses focus, so a held key is one undo step. + +## Labels + +Menu labels, toolbar tooltips, gizmo names, the context menu and the shortcuts dialog +read the registry, so a rebinding shows up in all of them. Each tracked menu item keeps +its base label; `MainFrame::update_shortcut_labels()` appends the current binding +again after an edit, which also installs the new wx accelerator. + +A chord that is unsafe as a menu accelerator, meaning a bare printable key, is appended +to the label as plain text so the menu cannot take it away from text fields. The macOS +edit menu shows its clipboard and undo entries that way, because a system-menu key +equivalent for Cmd+C would run instead of the text field's own copy. + +On macOS the object list receives no key events at all, so its bindings are installed as +a `wxAcceleratorTable`, regenerated from the registry after each edit. + +## Editing + +The shortcuts dialog has a page per context, each opening with a line that says when its +keys apply. A page lists the shortcuts under the headings of `section_table`, with the +fixed keys that cannot change (mouse buttons, the step modifiers, Esc, the digit keys +that pick a filament) sorted into the same sections. The mouse drag rows describe the +camera actions chosen in Preferences; their button opens Preferences > Control with that +option scrolled into view and focused, instead of editing a key. +Editing a row opens a capture dialog that records the next chord, names the shortcuts it +would take the chord from, and on confirmation unbinds those and binds this one. +Resetting a row asks the same question when its default is now held by another +shortcut, so a reset cannot leave two shortcuts on one chord. Each change is written to +the config at once and pushed to the menus, tooltips and accelerator tables through +`GUI_App::on_shortcuts_changed()`. The dialog opens from the Help menu and Preferences > +Control on the Global page, and from the `?` key on the page of the view that received it. + +## Adding a shortcut + +1. Add the enum value to `Shortcut` and its row to `shortcut_table`, in the position + the dialog should list it; the row's section heading is the `section_table` entry + above it, so a new section needs an entry there too. Pick a default that does not + collide inside its contexts; the `[Shortcuts]` tests check every default against the + others. +2. Handle it in the dispatcher of its context: `MainFrame::handle_global_shortcut`, + `GLCanvas3D::handle_shortcut`, `ObjectList::dispatch_shortcut`, or a gizmo's + `on_tool_shortcut`. A gizmo that opens on a key sets `m_shortcut` in its constructor. +3. Where the UI shows the key, ask the registry (`display()` for tooltips, + `accelerator()` for menu labels); no label holds a literal key name. diff --git a/localization/i18n/OrcaSlicer.pot b/localization/i18n/OrcaSlicer.pot index 79d50e844c..fa09e82104 100644 --- a/localization/i18n/OrcaSlicer.pot +++ b/localization/i18n/OrcaSlicer.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-09-18 15:50+0800\n" +"POT-Creation-Date: 2026-09-22 17:02+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -5554,10 +5554,13 @@ msgctxt "Camera View" msgid "Right" msgstr "" -msgid "Add" +msgid "Add plate" msgstr "" -msgid "Add plate" +msgid "Split to objects" +msgstr "" + +msgid "Add" msgstr "" msgid "Auto orient all/selected objects" @@ -5572,9 +5575,6 @@ msgstr "" msgid "Arrange objects on selected plates" msgstr "" -msgid "Split to objects" -msgstr "" - msgid "Assembly View" msgstr "" @@ -5629,6 +5629,9 @@ msgstr "" msgid "Wireframe" msgstr "" +msgid "X-Ray" +msgstr "" + msgid "Realistic View" msgstr "" @@ -6158,9 +6161,6 @@ msgstr "" msgid "Preferences" msgstr "" -msgid "Open speed dial..." -msgstr "" - msgctxt "Menu" msgid "Edit" msgstr "" @@ -6168,6 +6168,9 @@ msgstr "" msgid "View" msgstr "" +msgid "Open Speed Dial" +msgstr "" + msgid "Preset Bundle" msgstr "" @@ -7886,9 +7889,6 @@ msgstr "" msgid "Collapse sidebar" msgstr "" -msgid "Tab" -msgstr "" - #, possible-c-format, possible-boost-format msgid "Loading file: %s" msgstr "" @@ -8827,10 +8827,10 @@ msgstr "" msgid "With this option enabled, you can send a task to multiple devices at the same time and manage multiple devices." msgstr "" -msgid "Open the Speed Dial with the Space key" +msgid "Open the Speed Dial from the keyboard" msgstr "" -msgid "When enabled, pressing Space (with no other key held) opens the Speed Dial action search from any page." +msgid "When enabled, the Speed Dial keyboard shortcut (Space by default) opens the action search from any page." msgstr "" msgid "Recent actions" @@ -8956,6 +8956,15 @@ msgstr "" msgid "Set the action that dragging the right mouse button should perform." msgstr "" +msgid "Keyboard" +msgstr "" + +msgid "Keyboard shortcuts" +msgstr "" + +msgid "Choose the key for each action." +msgstr "" + msgid "Clear my choice on..." msgstr "" @@ -9049,10 +9058,38 @@ msgid "" "Set to 0 for unlimited frame rate." msgstr "" +msgid "Reuse the 3D scene while idle" +msgstr "" + +msgid "" +"Skips redrawing the 3D scene when only the mouse cursor moves over the viewport,\n" +"and reuses the previous frame's scene instead. Reduces GPU load.\n" +"Disable it if the viewport shows stale or missing contents.\n" +"\n" +"Takes effect immediately." +msgstr "" + +msgid "Skip unchanged frames" +msgstr "" + +msgid "" +"Skips drawing a frame altogether when it would be identical to the one already on screen.\n" +"Only applies to frames that reuse the 3D scene, so it needs Reuse the 3D scene while idle.\n" +"Disable it if a hover highlight, tooltip or animation stops updating.\n" +"\n" +"Takes effect immediately." +msgstr "" + msgid "Show FPS overlay" msgstr "" -msgid "Displays current viewport FPS in the top-right corner." +msgid "Displays rendering counts in the top-right corner of the viewport." +msgstr "" + +msgid "FPS: frames presented to the screen per second." +msgstr "" + +msgid "3D: frames per second that redrew the 3D scene." msgstr "" msgid "G-code Preview" @@ -9480,10 +9517,7 @@ msgstr "" msgid "Select which settings to be published in the 3MF file" msgstr "" -msgid "Publish 3MF Wiki" -msgstr "" - -msgid "Publish 3MF Video Guide" +msgid "Video Guide" msgstr "" msgid "Mixed filament - published as a whole when \"Enable\" above is selected" @@ -9675,6 +9709,12 @@ msgstr "" msgid "No wiki page for this action" msgstr "" +msgid "Show details" +msgstr "" + +msgid "Hide details" +msgstr "" + #, possible-c-format, possible-boost-format msgid "\"%s\" is a Developer setting. Enable Developer mode to edit it?" msgstr "" @@ -11373,65 +11413,37 @@ msgstr "" msgid "Configuration package changed" msgstr "" -msgid "Toolbar" -msgstr "" - -msgid "Objects list" -msgstr "" - -msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" -msgstr "" - -msgid "Paste from clipboard" -msgstr "" - -msgid "Show/Hide 3Dconnexion devices settings dialog" -msgstr "" - -msgid "Switch table page" -msgstr "" - -msgctxt "Keyboard Shortcut" -msgid "Space" -msgstr "" - -msgid "Open speed dial" -msgstr "" - -msgid "Run a Speed Dial favourite (while the Speed Dial is open)" -msgstr "" - -msgid "Show keyboard shortcuts list" -msgstr "" - -msgid "Global shortcuts" -msgstr "" - msgid "Pan View" msgstr "" msgid "Rotate View" msgstr "" -msgid "Middle mouse button" +#, possible-c-format, possible-boost-format +msgid "Use %s or %s, or a key that does not type a character." msgstr "" -msgid "Zoom View" +msgctxt "Keyboard Shortcut" +msgid "Key" msgstr "" -msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." +msgid "Left mouse" msgstr "" -msgid "Auto orients all objects on the active plate." +msgid "Available anywhere in the window, even while typing in a text field." msgstr "" -msgid "Collapse/Expand the sidebar" +msgid "Run a speed dial favorite while the dial is open" msgstr "" -msgid "Any arrow" +msgctxt "Keyboard Shortcut" +msgid "Tab" msgstr "" -msgid "Movement in camera space" +msgid "Switch to the next main tab" +msgstr "" + +msgid "Available while the 3D view on the Prepare tab has focus." msgstr "" msgid "Select a part" @@ -11443,120 +11455,28 @@ msgstr "" msgid "Select objects by rectangle" msgstr "" -msgctxt "Keyboard Shortcut" -msgid "Arrow Up" -msgstr "" - -msgid "Move selection 10mm in positive Y direction" -msgstr "" - -msgctxt "Keyboard Shortcut" -msgid "Arrow Down" -msgstr "" - -msgid "Move selection 10mm in negative Y direction" -msgstr "" - -msgctxt "Keyboard Shortcut" -msgid "Arrow Left" -msgstr "" - -msgid "Move selection 10mm in negative X direction" -msgstr "" - -msgctxt "Keyboard Shortcut" -msgid "Arrow Right" -msgstr "" - -msgid "Move selection 10mm in positive X direction" +msgid "Keyboard 1-9: set filament for object/part" msgstr "" msgid "Movement step set to 1mm" msgstr "" -msgid "Keyboard 1-9: set filament for object/part" +msgid "Movement in camera space" msgstr "" -msgid "Camera view - Default" +msgid "Middle mouse" msgstr "" -msgid "Camera view - Top" +msgid "Right mouse" msgstr "" -msgid "Camera view - Bottom" +msgid "Zoom View" msgstr "" -msgid "Camera view - Front" +msgid "Painting" msgstr "" -msgid "Camera view - Behind" -msgstr "" - -msgid "Camera Angle - Left side" -msgstr "" - -msgid "Camera Angle - Right side" -msgstr "" - -msgid "Select all objects" -msgstr "" - -msgid "Gizmo move" -msgstr "" - -msgid "Gizmo rotate" -msgstr "" - -msgid "Gizmo scale" -msgstr "" - -msgid "Gizmo place face on bed" -msgstr "" - -msgid "Gizmo cut" -msgstr "" - -msgid "Gizmo mesh boolean" -msgstr "" - -msgid "Gizmo FDM paint-on fuzzy skin" -msgstr "" - -msgid "Gizmo SLA support points" -msgstr "" - -msgid "Gizmo FDM paint-on seam" -msgstr "" - -msgid "Gizmo text emboss/engrave" -msgstr "" - -msgid "Gizmo measure" -msgstr "" - -msgid "Gizmo assemble" -msgstr "" - -msgid "Gizmo brim ears" -msgstr "" - -msgid "Zoom in" -msgstr "" - -msgid "Zoom out" -msgstr "" - -msgid "Toggle printable for object/part" -msgstr "" - -msgctxt "Keyboard Shortcut" -msgid "Tab" -msgstr "" - -msgid "Switch between Prepare/Preview" -msgstr "" - -msgid "Plater" +msgid "Available while a painting gizmo is open: supports, seam, fuzzy skin or color painting." msgstr "" msgid "Move: press to snap by 1mm" @@ -11568,13 +11488,17 @@ msgstr "" msgid "Support/Color Painting: adjust section position" msgstr "" -msgid "Gizmo" +msgid "Objects list" +msgstr "" + +msgid "Available while the object list has focus." msgstr "" msgid "Set extruder number for the objects and parts" msgstr "" -msgid "Delete objects, parts, modifiers" +msgctxt "Keyboard Shortcut" +msgid "Space" msgstr "" msgid "Select the object/part and press space to change the name" @@ -11586,42 +11510,47 @@ msgstr "" msgid "Select the object/part and mouse click to change the name" msgstr "" -msgid "Objects List" -msgstr "" - -msgid "Vertical slider - Move active thumb Up" -msgstr "" - -msgid "Vertical slider - Move active thumb Down" -msgstr "" - -msgid "Horizontal slider - Move active thumb Left" -msgstr "" - -msgid "Horizontal slider - Move active thumb Right" -msgstr "" - -msgid "On/Off one layer mode of the vertical slider" -msgstr "" - -msgid "On/Off G-code window" +msgid "Available while the 3D view on the Preview tab has focus." msgstr "" msgid "Move slider 5x faster" msgstr "" -msgctxt "Keyboard Shortcut" -msgid "Home" +msgid "Scroll slider 5x faster" msgstr "" -msgid "Horizontal slider - Move to start position" +msgid "Not customizable" msgstr "" -msgctxt "Keyboard Shortcut" -msgid "End" +#, possible-c-format, possible-boost-format +msgid "%s is assigned to %s. Reassign it to %s?" msgstr "" -msgid "Horizontal slider - Move to last position" +#, possible-c-format, possible-boost-format +msgid "The default %s is assigned to %s. Reassign it to %s?" +msgstr "" + +msgid "Global shortcuts also apply while typing." +msgstr "" + +msgid "A key that types a character cannot be a global shortcut." +msgstr "" + +msgid "Esc cancels, Enter confirms." +msgstr "" + +#, possible-c-format, possible-boost-format +msgid "" +"Press the new shortcut for\n" +"\"%s\"" +msgstr "" + +#, possible-c-format, possible-boost-format +msgid "Already used as a step of %s." +msgstr "" + +#, possible-c-format, possible-boost-format +msgid "Already assigned to %s. Press OK to reassign it." msgstr "" msgid "Release Note" @@ -15921,7 +15850,7 @@ msgstr "" msgid "Insert multiple preheat commands (e.g. M104.1). Only useful for Prusa XL. For other printers, please set it to 1." msgstr "" -msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." +msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_total_sec}, {print_time_day}, {print_time_hour}, {print_time_minute}, {print_time_sec} and {used_filament_length}." msgstr "" msgid "Start G-code" @@ -17330,12 +17259,36 @@ msgstr "" msgid "Total length of filament used in the print." msgstr "" -msgid "Print time (seconds)" +msgid "Print time (total seconds)" msgstr "" msgid "Total estimated print time in seconds. Replaced with actual value during post-processing." msgstr "" +msgid "Print time (days component)" +msgstr "" + +msgid "Estimated print time day component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (hours component)" +msgstr "" + +msgid "Estimated print time hour component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (minutes component)" +msgstr "" + +msgid "Estimated print time minute component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (seconds component)" +msgstr "" + +msgid "Estimated print time second component (normal mode). Replaced with actual value during post-processing." +msgstr "" + msgid "Filament length (meters)" msgstr "" @@ -19016,6 +18969,9 @@ msgstr "" msgid "Success!" msgstr "" +msgid "Generate API Key" +msgstr "" + msgid "Are you sure to log out?" msgstr "" @@ -19225,12 +19181,6 @@ msgstr "" msgid "Could not connect to Duet" msgstr "" -msgid "Connection to Ultimaker is working correctly." -msgstr "" - -msgid "Could not connect to Ultimaker" -msgstr "" - msgid "Unknown error occurred" msgstr "" @@ -19958,12 +19908,6 @@ msgstr "" msgid "Error: %s" msgstr "" -msgid "Show details" -msgstr "" - -msgid "Hide details" -msgstr "" - msgid "Version to install:" msgstr "" @@ -22542,6 +22486,12 @@ msgstr "" msgid "No binding for that field" msgstr "" +msgid "Enter a number" +msgstr "" + +msgid "Not a number" +msgstr "" + msgid "Primitive" msgstr "" @@ -22554,6 +22504,210 @@ msgstr "" msgid "Clear All" msgstr "" +msgctxt "Keyboard Shortcut" +msgid "Ins" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "Home" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "End" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "PgUp" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "PgDn" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "Arrow Left" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "Arrow Right" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "Arrow Up" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "Arrow Down" +msgstr "" + +msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" +msgstr "" + +msgid "Select all objects" +msgstr "" + +msgid "Paste from clipboard" +msgstr "" + +msgid "Toggle printable for object/part" +msgstr "" + +msgid "Move selection 10mm in negative X direction" +msgstr "" + +msgid "Move selection 10mm in positive X direction" +msgstr "" + +msgid "Move selection 10mm in positive Y direction" +msgstr "" + +msgid "Move selection 10mm in negative Y direction" +msgstr "" + +msgid "Rotate selection 45 degrees counterclockwise" +msgstr "" + +msgid "Rotate selection 45 degrees clockwise" +msgstr "" + +msgid "Gizmo move" +msgstr "" + +msgid "Gizmo rotate" +msgstr "" + +msgid "Gizmo scale" +msgstr "" + +msgid "Gizmo place face on bed" +msgstr "" + +msgid "Gizmo cut" +msgstr "" + +msgid "Gizmo mesh boolean" +msgstr "" + +msgid "Gizmo FDM paint-on supports" +msgstr "" + +msgid "Gizmo FDM paint-on seam" +msgstr "" + +msgid "Gizmo FDM paint-on fuzzy skin" +msgstr "" + +msgid "Gizmo multi-material painting" +msgstr "" + +msgid "Gizmo text emboss/engrave" +msgstr "" + +msgid "Gizmo measure" +msgstr "" + +msgid "Gizmo assemble" +msgstr "" + +msgid "Gizmo brim ears" +msgstr "" + +msgid "Vertical slider - Move active thumb Up" +msgstr "" + +msgid "Vertical slider - Move active thumb Down" +msgstr "" + +msgid "Horizontal slider - Move active thumb Left" +msgstr "" + +msgid "Horizontal slider - Move active thumb Right" +msgstr "" + +msgid "Horizontal slider - Move to start position" +msgstr "" + +msgid "Horizontal slider - Move to last position" +msgstr "" + +msgid "Camera view - Default" +msgstr "" + +msgid "Camera view - Top" +msgstr "" + +msgid "Camera view - Bottom" +msgstr "" + +msgid "Camera view - Front" +msgstr "" + +msgid "Camera view - Behind" +msgstr "" + +msgid "Camera Angle - Left side" +msgstr "" + +msgid "Camera Angle - Right side" +msgstr "" + +msgid "Camera view - Current plate" +msgstr "" + +msgid "Zoom in" +msgstr "" + +msgid "Zoom out" +msgstr "" + +msgid "Show/Hide 3Dconnexion devices settings dialog" +msgstr "" + +msgid "Show/Hide wireframe" +msgstr "" + +msgid "On/Off G-code window" +msgstr "" + +msgid "On/Off one layer mode of the vertical slider" +msgstr "" + +msgid "Switch between Prepare/Preview" +msgstr "" + +msgid "Collapse/Expand the sidebar" +msgstr "" + +msgid "Open the speed dial" +msgstr "" + +msgid "Reload the device page" +msgstr "" + +msgid "Show keyboard shortcuts list" +msgstr "" + +msgid "Slicing and printing" +msgstr "" + +msgid "Editing" +msgstr "" + +msgid "Placement" +msgstr "" + +msgid "Gizmos" +msgstr "" + +msgid "Sliders" +msgstr "" + +msgid "Painting tools" +msgstr "" + +msgid "Application" +msgstr "" + #: resources/data/hints.ini: [hint:Precise wall] msgid "Precise wall\nDid you know that turning on precise wall can improve precision and layer consistency?" msgstr "" diff --git a/localization/i18n/ca/OrcaSlicer_ca.po b/localization/i18n/ca/OrcaSlicer_ca.po index dedb57fff3..dbd0272542 100644 --- a/localization/i18n/ca/OrcaSlicer_ca.po +++ b/localization/i18n/ca/OrcaSlicer_ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-09-18 15:50+0800\n" +"POT-Creation-Date: 2026-09-22 17:02+0800\n" "PO-Revision-Date: 2025-03-15 10:55+0100\n" "Last-Translator: \n" "Language-Team: \n" @@ -6015,12 +6015,15 @@ msgctxt "Camera View" msgid "Right" msgstr "Dreta" -msgid "Add" -msgstr "Afegir" - msgid "Add plate" msgstr "Afegir placa" +msgid "Split to objects" +msgstr "Separar en objectes" + +msgid "Add" +msgstr "Afegir" + msgid "Auto orient all/selected objects" msgstr "Auto-orientació tots/seleccionats objectes" @@ -6033,9 +6036,6 @@ msgstr "Ordenar tots els objectes" msgid "Arrange objects on selected plates" msgstr "Ordenar els objectes en plaques seleccionades" -msgid "Split to objects" -msgstr "Separar en objectes" - msgid "Assembly View" msgstr "Vista de muntatge" @@ -6092,6 +6092,9 @@ msgstr "Contorn" msgid "Wireframe" msgstr "Malla alàmbrica" +msgid "X-Ray" +msgstr "" + # AI Translated msgid "Realistic View" msgstr "Vista realista" @@ -6634,9 +6637,6 @@ msgstr "Mostrar el contorn al voltant de l'objecte seleccionat a l'escena 3D" msgid "Preferences" msgstr "Preferències" -msgid "Open speed dial..." -msgstr "" - # AI Translated msgctxt "Menu" msgid "Edit" @@ -6645,6 +6645,9 @@ msgstr "Edita" msgid "View" msgstr "Vista" +msgid "Open Speed Dial" +msgstr "" + # AI Translated msgid "Preset Bundle" msgstr "Paquet de perfils" @@ -8469,10 +8472,6 @@ msgstr "Expandir la barra lateral" msgid "Collapse sidebar" msgstr "Replegar barra lateral" -# AI Translated -msgid "Tab" -msgstr "Pestanya" - #, c-format, boost-format msgid "Loading file: %s" msgstr "Carregant fitxer: %s" @@ -9510,10 +9509,10 @@ msgstr "Gestió multidispositiu" msgid "With this option enabled, you can send a task to multiple devices at the same time and manage multiple devices." msgstr "Amb aquesta opció habilitada, podeu enviar una tasca a diversos dispositius alhora i gestionar múltiples dispositius." -msgid "Open the Speed Dial with the Space key" +msgid "Open the Speed Dial from the keyboard" msgstr "" -msgid "When enabled, pressing Space (with no other key held) opens the Speed Dial action search from any page." +msgid "When enabled, the Speed Dial keyboard shortcut (Space by default) opens the action search from any page." msgstr "" msgid "Recent actions" @@ -9652,6 +9651,15 @@ msgstr "Arrossegament amb el botó dret del ratolí" msgid "Set the action that dragging the right mouse button should perform." msgstr "Estableix l'acció que ha de fer l'arrossegament amb el botó dret del ratolí." +msgid "Keyboard" +msgstr "" + +msgid "Keyboard shortcuts" +msgstr "" + +msgid "Choose the key for each action." +msgstr "" + msgid "Clear my choice on..." msgstr "Esborra la meva elecció a..." @@ -9776,13 +9784,40 @@ msgstr "" "Limita la velocitat de fotogrames de la vista per reduir la càrrega de la GPU i el consum.\n" "Establiu-ho a 0 per a una velocitat de fotogrames sense límit." +msgid "Reuse the 3D scene while idle" +msgstr "" + +msgid "" +"Skips redrawing the 3D scene when only the mouse cursor moves over the viewport,\n" +"and reuses the previous frame's scene instead. Reduces GPU load.\n" +"Disable it if the viewport shows stale or missing contents.\n" +"\n" +"Takes effect immediately." +msgstr "" + +msgid "Skip unchanged frames" +msgstr "" + +msgid "" +"Skips drawing a frame altogether when it would be identical to the one already on screen.\n" +"Only applies to frames that reuse the 3D scene, so it needs Reuse the 3D scene while idle.\n" +"Disable it if a hover highlight, tooltip or animation stops updating.\n" +"\n" +"Takes effect immediately." +msgstr "" + # AI Translated msgid "Show FPS overlay" msgstr "Mostrar la superposició d'FPS" -# AI Translated -msgid "Displays current viewport FPS in the top-right corner." -msgstr "Mostra els FPS actuals de la vista a la cantonada superior dreta." +msgid "Displays rendering counts in the top-right corner of the viewport." +msgstr "" + +msgid "FPS: frames presented to the screen per second." +msgstr "" + +msgid "3D: frames per second that redrew the 3D scene." +msgstr "" # AI Translated msgid "G-code Preview" @@ -10261,13 +10296,8 @@ msgstr "Publicar 3MF..." msgid "Select which settings to be published in the 3MF file" msgstr "Seleccioneu quines opcions es publicaran al fitxer 3MF" -# AI Translated -msgid "Publish 3MF Wiki" -msgstr "Wiki de Publicar 3MF" - -# AI Translated -msgid "Publish 3MF Video Guide" -msgstr "Guia en vídeo de Publicar 3MF" +msgid "Video Guide" +msgstr "" # AI Translated msgid "Mixed filament - published as a whole when \"Enable\" above is selected" @@ -10469,6 +10499,13 @@ msgstr "" msgid "No wiki page for this action" msgstr "" +msgid "Show details" +msgstr "Mostra detalls" + +# AI Translated +msgid "Hide details" +msgstr "Amagar els detalls" + #, c-format, boost-format msgid "\"%s\" is a Developer setting. Enable Developer mode to edit it?" msgstr "" @@ -12336,41 +12373,6 @@ msgstr "El paquet de configuració s'ha canviat a la Guia de Configuració anter msgid "Configuration package changed" msgstr "S'ha canviat el paquet de configuració" -msgid "Toolbar" -msgstr "Barra d’eines" - -msgid "Objects list" -msgstr "Llista d'objectes" - -msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" -msgstr "Importar dades de geometria des de fitxers STL/STEP/3MF/OBJ/AMF" - -msgid "Paste from clipboard" -msgstr "Enganxa des del porta-retalls" - -msgid "Show/Hide 3Dconnexion devices settings dialog" -msgstr "Mostrar/Amagar quadre de diàleg Configuració de Dispositius 3Dconnexion" - -msgid "Switch table page" -msgstr "Canviar de pàgina de taula" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Space" -msgstr "Espai" - -msgid "Open speed dial" -msgstr "" - -msgid "Run a Speed Dial favourite (while the Speed Dial is open)" -msgstr "" - -msgid "Show keyboard shortcuts list" -msgstr "Mostrar la llista de dreceres de teclat" - -msgid "Global shortcuts" -msgstr "Dreceres Globals" - # AI Translated msgid "Pan View" msgstr "Desplaçament de la vista" @@ -12379,28 +12381,33 @@ msgstr "Desplaçament de la vista" msgid "Rotate View" msgstr "Rotació de la vista" -# AI Translated -msgid "Middle mouse button" -msgstr "Botó central del ratolí" +#, c-format, boost-format +msgid "Use %s or %s, or a key that does not type a character." +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "Key" +msgstr "" + +msgid "Left mouse" +msgstr "" + +msgid "Available anywhere in the window, even while typing in a text field." +msgstr "" + +msgid "Run a speed dial favorite while the dial is open" +msgstr "" # AI Translated -msgid "Zoom View" -msgstr "Zoom de la vista" +msgctxt "Keyboard Shortcut" +msgid "Tab" +msgstr "Tab" -msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." -msgstr "Orienta/alinea automàticament els objectes seleccionats o tots els objectes. Si hi ha objectes seleccionats, només orientarà/alinearà els seleccionats. En cas contrari, orientarà/alinearà tots els objectes del projecte actual." +msgid "Switch to the next main tab" +msgstr "" -msgid "Auto orients all objects on the active plate." -msgstr "Orienta/alinea automàticament tots els objectes de la placa actual." - -msgid "Collapse/Expand the sidebar" -msgstr "Replegar/Expandir barra lateral" - -msgid "Any arrow" -msgstr "Qualsevol fletxa" - -msgid "Movement in camera space" -msgstr "Moviment a l'espai de la càmera" +msgid "Available while the 3D view on the Prepare tab has focus." +msgstr "" msgid "Select a part" msgstr "Seleccionar una peça" @@ -12411,127 +12418,30 @@ msgstr "Seleccionar múltiples objectes" msgid "Select objects by rectangle" msgstr "Seleccionar objectes per rectangle" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Up" -msgstr "Fletxa amunt" - -msgid "Move selection 10mm in positive Y direction" -msgstr "Moure la selecció 10 mm en direcció Y positiva" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Down" -msgstr "Fletxa avall" - -msgid "Move selection 10mm in negative Y direction" -msgstr "Moure la selecció 10 mm en direcció Y negativa" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Left" -msgstr "Fletxa esquerra" - -msgid "Move selection 10mm in negative X direction" -msgstr "Moure la selecció 10 mm en direcció X negativa" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Right" -msgstr "Fletxa dreta" - -msgid "Move selection 10mm in positive X direction" -msgstr "Moure la selecció 10 mm en direcció X positiva" +msgid "Keyboard 1-9: set filament for object/part" +msgstr "teclat 1-9: establir filament per a objecte/peça" msgid "Movement step set to 1mm" msgstr "Pas de moviment configurat a 1 mm" -msgid "Keyboard 1-9: set filament for object/part" -msgstr "teclat 1-9: establir filament per a objecte/peça" +msgid "Movement in camera space" +msgstr "Moviment a l'espai de la càmera" -msgid "Camera view - Default" -msgstr "Vista de càmera - Predeterminada" +msgid "Middle mouse" +msgstr "" -msgid "Camera view - Top" -msgstr "Vista de càmera - Part Superior" - -msgid "Camera view - Bottom" -msgstr "Vista de càmera - Part Inferior" - -msgid "Camera view - Front" -msgstr "Vista de càmera - Frontal" - -msgid "Camera view - Behind" -msgstr "Vista de càmera - Darrere" - -msgid "Camera Angle - Left side" -msgstr "Angle de càmera - Costat Esquerre" - -msgid "Camera Angle - Right side" -msgstr "Angle de càmera - Costat Dret" - -msgid "Select all objects" -msgstr "Seleccionar tots els objectes" - -msgid "Gizmo move" -msgstr "Gizmo de Moviment" - -msgid "Gizmo rotate" -msgstr "Gizmo de Rotació" - -msgid "Gizmo scale" -msgstr "Gizmo d'Escala" - -msgid "Gizmo place face on bed" -msgstr "Gizmo de recolzament sobre la Cara a la placa" - -msgid "Gizmo cut" -msgstr "Gizmo de Tall" - -msgid "Gizmo mesh boolean" -msgstr "Gizmo booleà de malla" - -msgid "Gizmo FDM paint-on fuzzy skin" -msgstr "Eina FDM per a pell difusa pintada" - -msgid "Gizmo SLA support points" -msgstr "Gizmo de Punts de suport SLA" - -msgid "Gizmo FDM paint-on seam" -msgstr "Eina de Pintat de costures FDM" - -msgid "Gizmo text emboss/engrave" -msgstr "Gizmo de text en relleu/gravat" - -msgid "Gizmo measure" -msgstr "Gizmo mesurar" - -msgid "Gizmo assemble" -msgstr "Gizmo ensamblar" - -msgid "Gizmo brim ears" -msgstr "Gizmo orelles de la Vora d'Adherència" - -msgid "Zoom in" -msgstr "Augmentar zoom" - -msgid "Zoom out" -msgstr "Reduir zoom" +msgid "Right mouse" +msgstr "" # AI Translated -msgid "Toggle printable for object/part" -msgstr "Commutar la impressibilitat de l'objecte/peça" +msgid "Zoom View" +msgstr "Zoom de la vista" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Tab" -msgstr "Tab" +msgid "Painting" +msgstr "" -msgid "Switch between Prepare/Preview" -msgstr "Canviar entre Preparar/Previsualitzar" - -msgid "Plater" -msgstr "Plataforma" +msgid "Available while a painting gizmo is open: supports, seam, fuzzy skin or color painting." +msgstr "" msgid "Move: press to snap by 1mm" msgstr "Moure: Clicka per ajustar en passos d'1 mm" @@ -12542,15 +12452,19 @@ msgstr "Suport/Pintat de color: configuració del radi de la ploma" msgid "Support/Color Painting: adjust section position" msgstr "Suport/Pintat de color: configuració de la posició de la secció" -# AI Translated -msgid "Gizmo" -msgstr "Gizmo" +msgid "Objects list" +msgstr "Llista d'objectes" + +msgid "Available while the object list has focus." +msgstr "" msgid "Set extruder number for the objects and parts" msgstr "Establir el número d'extrusor per als objectes i les peces" -msgid "Delete objects, parts, modifiers" -msgstr "Eliminar objectes, peces, modificadors" +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Space" +msgstr "Espai" msgid "Select the object/part and press space to change the name" msgstr "Seleccioneu l'objecte/peça i premeu espai per canviar-ne el nom" @@ -12561,45 +12475,48 @@ msgstr "Feu clic amb el ratolí" msgid "Select the object/part and mouse click to change the name" msgstr "Seleccioneu l'objecte/peça i feu clic amb el ratolí per canviar el nom" -msgid "Objects List" -msgstr "Llista d'Objectes" - -msgid "Vertical slider - Move active thumb Up" -msgstr "Barra de desplaçament Vertical - Mou el barra de desplaçament actiu cap Amunt" - -msgid "Vertical slider - Move active thumb Down" -msgstr "Barra de desplaçament Vertical - Mou el barra de desplaçament actiu cap Avall" - -msgid "Horizontal slider - Move active thumb Left" -msgstr "Barra de desplaçament Horitzontal - Mou el barra de desplaçament actiu cap a l'Esquerra" - -msgid "Horizontal slider - Move active thumb Right" -msgstr "Barra de desplaçament Horitzontal - Mou la barra de desplaçament activa cap a la Dreta" - -msgid "On/Off one layer mode of the vertical slider" -msgstr "Activar/desactivar el mode de capa única de la barra de desplaçament vertical" - -msgid "On/Off G-code window" -msgstr "Activar/Desactivar finestra de Codi-G" +msgid "Available while the 3D view on the Preview tab has focus." +msgstr "" msgid "Move slider 5x faster" msgstr "Moure la barra de desplaçament 5 vegades més ràpid" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Home" -msgstr "Inici" +msgid "Scroll slider 5x faster" +msgstr "" -msgid "Horizontal slider - Move to start position" -msgstr "Control lliscant horitzontal - Mou fins a la posició inicial" +msgid "Not customizable" +msgstr "" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "End" -msgstr "Fi" +#, c-format, boost-format +msgid "%s is assigned to %s. Reassign it to %s?" +msgstr "" -msgid "Horizontal slider - Move to last position" -msgstr "Control lliscant horitzontal - Mou a l'última posició" +#, c-format, boost-format +msgid "The default %s is assigned to %s. Reassign it to %s?" +msgstr "" + +msgid "Global shortcuts also apply while typing." +msgstr "" + +msgid "A key that types a character cannot be a global shortcut." +msgstr "" + +msgid "Esc cancels, Enter confirms." +msgstr "" + +#, c-format, boost-format +msgid "" +"Press the new shortcut for\n" +"\"%s\"" +msgstr "" + +#, c-format, boost-format +msgid "Already used as a step of %s." +msgstr "" + +#, c-format, boost-format +msgid "Already assigned to %s. Press OK to reassign it." +msgstr "" msgid "Release Note" msgstr "Notes de la versió" @@ -17594,8 +17511,8 @@ msgstr "Passos de preescalfament" msgid "Insert multiple preheat commands (e.g. M104.1). Only useful for Prusa XL. For other printers, please set it to 1." msgstr "Inseriu diverses ordres de preescalfament (p. ex., M104.1). Només útil per a Prusa XL. Per a altres impressores, poseu-la a 1." -msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." -msgstr "G-code escrit al començament del fitxer de sortida, abans de qualsevol altre contingut. Útil per afegir metadades que el firmware de la impressora llegeix de les primeres línies del fitxer (p. ex. temps d'impressió estimat, ús de filament). Admet espais reservats com {print_time_sec} i {used_filament_length}." +msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_total_sec}, {print_time_day}, {print_time_hour}, {print_time_minute}, {print_time_sec} and {used_filament_length}." +msgstr "" msgid "Start G-code" msgstr "Codi-G inicial" @@ -19154,12 +19071,36 @@ msgstr "Filament usat" msgid "Total length of filament used in the print." msgstr "Longitud total de filament utilitzat a la impressió." -msgid "Print time (seconds)" -msgstr "Temps d'impressió (segons)" +msgid "Print time (total seconds)" +msgstr "" msgid "Total estimated print time in seconds. Replaced with actual value during post-processing." msgstr "Temps d'impressió estimat total en segons. Substituït pel valor real durant el post-processament." +msgid "Print time (days component)" +msgstr "" + +msgid "Estimated print time day component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (hours component)" +msgstr "" + +msgid "Estimated print time hour component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (minutes component)" +msgstr "" + +msgid "Estimated print time minute component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (seconds component)" +msgstr "" + +msgid "Estimated print time second component (normal mode). Replaced with actual value during post-processing." +msgstr "" + msgid "Filament length (meters)" msgstr "Longitud del filament (metres)" @@ -21033,6 +20974,9 @@ msgstr "No s'ha detectat cap sessió vàlida. Voleu continuar amb l'inici de ses msgid "Success!" msgstr "Èxit!" +msgid "Generate API Key" +msgstr "" + msgid "Are you sure to log out?" msgstr "Estàs segur de tancar sessió?" @@ -22088,13 +22032,6 @@ msgstr "El connector de xarxa Bambu és necessari per a les funcions del núvol, msgid "Error: %s" msgstr "Error: %s" -msgid "Show details" -msgstr "Mostra detalls" - -# AI Translated -msgid "Hide details" -msgstr "Amagar els detalls" - msgid "Version to install:" msgstr "Versió a instal·lar:" @@ -24751,6 +24688,12 @@ msgstr "" msgid "No binding for that field" msgstr "" +msgid "Enter a number" +msgstr "" + +msgid "Not a number" +msgstr "" + msgid "Primitive" msgstr "" @@ -24763,6 +24706,217 @@ msgstr "" msgid "Clear All" msgstr "" +msgctxt "Keyboard Shortcut" +msgid "Ins" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Home" +msgstr "Inici" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "End" +msgstr "Fi" + +msgctxt "Keyboard Shortcut" +msgid "PgUp" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "PgDn" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Left" +msgstr "Fletxa esquerra" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Right" +msgstr "Fletxa dreta" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Up" +msgstr "Fletxa amunt" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Down" +msgstr "Fletxa avall" + +msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" +msgstr "Importar dades de geometria des de fitxers STL/STEP/3MF/OBJ/AMF" + +msgid "Select all objects" +msgstr "Seleccionar tots els objectes" + +msgid "Paste from clipboard" +msgstr "Enganxa des del porta-retalls" + +# AI Translated +msgid "Toggle printable for object/part" +msgstr "Commutar la impressibilitat de l'objecte/peça" + +msgid "Move selection 10mm in negative X direction" +msgstr "Moure la selecció 10 mm en direcció X negativa" + +msgid "Move selection 10mm in positive X direction" +msgstr "Moure la selecció 10 mm en direcció X positiva" + +msgid "Move selection 10mm in positive Y direction" +msgstr "Moure la selecció 10 mm en direcció Y positiva" + +msgid "Move selection 10mm in negative Y direction" +msgstr "Moure la selecció 10 mm en direcció Y negativa" + +msgid "Rotate selection 45 degrees counterclockwise" +msgstr "" + +msgid "Rotate selection 45 degrees clockwise" +msgstr "" + +msgid "Gizmo move" +msgstr "Gizmo de Moviment" + +msgid "Gizmo rotate" +msgstr "Gizmo de Rotació" + +msgid "Gizmo scale" +msgstr "Gizmo d'Escala" + +msgid "Gizmo place face on bed" +msgstr "Gizmo de recolzament sobre la Cara a la placa" + +msgid "Gizmo cut" +msgstr "Gizmo de Tall" + +msgid "Gizmo mesh boolean" +msgstr "Gizmo booleà de malla" + +msgid "Gizmo FDM paint-on supports" +msgstr "" + +msgid "Gizmo FDM paint-on seam" +msgstr "Eina de Pintat de costures FDM" + +msgid "Gizmo FDM paint-on fuzzy skin" +msgstr "Eina FDM per a pell difusa pintada" + +msgid "Gizmo multi-material painting" +msgstr "" + +msgid "Gizmo text emboss/engrave" +msgstr "Gizmo de text en relleu/gravat" + +msgid "Gizmo measure" +msgstr "Gizmo mesurar" + +msgid "Gizmo assemble" +msgstr "Gizmo ensamblar" + +msgid "Gizmo brim ears" +msgstr "Gizmo orelles de la Vora d'Adherència" + +msgid "Vertical slider - Move active thumb Up" +msgstr "Barra de desplaçament Vertical - Mou el barra de desplaçament actiu cap Amunt" + +msgid "Vertical slider - Move active thumb Down" +msgstr "Barra de desplaçament Vertical - Mou el barra de desplaçament actiu cap Avall" + +msgid "Horizontal slider - Move active thumb Left" +msgstr "Barra de desplaçament Horitzontal - Mou el barra de desplaçament actiu cap a l'Esquerra" + +msgid "Horizontal slider - Move active thumb Right" +msgstr "Barra de desplaçament Horitzontal - Mou la barra de desplaçament activa cap a la Dreta" + +msgid "Horizontal slider - Move to start position" +msgstr "Control lliscant horitzontal - Mou fins a la posició inicial" + +msgid "Horizontal slider - Move to last position" +msgstr "Control lliscant horitzontal - Mou a l'última posició" + +msgid "Camera view - Default" +msgstr "Vista de càmera - Predeterminada" + +msgid "Camera view - Top" +msgstr "Vista de càmera - Part Superior" + +msgid "Camera view - Bottom" +msgstr "Vista de càmera - Part Inferior" + +msgid "Camera view - Front" +msgstr "Vista de càmera - Frontal" + +msgid "Camera view - Behind" +msgstr "Vista de càmera - Darrere" + +msgid "Camera Angle - Left side" +msgstr "Angle de càmera - Costat Esquerre" + +msgid "Camera Angle - Right side" +msgstr "Angle de càmera - Costat Dret" + +msgid "Camera view - Current plate" +msgstr "" + +msgid "Zoom in" +msgstr "Augmentar zoom" + +msgid "Zoom out" +msgstr "Reduir zoom" + +msgid "Show/Hide 3Dconnexion devices settings dialog" +msgstr "Mostrar/Amagar quadre de diàleg Configuració de Dispositius 3Dconnexion" + +msgid "Show/Hide wireframe" +msgstr "" + +msgid "On/Off G-code window" +msgstr "Activar/Desactivar finestra de Codi-G" + +msgid "On/Off one layer mode of the vertical slider" +msgstr "Activar/desactivar el mode de capa única de la barra de desplaçament vertical" + +msgid "Switch between Prepare/Preview" +msgstr "Canviar entre Preparar/Previsualitzar" + +msgid "Collapse/Expand the sidebar" +msgstr "Replegar/Expandir barra lateral" + +msgid "Open the speed dial" +msgstr "" + +msgid "Reload the device page" +msgstr "" + +msgid "Show keyboard shortcuts list" +msgstr "Mostrar la llista de dreceres de teclat" + +msgid "Slicing and printing" +msgstr "" + +msgid "Editing" +msgstr "" + +msgid "Placement" +msgstr "" + +msgid "Gizmos" +msgstr "" + +msgid "Sliders" +msgstr "" + +msgid "Painting tools" +msgstr "" + +msgid "Application" +msgstr "" + #: resources/data/hints.ini: [hint:Precise wall] msgid "" "Precise wall\n" @@ -25064,6 +25218,66 @@ msgstr "" "Evitar la deformació( warping )\n" "Sabíeu que quan imprimiu materials propensos a deformar-se, com ara l'ABS, augmentar adequadament la temperatura del llit pot reduir la probabilitat de deformació?" +# AI Translated +#~ msgid "Tab" +#~ msgstr "Pestanya" + +# AI Translated +#~ msgid "Displays current viewport FPS in the top-right corner." +#~ msgstr "Mostra els FPS actuals de la vista a la cantonada superior dreta." + +# AI Translated +#~ msgid "Publish 3MF Wiki" +#~ msgstr "Wiki de Publicar 3MF" + +# AI Translated +#~ msgid "Publish 3MF Video Guide" +#~ msgstr "Guia en vídeo de Publicar 3MF" + +#~ msgid "Toolbar" +#~ msgstr "Barra d’eines" + +#~ msgid "Switch table page" +#~ msgstr "Canviar de pàgina de taula" + +#~ msgid "Global shortcuts" +#~ msgstr "Dreceres Globals" + +# AI Translated +#~ msgid "Middle mouse button" +#~ msgstr "Botó central del ratolí" + +#~ msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." +#~ msgstr "Orienta/alinea automàticament els objectes seleccionats o tots els objectes. Si hi ha objectes seleccionats, només orientarà/alinearà els seleccionats. En cas contrari, orientarà/alinearà tots els objectes del projecte actual." + +#~ msgid "Auto orients all objects on the active plate." +#~ msgstr "Orienta/alinea automàticament tots els objectes de la placa actual." + +#~ msgid "Any arrow" +#~ msgstr "Qualsevol fletxa" + +#~ msgid "Gizmo SLA support points" +#~ msgstr "Gizmo de Punts de suport SLA" + +#~ msgid "Plater" +#~ msgstr "Plataforma" + +# AI Translated +#~ msgid "Gizmo" +#~ msgstr "Gizmo" + +#~ msgid "Delete objects, parts, modifiers" +#~ msgstr "Eliminar objectes, peces, modificadors" + +#~ msgid "Objects List" +#~ msgstr "Llista d'Objectes" + +#~ msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." +#~ msgstr "G-code escrit al començament del fitxer de sortida, abans de qualsevol altre contingut. Útil per afegir metadades que el firmware de la impressora llegeix de les primeres línies del fitxer (p. ex. temps d'impressió estimat, ús de filament). Admet espais reservats com {print_time_sec} i {used_filament_length}." + +#~ msgid "Print time (seconds)" +#~ msgstr "Temps d'impressió (segons)" + # AI Translated #~ msgid "Open actions speed dial" #~ msgstr "Obrir el marcatge ràpid d'accions" diff --git a/localization/i18n/cs/OrcaSlicer_cs.po b/localization/i18n/cs/OrcaSlicer_cs.po index 5518d1d81e..41eeda79fd 100644 --- a/localization/i18n/cs/OrcaSlicer_cs.po +++ b/localization/i18n/cs/OrcaSlicer_cs.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-09-18 15:50+0800\n" +"POT-Creation-Date: 2026-09-22 17:02+0800\n" "PO-Revision-Date: \n" "Last-Translator: Jakub Hencl\n" "Language-Team: \n" @@ -5976,12 +5976,15 @@ msgctxt "Camera View" msgid "Right" msgstr "Pravý" -msgid "Add" -msgstr "Přidat" - msgid "Add plate" msgstr "Přidat desku" +msgid "Split to objects" +msgstr "Rozdělit na objekty" + +msgid "Add" +msgstr "Přidat" + msgid "Auto orient all/selected objects" msgstr "Automaticky orientovat všechny/vybrané objekty" @@ -5994,9 +5997,6 @@ msgstr "Rozložit všechny objekty" msgid "Arrange objects on selected plates" msgstr "Rozložit objekty na vybraných deskách" -msgid "Split to objects" -msgstr "Rozdělit na objekty" - msgid "Assembly View" msgstr "Zobrazení sestavy" @@ -6054,6 +6054,9 @@ msgstr "Obrys" msgid "Wireframe" msgstr "Drátový model" +msgid "X-Ray" +msgstr "" + # AI Translated msgid "Realistic View" msgstr "Realistické zobrazení" @@ -6599,9 +6602,6 @@ msgstr "Zobrazit obrys kolem vybraného objektu ve 3D scéně." msgid "Preferences" msgstr "Předvolby" -msgid "Open speed dial..." -msgstr "" - # AI Translated msgctxt "Menu" msgid "Edit" @@ -6610,6 +6610,9 @@ msgstr "Upravit" msgid "View" msgstr "Zobrazit" +msgid "Open Speed Dial" +msgstr "" + msgid "Preset Bundle" msgstr "Balík předvoleb" @@ -8436,10 +8439,6 @@ msgstr "Rozbalit postranní panel" msgid "Collapse sidebar" msgstr "Sbalit postranní panel" -# AI Translated -msgid "Tab" -msgstr "Tab" - #, c-format, boost-format msgid "Loading file: %s" msgstr "Načítání souboru: %s" @@ -9463,10 +9462,10 @@ msgstr "Správa více zařízení" msgid "With this option enabled, you can send a task to multiple devices at the same time and manage multiple devices." msgstr "Pokud je tato volba povolena, můžete odeslat úlohu na více zařízení současně a spravovat více zařízení." -msgid "Open the Speed Dial with the Space key" +msgid "Open the Speed Dial from the keyboard" msgstr "" -msgid "When enabled, pressing Space (with no other key held) opens the Speed Dial action search from any page." +msgid "When enabled, the Speed Dial keyboard shortcut (Space by default) opens the action search from any page." msgstr "" msgid "Recent actions" @@ -9606,6 +9605,15 @@ msgstr "Tažení pravým tlačítkem myši" msgid "Set the action that dragging the right mouse button should perform." msgstr "Nastavte akci, kterou má provádět tažení pravým tlačítkem myši." +msgid "Keyboard" +msgstr "" + +msgid "Keyboard shortcuts" +msgstr "" + +msgid "Choose the key for each action." +msgstr "" + msgid "Clear my choice on..." msgstr "Vymazat mou volbu pro..." @@ -9730,13 +9738,40 @@ msgstr "" "Omezuje snímkovou frekvenci zobrazení, aby se snížila zátěž GPU a spotřeba energie.\n" "Nastavte 0 pro neomezenou snímkovou frekvenci." +msgid "Reuse the 3D scene while idle" +msgstr "" + +msgid "" +"Skips redrawing the 3D scene when only the mouse cursor moves over the viewport,\n" +"and reuses the previous frame's scene instead. Reduces GPU load.\n" +"Disable it if the viewport shows stale or missing contents.\n" +"\n" +"Takes effect immediately." +msgstr "" + +msgid "Skip unchanged frames" +msgstr "" + +msgid "" +"Skips drawing a frame altogether when it would be identical to the one already on screen.\n" +"Only applies to frames that reuse the 3D scene, so it needs Reuse the 3D scene while idle.\n" +"Disable it if a hover highlight, tooltip or animation stops updating.\n" +"\n" +"Takes effect immediately." +msgstr "" + # AI Translated msgid "Show FPS overlay" msgstr "Zobrazit překryv s FPS" -# AI Translated -msgid "Displays current viewport FPS in the top-right corner." -msgstr "Zobrazuje aktuální FPS zobrazení v pravém horním rohu." +msgid "Displays rendering counts in the top-right corner of the viewport." +msgstr "" + +msgid "FPS: frames presented to the screen per second." +msgstr "" + +msgid "3D: frames per second that redrew the 3D scene." +msgstr "" # AI Translated msgid "G-code Preview" @@ -10208,13 +10243,8 @@ msgstr "Publikovat 3MF..." msgid "Select which settings to be published in the 3MF file" msgstr "Vyberte, která nastavení se mají publikovat v souboru 3MF" -# AI Translated -msgid "Publish 3MF Wiki" -msgstr "Wiki k publikování 3MF" - -# AI Translated -msgid "Publish 3MF Video Guide" -msgstr "Videonávod k publikování 3MF" +msgid "Video Guide" +msgstr "" # AI Translated msgid "Mixed filament - published as a whole when \"Enable\" above is selected" @@ -10417,6 +10447,14 @@ msgstr "" msgid "No wiki page for this action" msgstr "" +# AI Translated +msgid "Show details" +msgstr "Zobrazit podrobnosti" + +# AI Translated +msgid "Hide details" +msgstr "Skrýt podrobnosti" + #, c-format, boost-format msgid "\"%s\" is a Developer setting. Enable Developer mode to edit it?" msgstr "" @@ -12321,68 +12359,39 @@ msgstr "Konfigurační balíček byl změněn v předchozím průvodci nastaven msgid "Configuration package changed" msgstr "Balíček konfigurace byl změněn" -msgid "Toolbar" -msgstr "Panel nástrojů" - -msgid "Objects list" -msgstr "Seznam objektů" - -msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" -msgstr "Importovat geometrická data ze souborů STL/STEP/3MF/OBJ/AMF" - -msgid "Paste from clipboard" -msgstr "Vložit ze schránky" - -msgid "Show/Hide 3Dconnexion devices settings dialog" -msgstr "Zobrazit/Skrýt dialog nastavení zařízení 3Dconnexion" - -msgid "Switch table page" -msgstr "Přepnout stránku tabulky" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Space" -msgstr "Mezerník" - -msgid "Open speed dial" -msgstr "" - -msgid "Run a Speed Dial favourite (while the Speed Dial is open)" -msgstr "" - -msgid "Show keyboard shortcuts list" -msgstr "Zobrazit seznam klávesových zkratek" - -msgid "Global shortcuts" -msgstr "Globální klávesové zkratky" - msgid "Pan View" msgstr "Posun pohledu" msgid "Rotate View" msgstr "Otočit pohled" +#, c-format, boost-format +msgid "Use %s or %s, or a key that does not type a character." +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "Key" +msgstr "" + +msgid "Left mouse" +msgstr "" + +msgid "Available anywhere in the window, even while typing in a text field." +msgstr "" + +msgid "Run a speed dial favorite while the dial is open" +msgstr "" + # AI Translated -msgid "Middle mouse button" -msgstr "Prostřední tlačítko myši" +msgctxt "Keyboard Shortcut" +msgid "Tab" +msgstr "Tab" -msgid "Zoom View" -msgstr "Přiblížení pohledu" +msgid "Switch to the next main tab" +msgstr "" -msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." -msgstr "Automaticky orientuje vybrané nebo všechny objekty. Pokud jsou vybrané objekty, orientuje pouze tyto. Jinak orientuje všechny objekty v aktuálním projektu." - -msgid "Auto orients all objects on the active plate." -msgstr "Automaticky orientuje všechny objekty na aktivní desce." - -msgid "Collapse/Expand the sidebar" -msgstr "Sbalit/rozbalit postranní panel" - -msgid "Any arrow" -msgstr "Libovolná šipka" - -msgid "Movement in camera space" -msgstr "Pohyb v prostoru kamery" +msgid "Available while the 3D view on the Prepare tab has focus." +msgstr "" msgid "Select a part" msgstr "Vyberte část" @@ -12393,127 +12402,29 @@ msgstr "Vyberte více objektů" msgid "Select objects by rectangle" msgstr "Vyberte objekty obdélníkem" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Up" -msgstr "Šipka nahoru" - -msgid "Move selection 10mm in positive Y direction" -msgstr "Přesuňte výběr o 10 mm v kladném směru osy Y" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Down" -msgstr "Šipka dolů" - -msgid "Move selection 10mm in negative Y direction" -msgstr "Přesuňte výběr o 10 mm v záporném směru osy Y" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Left" -msgstr "Šipka vlevo" - -msgid "Move selection 10mm in negative X direction" -msgstr "Přesuňte výběr o 10 mm v záporném směru osy X" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Right" -msgstr "Šipka vpravo" - -msgid "Move selection 10mm in positive X direction" -msgstr "Přesuňte výběr o 10 mm v kladném směru osy X" +msgid "Keyboard 1-9: set filament for object/part" +msgstr "Klávesy 1–9: nastavit filament pro objekt/část" msgid "Movement step set to 1mm" msgstr "Krok pohybu nastaven na 1 mm" -msgid "Keyboard 1-9: set filament for object/part" -msgstr "Klávesy 1–9: nastavit filament pro objekt/část" +msgid "Movement in camera space" +msgstr "Pohyb v prostoru kamery" -msgid "Camera view - Default" -msgstr "Pohled kamery – výchozí" +msgid "Middle mouse" +msgstr "" -msgid "Camera view - Top" -msgstr "Pohled kamery – shora" +msgid "Right mouse" +msgstr "" -msgid "Camera view - Bottom" -msgstr "Pohled kamery – zespodu" +msgid "Zoom View" +msgstr "Přiblížení pohledu" -msgid "Camera view - Front" -msgstr "Pohled kamery – zepředu" +msgid "Painting" +msgstr "" -msgid "Camera view - Behind" -msgstr "Pohled kamery – zezadu" - -msgid "Camera Angle - Left side" -msgstr "Úhel kamery – levá strana" - -msgid "Camera Angle - Right side" -msgstr "Úhel kamery – pravá strana" - -msgid "Select all objects" -msgstr "Vybrat všechny objekty" - -msgid "Gizmo move" -msgstr "Gizmo posouvat" - -msgid "Gizmo rotate" -msgstr "Gizmo otočit" - -msgid "Gizmo scale" -msgstr "Gizmo změnit měřítko" - -msgid "Gizmo place face on bed" -msgstr "Gizmo umístit plochu na podložku" - -msgid "Gizmo cut" -msgstr "Gizmo řezat" - -# AI Translated -msgid "Gizmo mesh boolean" -msgstr "Gizmo booleovské operace se sítí" - -msgid "Gizmo FDM paint-on fuzzy skin" -msgstr "Gizmo FDM malování efektu chlupatého povrchu" - -msgid "Gizmo SLA support points" -msgstr "Gizmo SLA podpůrné body" - -msgid "Gizmo FDM paint-on seam" -msgstr "Gizmo FDM malování švu" - -msgid "Gizmo text emboss/engrave" -msgstr "Gizmo text vystouplý/gravírovaný" - -msgid "Gizmo measure" -msgstr "Gizmo měření" - -msgid "Gizmo assemble" -msgstr "Gizmo sestavit" - -msgid "Gizmo brim ears" -msgstr "Gizmo ouška lemu" - -msgid "Zoom in" -msgstr "Přiblížit" - -msgid "Zoom out" -msgstr "Oddálit" - -msgid "Toggle printable for object/part" -msgstr "Přepnout tisknutelnost objektu/části" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Tab" -msgstr "Tab" - -msgid "Switch between Prepare/Preview" -msgstr "Přepnout mezi Přípravou/Náhledem" - -msgid "Plater" -msgstr "Deska" +msgid "Available while a painting gizmo is open: supports, seam, fuzzy skin or color painting." +msgstr "" msgid "Move: press to snap by 1mm" msgstr "Pohyb: stiskněte pro posun o 1 mm" @@ -12524,15 +12435,19 @@ msgstr "Podpora/barva malování: nastavení poloměru pera" msgid "Support/Color Painting: adjust section position" msgstr "Podpora/barva malování: nastavení pozice úseku" -# AI Translated -msgid "Gizmo" -msgstr "Gizmo" +msgid "Objects list" +msgstr "Seznam objektů" + +msgid "Available while the object list has focus." +msgstr "" msgid "Set extruder number for the objects and parts" msgstr "Nastavit číslo extruderu pro objekty a části" -msgid "Delete objects, parts, modifiers" -msgstr "Smazat objekty, části, modifikátory" +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Space" +msgstr "Mezerník" msgid "Select the object/part and press space to change the name" msgstr "Vyberte objekt/část a stiskněte mezerník pro změnu názvu" @@ -12543,45 +12458,48 @@ msgstr "Kliknutí myší" msgid "Select the object/part and mouse click to change the name" msgstr "Vyberte objekt/část a klikněte myší pro změnu názvu" -msgid "Objects List" -msgstr "Seznam objektů" - -msgid "Vertical slider - Move active thumb Up" -msgstr "Vertikální posuvník – Posuňte aktivní jezdec nahoru" - -msgid "Vertical slider - Move active thumb Down" -msgstr "Vertikální posuvník – posuňte aktivní jezdec dolů" - -msgid "Horizontal slider - Move active thumb Left" -msgstr "Vodorovný posuvník – posunout aktivní jezdec vlevo" - -msgid "Horizontal slider - Move active thumb Right" -msgstr "Vodorovný posuvník – posunout aktivní jezdec vpravo" - -msgid "On/Off one layer mode of the vertical slider" -msgstr "Zapnout/vypnout režim jedné vrstvy na vertikálním posuvníku" - -msgid "On/Off G-code window" -msgstr "Zapnout/vypnout okno G-code" +msgid "Available while the 3D view on the Preview tab has focus." +msgstr "" msgid "Move slider 5x faster" msgstr "Posouvejte posuvník 5× rychleji" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Home" -msgstr "Home" +msgid "Scroll slider 5x faster" +msgstr "" -msgid "Horizontal slider - Move to start position" -msgstr "Vodorovný posuvník – přesunout na začátek" +msgid "Not customizable" +msgstr "" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "End" -msgstr "End" +#, c-format, boost-format +msgid "%s is assigned to %s. Reassign it to %s?" +msgstr "" -msgid "Horizontal slider - Move to last position" -msgstr "Vodorovný posuvník – přesunout na poslední pozici" +#, c-format, boost-format +msgid "The default %s is assigned to %s. Reassign it to %s?" +msgstr "" + +msgid "Global shortcuts also apply while typing." +msgstr "" + +msgid "A key that types a character cannot be a global shortcut." +msgstr "" + +msgid "Esc cancels, Enter confirms." +msgstr "" + +#, c-format, boost-format +msgid "" +"Press the new shortcut for\n" +"\"%s\"" +msgstr "" + +#, c-format, boost-format +msgid "Already used as a step of %s." +msgstr "" + +#, c-format, boost-format +msgid "Already assigned to %s. Press OK to reassign it." +msgstr "" msgid "Release Note" msgstr "Poznámky k vydání" @@ -17532,8 +17450,8 @@ msgstr "Kroky předehřevu" msgid "Insert multiple preheat commands (e.g. M104.1). Only useful for Prusa XL. For other printers, please set it to 1." msgstr "Vložte více příkazů pro předehřev (např. M104.1). Pouze pro Prusa XL. U ostatních tiskáren nastavte na 1." -msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." -msgstr "G-code zapsaný na úplný začátek výstupního souboru před jakýkoli další obsah. Užitečné pro přidání metadat, která firmware tiskárny čte z prvních řádků souboru (např. odhadovaná doba tisku nebo spotřeba filamentu). Podporuje zástupné proměnné jako {print_time_sec} a {used_filament_length}." +msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_total_sec}, {print_time_day}, {print_time_hour}, {print_time_minute}, {print_time_sec} and {used_filament_length}." +msgstr "" # AI Translated msgid "Start G-code" @@ -19075,12 +18993,36 @@ msgstr "Použitý filament" msgid "Total length of filament used in the print." msgstr "Celková délka filamentu použitého při tisku." -msgid "Print time (seconds)" -msgstr "Doba tisku (sekundy)" +msgid "Print time (total seconds)" +msgstr "" msgid "Total estimated print time in seconds. Replaced with actual value during post-processing." msgstr "Celková odhadovaná doba tisku v sekundách. Během následného zpracování bude nahrazena skutečnou hodnotou." +msgid "Print time (days component)" +msgstr "" + +msgid "Estimated print time day component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (hours component)" +msgstr "" + +msgid "Estimated print time hour component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (minutes component)" +msgstr "" + +msgid "Estimated print time minute component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (seconds component)" +msgstr "" + +msgid "Estimated print time second component (normal mode). Replaced with actual value during post-processing." +msgstr "" + msgid "Filament length (meters)" msgstr "Délka filamentu (metry)" @@ -20950,6 +20892,9 @@ msgstr "Nebyla zjištěna platná relace. Pokračovat přihlášením do 3DPrint msgid "Success!" msgstr "Úspěch!" +msgid "Generate API Key" +msgstr "" + msgid "Are you sure to log out?" msgstr "Opravdu se chcete odhlásit?" @@ -22041,14 +21986,6 @@ msgstr "Síťový plug-in Bambu je nutný pro cloudové funkce, vyhledávání t msgid "Error: %s" msgstr "Chyba: %s" -# AI Translated -msgid "Show details" -msgstr "Zobrazit podrobnosti" - -# AI Translated -msgid "Hide details" -msgstr "Skrýt podrobnosti" - # AI Translated msgid "Version to install:" msgstr "Verze k instalaci:" @@ -24731,6 +24668,12 @@ msgstr "" msgid "No binding for that field" msgstr "" +msgid "Enter a number" +msgstr "" + +msgid "Not a number" +msgstr "" + msgid "Primitive" msgstr "" @@ -24743,6 +24686,217 @@ msgstr "" msgid "Clear All" msgstr "" +msgctxt "Keyboard Shortcut" +msgid "Ins" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Home" +msgstr "Home" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "End" +msgstr "End" + +msgctxt "Keyboard Shortcut" +msgid "PgUp" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "PgDn" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Left" +msgstr "Šipka vlevo" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Right" +msgstr "Šipka vpravo" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Up" +msgstr "Šipka nahoru" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Down" +msgstr "Šipka dolů" + +msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" +msgstr "Importovat geometrická data ze souborů STL/STEP/3MF/OBJ/AMF" + +msgid "Select all objects" +msgstr "Vybrat všechny objekty" + +msgid "Paste from clipboard" +msgstr "Vložit ze schránky" + +msgid "Toggle printable for object/part" +msgstr "Přepnout tisknutelnost objektu/části" + +msgid "Move selection 10mm in negative X direction" +msgstr "Přesuňte výběr o 10 mm v záporném směru osy X" + +msgid "Move selection 10mm in positive X direction" +msgstr "Přesuňte výběr o 10 mm v kladném směru osy X" + +msgid "Move selection 10mm in positive Y direction" +msgstr "Přesuňte výběr o 10 mm v kladném směru osy Y" + +msgid "Move selection 10mm in negative Y direction" +msgstr "Přesuňte výběr o 10 mm v záporném směru osy Y" + +msgid "Rotate selection 45 degrees counterclockwise" +msgstr "" + +msgid "Rotate selection 45 degrees clockwise" +msgstr "" + +msgid "Gizmo move" +msgstr "Gizmo posouvat" + +msgid "Gizmo rotate" +msgstr "Gizmo otočit" + +msgid "Gizmo scale" +msgstr "Gizmo změnit měřítko" + +msgid "Gizmo place face on bed" +msgstr "Gizmo umístit plochu na podložku" + +msgid "Gizmo cut" +msgstr "Gizmo řezat" + +# AI Translated +msgid "Gizmo mesh boolean" +msgstr "Gizmo booleovské operace se sítí" + +msgid "Gizmo FDM paint-on supports" +msgstr "" + +msgid "Gizmo FDM paint-on seam" +msgstr "Gizmo FDM malování švu" + +msgid "Gizmo FDM paint-on fuzzy skin" +msgstr "Gizmo FDM malování efektu chlupatého povrchu" + +msgid "Gizmo multi-material painting" +msgstr "" + +msgid "Gizmo text emboss/engrave" +msgstr "Gizmo text vystouplý/gravírovaný" + +msgid "Gizmo measure" +msgstr "Gizmo měření" + +msgid "Gizmo assemble" +msgstr "Gizmo sestavit" + +msgid "Gizmo brim ears" +msgstr "Gizmo ouška lemu" + +msgid "Vertical slider - Move active thumb Up" +msgstr "Vertikální posuvník – Posuňte aktivní jezdec nahoru" + +msgid "Vertical slider - Move active thumb Down" +msgstr "Vertikální posuvník – posuňte aktivní jezdec dolů" + +msgid "Horizontal slider - Move active thumb Left" +msgstr "Vodorovný posuvník – posunout aktivní jezdec vlevo" + +msgid "Horizontal slider - Move active thumb Right" +msgstr "Vodorovný posuvník – posunout aktivní jezdec vpravo" + +msgid "Horizontal slider - Move to start position" +msgstr "Vodorovný posuvník – přesunout na začátek" + +msgid "Horizontal slider - Move to last position" +msgstr "Vodorovný posuvník – přesunout na poslední pozici" + +msgid "Camera view - Default" +msgstr "Pohled kamery – výchozí" + +msgid "Camera view - Top" +msgstr "Pohled kamery – shora" + +msgid "Camera view - Bottom" +msgstr "Pohled kamery – zespodu" + +msgid "Camera view - Front" +msgstr "Pohled kamery – zepředu" + +msgid "Camera view - Behind" +msgstr "Pohled kamery – zezadu" + +msgid "Camera Angle - Left side" +msgstr "Úhel kamery – levá strana" + +msgid "Camera Angle - Right side" +msgstr "Úhel kamery – pravá strana" + +msgid "Camera view - Current plate" +msgstr "" + +msgid "Zoom in" +msgstr "Přiblížit" + +msgid "Zoom out" +msgstr "Oddálit" + +msgid "Show/Hide 3Dconnexion devices settings dialog" +msgstr "Zobrazit/Skrýt dialog nastavení zařízení 3Dconnexion" + +msgid "Show/Hide wireframe" +msgstr "" + +msgid "On/Off G-code window" +msgstr "Zapnout/vypnout okno G-code" + +msgid "On/Off one layer mode of the vertical slider" +msgstr "Zapnout/vypnout režim jedné vrstvy na vertikálním posuvníku" + +msgid "Switch between Prepare/Preview" +msgstr "Přepnout mezi Přípravou/Náhledem" + +msgid "Collapse/Expand the sidebar" +msgstr "Sbalit/rozbalit postranní panel" + +msgid "Open the speed dial" +msgstr "" + +msgid "Reload the device page" +msgstr "" + +msgid "Show keyboard shortcuts list" +msgstr "Zobrazit seznam klávesových zkratek" + +msgid "Slicing and printing" +msgstr "" + +msgid "Editing" +msgstr "" + +msgid "Placement" +msgstr "" + +msgid "Gizmos" +msgstr "" + +msgid "Sliders" +msgstr "" + +msgid "Painting tools" +msgstr "" + +msgid "Application" +msgstr "" + #: resources/data/hints.ini: [hint:Precise wall] msgid "" "Precise wall\n" @@ -25045,6 +25199,66 @@ msgstr "" "Zamezte kroucení\n" "Víte, že při tisku materiálů náchylných ke kroucení, jako je ABS, může vhodné zvýšení teploty vyhřívané desky snížit pravděpodobnost kroucení?" +# AI Translated +#~ msgid "Tab" +#~ msgstr "Tab" + +# AI Translated +#~ msgid "Displays current viewport FPS in the top-right corner." +#~ msgstr "Zobrazuje aktuální FPS zobrazení v pravém horním rohu." + +# AI Translated +#~ msgid "Publish 3MF Wiki" +#~ msgstr "Wiki k publikování 3MF" + +# AI Translated +#~ msgid "Publish 3MF Video Guide" +#~ msgstr "Videonávod k publikování 3MF" + +#~ msgid "Toolbar" +#~ msgstr "Panel nástrojů" + +#~ msgid "Switch table page" +#~ msgstr "Přepnout stránku tabulky" + +#~ msgid "Global shortcuts" +#~ msgstr "Globální klávesové zkratky" + +# AI Translated +#~ msgid "Middle mouse button" +#~ msgstr "Prostřední tlačítko myši" + +#~ msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." +#~ msgstr "Automaticky orientuje vybrané nebo všechny objekty. Pokud jsou vybrané objekty, orientuje pouze tyto. Jinak orientuje všechny objekty v aktuálním projektu." + +#~ msgid "Auto orients all objects on the active plate." +#~ msgstr "Automaticky orientuje všechny objekty na aktivní desce." + +#~ msgid "Any arrow" +#~ msgstr "Libovolná šipka" + +#~ msgid "Gizmo SLA support points" +#~ msgstr "Gizmo SLA podpůrné body" + +#~ msgid "Plater" +#~ msgstr "Deska" + +# AI Translated +#~ msgid "Gizmo" +#~ msgstr "Gizmo" + +#~ msgid "Delete objects, parts, modifiers" +#~ msgstr "Smazat objekty, části, modifikátory" + +#~ msgid "Objects List" +#~ msgstr "Seznam objektů" + +#~ msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." +#~ msgstr "G-code zapsaný na úplný začátek výstupního souboru před jakýkoli další obsah. Užitečné pro přidání metadat, která firmware tiskárny čte z prvních řádků souboru (např. odhadovaná doba tisku nebo spotřeba filamentu). Podporuje zástupné proměnné jako {print_time_sec} a {used_filament_length}." + +#~ msgid "Print time (seconds)" +#~ msgstr "Doba tisku (sekundy)" + # AI Translated #~ msgid "Open actions speed dial" #~ msgstr "Otevřít rychlou nabídku akcí" diff --git a/localization/i18n/de/OrcaSlicer_de.po b/localization/i18n/de/OrcaSlicer_de.po index 4957eef170..62fa086efa 100644 --- a/localization/i18n/de/OrcaSlicer_de.po +++ b/localization/i18n/de/OrcaSlicer_de.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-09-18 15:50+0800\n" +"POT-Creation-Date: 2026-09-22 17:02+0800\n" "PO-Revision-Date: \n" "Last-Translator: Heiko Liebscher \n" "Language-Team: \n" @@ -5873,12 +5873,15 @@ msgctxt "Camera View" msgid "Right" msgstr "rechts" -msgid "Add" -msgstr "Hinzufügen" - msgid "Add plate" msgstr "Druckplatte hinzufügen" +msgid "Split to objects" +msgstr "In Objekte trennen" + +msgid "Add" +msgstr "Hinzufügen" + msgid "Auto orient all/selected objects" msgstr "Alle/ausgewählte Objekte automatische Ausrichtung" @@ -5891,9 +5894,6 @@ msgstr "Alle Objekte anordnen" msgid "Arrange objects on selected plates" msgstr "Objekte auf ausgewählten Druckplatten anordnen" -msgid "Split to objects" -msgstr "In Objekte trennen" - msgid "Assembly View" msgstr "Montageansicht" @@ -5949,6 +5949,9 @@ msgstr "Umriss" msgid "Wireframe" msgstr "Gittermodell" +msgid "X-Ray" +msgstr "" + msgid "Realistic View" msgstr "Realistische Ansicht" @@ -6487,9 +6490,6 @@ msgstr "Kontur um das ausgewählte Objekt in der 3D-Szene anzeigen." msgid "Preferences" msgstr "Einstellungen" -msgid "Open speed dial..." -msgstr "" - # AI Translated msgctxt "Menu" msgid "Edit" @@ -6498,6 +6498,9 @@ msgstr "Bearbeiten" msgid "View" msgstr "Ansicht" +msgid "Open Speed Dial" +msgstr "" + msgid "Preset Bundle" msgstr "Vorlagen-Bundle" @@ -8304,10 +8307,6 @@ msgstr "Seitenleiste erweitern" msgid "Collapse sidebar" msgstr "Seitenleiste reduzieren" -# AI Translated -msgid "Tab" -msgstr "Tab" - #, c-format, boost-format msgid "Loading file: %s" msgstr "Datei wird geladen: %s" @@ -9334,10 +9333,10 @@ msgstr "Multi-Geräte-Verwaltung" msgid "With this option enabled, you can send a task to multiple devices at the same time and manage multiple devices." msgstr "Wenn diese Option aktiviert ist, können Sie eine Aufgabe gleichzeitig an mehrere Geräte senden und mehrere Geräte verwalten." -msgid "Open the Speed Dial with the Space key" +msgid "Open the Speed Dial from the keyboard" msgstr "" -msgid "When enabled, pressing Space (with no other key held) opens the Speed Dial action search from any page." +msgid "When enabled, the Speed Dial keyboard shortcut (Space by default) opens the action search from any page." msgstr "" msgid "Recent actions" @@ -9469,6 +9468,15 @@ msgstr "Rechte Maustaste drücken" msgid "Set the action that dragging the right mouse button should perform." msgstr "Legen Sie die Aktion fest, die das Ziehen der rechten Maustaste ausführen soll." +msgid "Keyboard" +msgstr "" + +msgid "Keyboard shortcuts" +msgstr "" + +msgid "Choose the key for each action." +msgstr "" + msgid "Clear my choice on..." msgstr "Meine Auswahl löschen bei ..." @@ -9579,11 +9587,39 @@ msgstr "" "Begrenzt die Bildrate des Viewports, um die GPU-Auslastung und den Energieverbrauch zu reduzieren.\n" "Auf 0 setzen für unbegrenzte Bildrate." +msgid "Reuse the 3D scene while idle" +msgstr "" + +msgid "" +"Skips redrawing the 3D scene when only the mouse cursor moves over the viewport,\n" +"and reuses the previous frame's scene instead. Reduces GPU load.\n" +"Disable it if the viewport shows stale or missing contents.\n" +"\n" +"Takes effect immediately." +msgstr "" + +msgid "Skip unchanged frames" +msgstr "" + +msgid "" +"Skips drawing a frame altogether when it would be identical to the one already on screen.\n" +"Only applies to frames that reuse the 3D scene, so it needs Reuse the 3D scene while idle.\n" +"Disable it if a hover highlight, tooltip or animation stops updating.\n" +"\n" +"Takes effect immediately." +msgstr "" + msgid "Show FPS overlay" msgstr "FPS-Overlay anzeigen" -msgid "Displays current viewport FPS in the top-right corner." -msgstr "Zeigt die aktuelle FPS des Viewports in der oberen rechten Ecke an." +msgid "Displays rendering counts in the top-right corner of the viewport." +msgstr "" + +msgid "FPS: frames presented to the screen per second." +msgstr "" + +msgid "3D: frames per second that redrew the 3D scene." +msgstr "" # AI Translated msgid "G-code Preview" @@ -10042,13 +10078,8 @@ msgstr "3MF veröffentlichen..." msgid "Select which settings to be published in the 3MF file" msgstr "Wählen Sie aus, welche Einstellungen in der 3MF-Datei veröffentlicht werden" -# AI Translated -msgid "Publish 3MF Wiki" -msgstr "Wiki: 3MF veröffentlichen" - -# AI Translated -msgid "Publish 3MF Video Guide" -msgstr "Videoanleitung: 3MF veröffentlichen" +msgid "Video Guide" +msgstr "" # AI Translated msgid "Mixed filament - published as a whole when \"Enable\" above is selected" @@ -10250,6 +10281,13 @@ msgstr "" msgid "No wiki page for this action" msgstr "" +msgid "Show details" +msgstr "Zeige Details" + +# AI Translated +msgid "Hide details" +msgstr "Details ausblenden" + #, c-format, boost-format msgid "\"%s\" is a Developer setting. Enable Developer mode to edit it?" msgstr "" @@ -12080,67 +12118,39 @@ msgstr "Das Konfigurationspaket wurde im vorherigen Konfigurationsleitfaden geä msgid "Configuration package changed" msgstr "Konfigurationspaket geändert" -msgid "Toolbar" -msgstr "Werkzeugleiste" - -msgid "Objects list" -msgstr "Liste der Objekte" - -msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" -msgstr "Importiere Geometriedaten aus STL/STEP/3MF/OBJ/AMF-Dateien" - -msgid "Paste from clipboard" -msgstr "Aus Zwischenablage einfügen" - -msgid "Show/Hide 3Dconnexion devices settings dialog" -msgstr "Dialogfeld für 3Dconnexion Geräteeinstellungen anzeigen/ausblenden" - -msgid "Switch table page" -msgstr "Seitenwechsel" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Space" -msgstr "Leertaste" - -msgid "Open speed dial" -msgstr "" - -msgid "Run a Speed Dial favourite (while the Speed Dial is open)" -msgstr "" - -msgid "Show keyboard shortcuts list" -msgstr "Liste der Tastaturkürzel anzeigen" - -msgid "Global shortcuts" -msgstr "Globale Tastaturkürzel" - msgid "Pan View" msgstr "Ansicht verschieben" msgid "Rotate View" msgstr "Ansicht drehen" -msgid "Middle mouse button" -msgstr "Mittlere Maustaste" +#, c-format, boost-format +msgid "Use %s or %s, or a key that does not type a character." +msgstr "" -msgid "Zoom View" -msgstr "Ansicht zoomen" +msgctxt "Keyboard Shortcut" +msgid "Key" +msgstr "" -msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." -msgstr "Diese Funktion richtet ausgewählte Objekte oder alle Objekte automatisch aus. Wenn es ausgewählte Objekte gibt, werden nur die ausgewählten Objekte ausgerichtet. Andernfalls werden alle Objekte auf das aktuelle Projekt ausgerichtet." +msgid "Left mouse" +msgstr "" -msgid "Auto orients all objects on the active plate." -msgstr "Diese Funktion richtet alle Objekte auf der aktuellen Druckplatte ausgerichtet." +msgid "Available anywhere in the window, even while typing in a text field." +msgstr "" -msgid "Collapse/Expand the sidebar" -msgstr "Seitenleiste zu-/aufklappen" +msgid "Run a speed dial favorite while the dial is open" +msgstr "" -msgid "Any arrow" -msgstr "Beliebiger Pfeil" +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Tab" +msgstr "Tab" -msgid "Movement in camera space" -msgstr "Bewegung im Kameraraum" +msgid "Switch to the next main tab" +msgstr "" + +msgid "Available while the 3D view on the Prepare tab has focus." +msgstr "" msgid "Select a part" msgstr "Teil auswählen" @@ -12151,126 +12161,29 @@ msgstr "Mehrere Objekte auswählen" msgid "Select objects by rectangle" msgstr "Objekte per Rechteck auswählen" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Up" -msgstr "Pfeil nach oben" - -msgid "Move selection 10mm in positive Y direction" -msgstr "Auswahl 10 mm in positiver Y-Richtung verschieben" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Down" -msgstr "Pfeil nach unten" - -msgid "Move selection 10mm in negative Y direction" -msgstr "Auswahl 10 mm in negativer Y-Richtung verschieben" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Left" -msgstr "Pfeil nach links" - -msgid "Move selection 10mm in negative X direction" -msgstr "Auswahl 10 mm in negativer X-Richtung verschieben" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Right" -msgstr "Pfeil nach rechts" - -msgid "Move selection 10mm in positive X direction" -msgstr "Auswahl 10 mm in positiver X-Richtung verschieben" +msgid "Keyboard 1-9: set filament for object/part" +msgstr "Tastatur 1-9: Filament für Objekt/Teil einstellen" msgid "Movement step set to 1mm" msgstr "Bewegungsschritt auf 1 mm eingestellt" -msgid "Keyboard 1-9: set filament for object/part" -msgstr "Tastatur 1-9: Filament für Objekt/Teil einstellen" +msgid "Movement in camera space" +msgstr "Bewegung im Kameraraum" -msgid "Camera view - Default" -msgstr "Kameraperspektive - Standard" +msgid "Middle mouse" +msgstr "" -msgid "Camera view - Top" -msgstr "Kameraperspektive - Oben" +msgid "Right mouse" +msgstr "" -msgid "Camera view - Bottom" -msgstr "Kameraperspektive - Unten" +msgid "Zoom View" +msgstr "Ansicht zoomen" -msgid "Camera view - Front" -msgstr "Kameraperspektive - Vorderseite" +msgid "Painting" +msgstr "" -msgid "Camera view - Behind" -msgstr "Kameraperspektive - Hinten" - -msgid "Camera Angle - Left side" -msgstr "Kameraperspektive - Links" - -msgid "Camera Angle - Right side" -msgstr "Kameraperspektive - Rechts" - -msgid "Select all objects" -msgstr "Alle Objekte auswählen" - -msgid "Gizmo move" -msgstr "Bewegen" - -msgid "Gizmo rotate" -msgstr "Rotieren" - -msgid "Gizmo scale" -msgstr "Skalieren" - -msgid "Gizmo place face on bed" -msgstr "Fläche auf druckbett platzieren" - -msgid "Gizmo cut" -msgstr "Trennen" - -msgid "Gizmo mesh boolean" -msgstr "Gizmo mesh-boolesche" - -msgid "Gizmo FDM paint-on fuzzy skin" -msgstr "FDM Pinsel auf Fuzzy Oberfläche" - -msgid "Gizmo SLA support points" -msgstr "SLA Stützpunkte" - -msgid "Gizmo FDM paint-on seam" -msgstr "FDM Naht aufmalen" - -msgid "Gizmo text emboss/engrave" -msgstr "Text prägen/gravieren" - -msgid "Gizmo measure" -msgstr "Gizmo messen" - -msgid "Gizmo assemble" -msgstr "Gizmo Zusammenbauen" - -msgid "Gizmo brim ears" -msgstr "Gizmo mausohren" - -msgid "Zoom in" -msgstr "Vergrößern" - -msgid "Zoom out" -msgstr "Verkleinern" - -msgid "Toggle printable for object/part" -msgstr "Druckbar für Objekt/Teil umschalten" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Tab" -msgstr "Tab" - -msgid "Switch between Prepare/Preview" -msgstr "Zwischen Vorbereiten/ Vorschau wechseln" - -msgid "Plater" -msgstr "Druckplatte" +msgid "Available while a painting gizmo is open: supports, seam, fuzzy skin or color painting." +msgstr "" msgid "Move: press to snap by 1mm" msgstr "Verschieben: Drücken, um in 1 mm einzurasten" @@ -12281,14 +12194,19 @@ msgstr "Stützen/Farbmalen: Stiftradius einstellen" msgid "Support/Color Painting: adjust section position" msgstr "Stützen/Farbmalen: Position des Abschnitts anpassen" -msgid "Gizmo" -msgstr "Gizmo" +msgid "Objects list" +msgstr "Liste der Objekte" + +msgid "Available while the object list has focus." +msgstr "" msgid "Set extruder number for the objects and parts" msgstr "Extrudernummer für die Objekte und Teile einstellen" -msgid "Delete objects, parts, modifiers" -msgstr "Objekte, Teile, Modifikatoren löschen" +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Space" +msgstr "Leertaste" msgid "Select the object/part and press space to change the name" msgstr "Wähle das Objekt/Teil aus und drücke die Leertaste, um den Namen zu ändern" @@ -12299,45 +12217,48 @@ msgstr "Mausklick" msgid "Select the object/part and mouse click to change the name" msgstr "Wähle das Objekt/Teil aus und klicke mit der Maus, um den Namen zu ändern" -msgid "Objects List" -msgstr "Objektliste" - -msgid "Vertical slider - Move active thumb Up" -msgstr "Vertikaler Schieberegler - Aktiven Schieber nach oben bewegen" - -msgid "Vertical slider - Move active thumb Down" -msgstr "Vertikaler Schieberegler - Aktiven Schieber nach unten bewegen" - -msgid "Horizontal slider - Move active thumb Left" -msgstr "Horizontaler Schieberegler - Aktiven Schieber nach links bewegen" - -msgid "Horizontal slider - Move active thumb Right" -msgstr "Horizontaler Schieberegler - Aktiven Schieber nach rechts bewegen" - -msgid "On/Off one layer mode of the vertical slider" -msgstr "Ein/Aus Einschichtmodus des vertikalen Schiebereglers" - -msgid "On/Off G-code window" -msgstr "Ein-/Ausblenden des G-Code-Fensters" +msgid "Available while the 3D view on the Preview tab has focus." +msgstr "" msgid "Move slider 5x faster" msgstr "Schieberegler 5x schneller bewegen" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Home" -msgstr "Pos1" +msgid "Scroll slider 5x faster" +msgstr "" -msgid "Horizontal slider - Move to start position" -msgstr "Horizontaler Schieberegler - Zur Startposition bewegen" +msgid "Not customizable" +msgstr "" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "End" -msgstr "Ende" +#, c-format, boost-format +msgid "%s is assigned to %s. Reassign it to %s?" +msgstr "" -msgid "Horizontal slider - Move to last position" -msgstr "Horizontaler Schieberegler - Zur letzten Position bewegen" +#, c-format, boost-format +msgid "The default %s is assigned to %s. Reassign it to %s?" +msgstr "" + +msgid "Global shortcuts also apply while typing." +msgstr "" + +msgid "A key that types a character cannot be a global shortcut." +msgstr "" + +msgid "Esc cancels, Enter confirms." +msgstr "" + +#, c-format, boost-format +msgid "" +"Press the new shortcut for\n" +"\"%s\"" +msgstr "" + +#, c-format, boost-format +msgid "Already used as a step of %s." +msgstr "" + +#, c-format, boost-format +msgid "Already assigned to %s. Press OK to reassign it." +msgstr "" msgid "Release Note" msgstr "Hinweis zur Veröffentlichung" @@ -17194,8 +17115,8 @@ msgstr "Vorheizschritte" msgid "Insert multiple preheat commands (e.g. M104.1). Only useful for Prusa XL. For other printers, please set it to 1." msgstr "Fügen Sie mehrere Vorheizbefehle ein (z.B. M104.1). Nur nützlich für Prusa XL. Für andere Drucker bitte auf 1 setzen." -msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." -msgstr "G-Code, der ganz oben in die Ausgabedatei geschrieben wird, vor allen anderen Inhalten. Nützlich zum Hinzufügen von Metadaten, die die Druckerfirmware aus den ersten Zeilen der Datei liest (z.B. geschätzte Druckzeit, Filamentverbrauch). Unterstützt Platzhalter wie {print_time_sec} und {used_filament_length}." +msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_total_sec}, {print_time_day}, {print_time_hour}, {print_time_minute}, {print_time_sec} and {used_filament_length}." +msgstr "" # AI Translated msgid "Start G-code" @@ -18724,12 +18645,36 @@ msgstr "Genutztes Filament" msgid "Total length of filament used in the print." msgstr "Gesamtlänge des im Druck verwendeten Filaments." -msgid "Print time (seconds)" -msgstr "Druckzeit (Sekunden)" +msgid "Print time (total seconds)" +msgstr "" msgid "Total estimated print time in seconds. Replaced with actual value during post-processing." msgstr "Gesammt geschätzte Druckzeit in Sekunden. Ersetzt durch den tatsächlichen Wert während der Nachbearbeitung." +msgid "Print time (days component)" +msgstr "" + +msgid "Estimated print time day component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (hours component)" +msgstr "" + +msgid "Estimated print time hour component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (minutes component)" +msgstr "" + +msgid "Estimated print time minute component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (seconds component)" +msgstr "" + +msgid "Estimated print time second component (normal mode). Replaced with actual value during post-processing." +msgstr "" + msgid "Filament length (meters)" msgstr "Filamentlänge (Meter)" @@ -20563,6 +20508,9 @@ msgstr "Keine gültige Sitzung erkannt. Mit dem Login bei 3DPrinterOS fortfahren msgid "Success!" msgstr "Erfolgreich!" +msgid "Generate API Key" +msgstr "" + msgid "Are you sure to log out?" msgstr "Sind Sie sicher, dass Sie sich abmelden möchten?" @@ -21518,13 +21466,6 @@ msgstr "Das Bambu Netzwerk Plug-in ist erforderlich für Cloud-Funktionen, Druck msgid "Error: %s" msgstr "Fehler: %s" -msgid "Show details" -msgstr "Zeige Details" - -# AI Translated -msgid "Hide details" -msgstr "Details ausblenden" - msgid "Version to install:" msgstr "Version zum Installieren:" @@ -24155,6 +24096,12 @@ msgstr "" msgid "No binding for that field" msgstr "" +msgid "Enter a number" +msgstr "" + +msgid "Not a number" +msgstr "" + msgid "Primitive" msgstr "" @@ -24167,6 +24114,216 @@ msgstr "" msgid "Clear All" msgstr "" +msgctxt "Keyboard Shortcut" +msgid "Ins" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Home" +msgstr "Pos1" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "End" +msgstr "Ende" + +msgctxt "Keyboard Shortcut" +msgid "PgUp" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "PgDn" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Left" +msgstr "Pfeil nach links" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Right" +msgstr "Pfeil nach rechts" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Up" +msgstr "Pfeil nach oben" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Down" +msgstr "Pfeil nach unten" + +msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" +msgstr "Importiere Geometriedaten aus STL/STEP/3MF/OBJ/AMF-Dateien" + +msgid "Select all objects" +msgstr "Alle Objekte auswählen" + +msgid "Paste from clipboard" +msgstr "Aus Zwischenablage einfügen" + +msgid "Toggle printable for object/part" +msgstr "Druckbar für Objekt/Teil umschalten" + +msgid "Move selection 10mm in negative X direction" +msgstr "Auswahl 10 mm in negativer X-Richtung verschieben" + +msgid "Move selection 10mm in positive X direction" +msgstr "Auswahl 10 mm in positiver X-Richtung verschieben" + +msgid "Move selection 10mm in positive Y direction" +msgstr "Auswahl 10 mm in positiver Y-Richtung verschieben" + +msgid "Move selection 10mm in negative Y direction" +msgstr "Auswahl 10 mm in negativer Y-Richtung verschieben" + +msgid "Rotate selection 45 degrees counterclockwise" +msgstr "" + +msgid "Rotate selection 45 degrees clockwise" +msgstr "" + +msgid "Gizmo move" +msgstr "Bewegen" + +msgid "Gizmo rotate" +msgstr "Rotieren" + +msgid "Gizmo scale" +msgstr "Skalieren" + +msgid "Gizmo place face on bed" +msgstr "Fläche auf druckbett platzieren" + +msgid "Gizmo cut" +msgstr "Trennen" + +msgid "Gizmo mesh boolean" +msgstr "Gizmo mesh-boolesche" + +msgid "Gizmo FDM paint-on supports" +msgstr "" + +msgid "Gizmo FDM paint-on seam" +msgstr "FDM Naht aufmalen" + +msgid "Gizmo FDM paint-on fuzzy skin" +msgstr "FDM Pinsel auf Fuzzy Oberfläche" + +msgid "Gizmo multi-material painting" +msgstr "" + +msgid "Gizmo text emboss/engrave" +msgstr "Text prägen/gravieren" + +msgid "Gizmo measure" +msgstr "Gizmo messen" + +msgid "Gizmo assemble" +msgstr "Gizmo Zusammenbauen" + +msgid "Gizmo brim ears" +msgstr "Gizmo mausohren" + +msgid "Vertical slider - Move active thumb Up" +msgstr "Vertikaler Schieberegler - Aktiven Schieber nach oben bewegen" + +msgid "Vertical slider - Move active thumb Down" +msgstr "Vertikaler Schieberegler - Aktiven Schieber nach unten bewegen" + +msgid "Horizontal slider - Move active thumb Left" +msgstr "Horizontaler Schieberegler - Aktiven Schieber nach links bewegen" + +msgid "Horizontal slider - Move active thumb Right" +msgstr "Horizontaler Schieberegler - Aktiven Schieber nach rechts bewegen" + +msgid "Horizontal slider - Move to start position" +msgstr "Horizontaler Schieberegler - Zur Startposition bewegen" + +msgid "Horizontal slider - Move to last position" +msgstr "Horizontaler Schieberegler - Zur letzten Position bewegen" + +msgid "Camera view - Default" +msgstr "Kameraperspektive - Standard" + +msgid "Camera view - Top" +msgstr "Kameraperspektive - Oben" + +msgid "Camera view - Bottom" +msgstr "Kameraperspektive - Unten" + +msgid "Camera view - Front" +msgstr "Kameraperspektive - Vorderseite" + +msgid "Camera view - Behind" +msgstr "Kameraperspektive - Hinten" + +msgid "Camera Angle - Left side" +msgstr "Kameraperspektive - Links" + +msgid "Camera Angle - Right side" +msgstr "Kameraperspektive - Rechts" + +msgid "Camera view - Current plate" +msgstr "" + +msgid "Zoom in" +msgstr "Vergrößern" + +msgid "Zoom out" +msgstr "Verkleinern" + +msgid "Show/Hide 3Dconnexion devices settings dialog" +msgstr "Dialogfeld für 3Dconnexion Geräteeinstellungen anzeigen/ausblenden" + +msgid "Show/Hide wireframe" +msgstr "" + +msgid "On/Off G-code window" +msgstr "Ein-/Ausblenden des G-Code-Fensters" + +msgid "On/Off one layer mode of the vertical slider" +msgstr "Ein/Aus Einschichtmodus des vertikalen Schiebereglers" + +msgid "Switch between Prepare/Preview" +msgstr "Zwischen Vorbereiten/ Vorschau wechseln" + +msgid "Collapse/Expand the sidebar" +msgstr "Seitenleiste zu-/aufklappen" + +msgid "Open the speed dial" +msgstr "" + +msgid "Reload the device page" +msgstr "" + +msgid "Show keyboard shortcuts list" +msgstr "Liste der Tastaturkürzel anzeigen" + +msgid "Slicing and printing" +msgstr "" + +msgid "Editing" +msgstr "" + +msgid "Placement" +msgstr "" + +msgid "Gizmos" +msgstr "" + +msgid "Sliders" +msgstr "" + +msgid "Painting tools" +msgstr "" + +msgid "Application" +msgstr "" + #: resources/data/hints.ini: [hint:Precise wall] msgid "" "Precise wall\n" @@ -24467,6 +24624,63 @@ msgstr "" "Verwerfungen vermeiden\n" "Wussten Sie, dass beim Drucken von Materialien, die zu Verwerfungen neigen, wie z.B. ABS, durch eine entsprechende Erhöhung der Heizbetttemperatur die Wahrscheinlichkeit von Verwerfungen verringert werden kann?" +# AI Translated +#~ msgid "Tab" +#~ msgstr "Tab" + +#~ msgid "Displays current viewport FPS in the top-right corner." +#~ msgstr "Zeigt die aktuelle FPS des Viewports in der oberen rechten Ecke an." + +# AI Translated +#~ msgid "Publish 3MF Wiki" +#~ msgstr "Wiki: 3MF veröffentlichen" + +# AI Translated +#~ msgid "Publish 3MF Video Guide" +#~ msgstr "Videoanleitung: 3MF veröffentlichen" + +#~ msgid "Toolbar" +#~ msgstr "Werkzeugleiste" + +#~ msgid "Switch table page" +#~ msgstr "Seitenwechsel" + +#~ msgid "Global shortcuts" +#~ msgstr "Globale Tastaturkürzel" + +#~ msgid "Middle mouse button" +#~ msgstr "Mittlere Maustaste" + +#~ msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." +#~ msgstr "Diese Funktion richtet ausgewählte Objekte oder alle Objekte automatisch aus. Wenn es ausgewählte Objekte gibt, werden nur die ausgewählten Objekte ausgerichtet. Andernfalls werden alle Objekte auf das aktuelle Projekt ausgerichtet." + +#~ msgid "Auto orients all objects on the active plate." +#~ msgstr "Diese Funktion richtet alle Objekte auf der aktuellen Druckplatte ausgerichtet." + +#~ msgid "Any arrow" +#~ msgstr "Beliebiger Pfeil" + +#~ msgid "Gizmo SLA support points" +#~ msgstr "SLA Stützpunkte" + +#~ msgid "Plater" +#~ msgstr "Druckplatte" + +#~ msgid "Gizmo" +#~ msgstr "Gizmo" + +#~ msgid "Delete objects, parts, modifiers" +#~ msgstr "Objekte, Teile, Modifikatoren löschen" + +#~ msgid "Objects List" +#~ msgstr "Objektliste" + +#~ msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." +#~ msgstr "G-Code, der ganz oben in die Ausgabedatei geschrieben wird, vor allen anderen Inhalten. Nützlich zum Hinzufügen von Metadaten, die die Druckerfirmware aus den ersten Zeilen der Datei liest (z.B. geschätzte Druckzeit, Filamentverbrauch). Unterstützt Platzhalter wie {print_time_sec} und {used_filament_length}." + +#~ msgid "Print time (seconds)" +#~ msgstr "Druckzeit (Sekunden)" + # AI Translated #~ msgid "Open actions speed dial" #~ msgstr "Aktions-Schnellwahl öffnen" diff --git a/localization/i18n/en/OrcaSlicer_en.po b/localization/i18n/en/OrcaSlicer_en.po index 080cae9632..12ae826e67 100644 --- a/localization/i18n/en/OrcaSlicer_en.po +++ b/localization/i18n/en/OrcaSlicer_en.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-09-18 15:50+0800\n" +"POT-Creation-Date: 2026-09-22 17:02+0800\n" "PO-Revision-Date: 2026-06-17 15:44-0300\n" "Last-Translator: Alexandre Folle de Menezes\n" "Language-Team: \n" @@ -5550,10 +5550,13 @@ msgctxt "Camera View" msgid "Right" msgstr "" -msgid "Add" +msgid "Add plate" msgstr "" -msgid "Add plate" +msgid "Split to objects" +msgstr "" + +msgid "Add" msgstr "" msgid "Auto orient all/selected objects" @@ -5568,9 +5571,6 @@ msgstr "" msgid "Arrange objects on selected plates" msgstr "" -msgid "Split to objects" -msgstr "" - msgid "Assembly View" msgstr "" @@ -5625,6 +5625,9 @@ msgstr "" msgid "Wireframe" msgstr "" +msgid "X-Ray" +msgstr "" + msgid "Realistic View" msgstr "" @@ -6154,9 +6157,6 @@ msgstr "" msgid "Preferences" msgstr "" -msgid "Open speed dial..." -msgstr "" - msgctxt "Menu" msgid "Edit" msgstr "" @@ -6164,6 +6164,9 @@ msgstr "" msgid "View" msgstr "" +msgid "Open Speed Dial" +msgstr "" + msgid "Preset Bundle" msgstr "" @@ -7882,9 +7885,6 @@ msgstr "" msgid "Collapse sidebar" msgstr "" -msgid "Tab" -msgstr "" - #, c-format, boost-format msgid "Loading file: %s" msgstr "" @@ -8823,10 +8823,10 @@ msgstr "" msgid "With this option enabled, you can send a task to multiple devices at the same time and manage multiple devices." msgstr "" -msgid "Open the Speed Dial with the Space key" +msgid "Open the Speed Dial from the keyboard" msgstr "" -msgid "When enabled, pressing Space (with no other key held) opens the Speed Dial action search from any page." +msgid "When enabled, the Speed Dial keyboard shortcut (Space by default) opens the action search from any page." msgstr "" msgid "Recent actions" @@ -8952,6 +8952,15 @@ msgstr "" msgid "Set the action that dragging the right mouse button should perform." msgstr "" +msgid "Keyboard" +msgstr "" + +msgid "Keyboard shortcuts" +msgstr "" + +msgid "Choose the key for each action." +msgstr "" + msgid "Clear my choice on..." msgstr "" @@ -9045,10 +9054,38 @@ msgid "" "Set to 0 for unlimited frame rate." msgstr "" +msgid "Reuse the 3D scene while idle" +msgstr "" + +msgid "" +"Skips redrawing the 3D scene when only the mouse cursor moves over the viewport,\n" +"and reuses the previous frame's scene instead. Reduces GPU load.\n" +"Disable it if the viewport shows stale or missing contents.\n" +"\n" +"Takes effect immediately." +msgstr "" + +msgid "Skip unchanged frames" +msgstr "" + +msgid "" +"Skips drawing a frame altogether when it would be identical to the one already on screen.\n" +"Only applies to frames that reuse the 3D scene, so it needs Reuse the 3D scene while idle.\n" +"Disable it if a hover highlight, tooltip or animation stops updating.\n" +"\n" +"Takes effect immediately." +msgstr "" + msgid "Show FPS overlay" msgstr "" -msgid "Displays current viewport FPS in the top-right corner." +msgid "Displays rendering counts in the top-right corner of the viewport." +msgstr "" + +msgid "FPS: frames presented to the screen per second." +msgstr "" + +msgid "3D: frames per second that redrew the 3D scene." msgstr "" msgid "G-code Preview" @@ -9476,10 +9513,7 @@ msgstr "" msgid "Select which settings to be published in the 3MF file" msgstr "" -msgid "Publish 3MF Wiki" -msgstr "" - -msgid "Publish 3MF Video Guide" +msgid "Video Guide" msgstr "" msgid "Mixed filament - published as a whole when \"Enable\" above is selected" @@ -9671,6 +9705,12 @@ msgstr "" msgid "No wiki page for this action" msgstr "" +msgid "Show details" +msgstr "" + +msgid "Hide details" +msgstr "" + #, c-format, boost-format msgid "\"%s\" is a Developer setting. Enable Developer mode to edit it?" msgstr "" @@ -11369,65 +11409,37 @@ msgstr "" msgid "Configuration package changed" msgstr "" -msgid "Toolbar" -msgstr "" - -msgid "Objects list" -msgstr "" - -msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" -msgstr "" - -msgid "Paste from clipboard" -msgstr "" - -msgid "Show/Hide 3Dconnexion devices settings dialog" -msgstr "" - -msgid "Switch table page" -msgstr "" - -msgctxt "Keyboard Shortcut" -msgid "Space" -msgstr "" - -msgid "Open speed dial" -msgstr "" - -msgid "Run a Speed Dial favourite (while the Speed Dial is open)" -msgstr "" - -msgid "Show keyboard shortcuts list" -msgstr "" - -msgid "Global shortcuts" -msgstr "" - msgid "Pan View" msgstr "" msgid "Rotate View" msgstr "" -msgid "Middle mouse button" +#, c-format, boost-format +msgid "Use %s or %s, or a key that does not type a character." msgstr "" -msgid "Zoom View" +msgctxt "Keyboard Shortcut" +msgid "Key" msgstr "" -msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." +msgid "Left mouse" msgstr "" -msgid "Auto orients all objects on the active plate." +msgid "Available anywhere in the window, even while typing in a text field." msgstr "" -msgid "Collapse/Expand the sidebar" +msgid "Run a speed dial favorite while the dial is open" msgstr "" -msgid "Any arrow" +msgctxt "Keyboard Shortcut" +msgid "Tab" msgstr "" -msgid "Movement in camera space" +msgid "Switch to the next main tab" +msgstr "" + +msgid "Available while the 3D view on the Prepare tab has focus." msgstr "" msgid "Select a part" @@ -11439,120 +11451,28 @@ msgstr "" msgid "Select objects by rectangle" msgstr "" -msgctxt "Keyboard Shortcut" -msgid "Arrow Up" -msgstr "" - -msgid "Move selection 10mm in positive Y direction" -msgstr "" - -msgctxt "Keyboard Shortcut" -msgid "Arrow Down" -msgstr "" - -msgid "Move selection 10mm in negative Y direction" -msgstr "" - -msgctxt "Keyboard Shortcut" -msgid "Arrow Left" -msgstr "" - -msgid "Move selection 10mm in negative X direction" -msgstr "" - -msgctxt "Keyboard Shortcut" -msgid "Arrow Right" -msgstr "" - -msgid "Move selection 10mm in positive X direction" +msgid "Keyboard 1-9: set filament for object/part" msgstr "" msgid "Movement step set to 1mm" msgstr "" -msgid "Keyboard 1-9: set filament for object/part" +msgid "Movement in camera space" msgstr "" -msgid "Camera view - Default" +msgid "Middle mouse" msgstr "" -msgid "Camera view - Top" +msgid "Right mouse" msgstr "" -msgid "Camera view - Bottom" +msgid "Zoom View" msgstr "" -msgid "Camera view - Front" +msgid "Painting" msgstr "" -msgid "Camera view - Behind" -msgstr "" - -msgid "Camera Angle - Left side" -msgstr "" - -msgid "Camera Angle - Right side" -msgstr "" - -msgid "Select all objects" -msgstr "" - -msgid "Gizmo move" -msgstr "" - -msgid "Gizmo rotate" -msgstr "" - -msgid "Gizmo scale" -msgstr "" - -msgid "Gizmo place face on bed" -msgstr "" - -msgid "Gizmo cut" -msgstr "" - -msgid "Gizmo mesh boolean" -msgstr "" - -msgid "Gizmo FDM paint-on fuzzy skin" -msgstr "" - -msgid "Gizmo SLA support points" -msgstr "" - -msgid "Gizmo FDM paint-on seam" -msgstr "" - -msgid "Gizmo text emboss/engrave" -msgstr "" - -msgid "Gizmo measure" -msgstr "" - -msgid "Gizmo assemble" -msgstr "" - -msgid "Gizmo brim ears" -msgstr "" - -msgid "Zoom in" -msgstr "" - -msgid "Zoom out" -msgstr "" - -msgid "Toggle printable for object/part" -msgstr "" - -msgctxt "Keyboard Shortcut" -msgid "Tab" -msgstr "" - -msgid "Switch between Prepare/Preview" -msgstr "" - -msgid "Plater" +msgid "Available while a painting gizmo is open: supports, seam, fuzzy skin or color painting." msgstr "" msgid "Move: press to snap by 1mm" @@ -11564,13 +11484,17 @@ msgstr "" msgid "Support/Color Painting: adjust section position" msgstr "" -msgid "Gizmo" +msgid "Objects list" +msgstr "" + +msgid "Available while the object list has focus." msgstr "" msgid "Set extruder number for the objects and parts" msgstr "" -msgid "Delete objects, parts, modifiers" +msgctxt "Keyboard Shortcut" +msgid "Space" msgstr "" msgid "Select the object/part and press space to change the name" @@ -11582,42 +11506,47 @@ msgstr "" msgid "Select the object/part and mouse click to change the name" msgstr "" -msgid "Objects List" -msgstr "" - -msgid "Vertical slider - Move active thumb Up" -msgstr "" - -msgid "Vertical slider - Move active thumb Down" -msgstr "" - -msgid "Horizontal slider - Move active thumb Left" -msgstr "" - -msgid "Horizontal slider - Move active thumb Right" -msgstr "" - -msgid "On/Off one layer mode of the vertical slider" -msgstr "" - -msgid "On/Off G-code window" +msgid "Available while the 3D view on the Preview tab has focus." msgstr "" msgid "Move slider 5x faster" msgstr "" -msgctxt "Keyboard Shortcut" -msgid "Home" +msgid "Scroll slider 5x faster" msgstr "" -msgid "Horizontal slider - Move to start position" +msgid "Not customizable" msgstr "" -msgctxt "Keyboard Shortcut" -msgid "End" +#, c-format, boost-format +msgid "%s is assigned to %s. Reassign it to %s?" msgstr "" -msgid "Horizontal slider - Move to last position" +#, c-format, boost-format +msgid "The default %s is assigned to %s. Reassign it to %s?" +msgstr "" + +msgid "Global shortcuts also apply while typing." +msgstr "" + +msgid "A key that types a character cannot be a global shortcut." +msgstr "" + +msgid "Esc cancels, Enter confirms." +msgstr "" + +#, c-format, boost-format +msgid "" +"Press the new shortcut for\n" +"\"%s\"" +msgstr "" + +#, c-format, boost-format +msgid "Already used as a step of %s." +msgstr "" + +#, c-format, boost-format +msgid "Already assigned to %s. Press OK to reassign it." msgstr "" msgid "Release Note" @@ -15917,7 +15846,7 @@ msgstr "" msgid "Insert multiple preheat commands (e.g. M104.1). Only useful for Prusa XL. For other printers, please set it to 1." msgstr "" -msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." +msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_total_sec}, {print_time_day}, {print_time_hour}, {print_time_minute}, {print_time_sec} and {used_filament_length}." msgstr "" msgid "Start G-code" @@ -17326,12 +17255,36 @@ msgstr "" msgid "Total length of filament used in the print." msgstr "" -msgid "Print time (seconds)" +msgid "Print time (total seconds)" msgstr "" msgid "Total estimated print time in seconds. Replaced with actual value during post-processing." msgstr "" +msgid "Print time (days component)" +msgstr "" + +msgid "Estimated print time day component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (hours component)" +msgstr "" + +msgid "Estimated print time hour component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (minutes component)" +msgstr "" + +msgid "Estimated print time minute component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (seconds component)" +msgstr "" + +msgid "Estimated print time second component (normal mode). Replaced with actual value during post-processing." +msgstr "" + msgid "Filament length (meters)" msgstr "" @@ -19012,6 +18965,9 @@ msgstr "" msgid "Success!" msgstr "" +msgid "Generate API Key" +msgstr "" + msgid "Are you sure to log out?" msgstr "" @@ -19948,12 +19904,6 @@ msgstr "" msgid "Error: %s" msgstr "" -msgid "Show details" -msgstr "" - -msgid "Hide details" -msgstr "" - msgid "Version to install:" msgstr "" @@ -22532,6 +22482,12 @@ msgstr "" msgid "No binding for that field" msgstr "" +msgid "Enter a number" +msgstr "" + +msgid "Not a number" +msgstr "" + msgid "Primitive" msgstr "" @@ -22544,6 +22500,210 @@ msgstr "" msgid "Clear All" msgstr "" +msgctxt "Keyboard Shortcut" +msgid "Ins" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "Home" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "End" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "PgUp" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "PgDn" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "Arrow Left" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "Arrow Right" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "Arrow Up" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "Arrow Down" +msgstr "" + +msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" +msgstr "" + +msgid "Select all objects" +msgstr "" + +msgid "Paste from clipboard" +msgstr "" + +msgid "Toggle printable for object/part" +msgstr "" + +msgid "Move selection 10mm in negative X direction" +msgstr "" + +msgid "Move selection 10mm in positive X direction" +msgstr "" + +msgid "Move selection 10mm in positive Y direction" +msgstr "" + +msgid "Move selection 10mm in negative Y direction" +msgstr "" + +msgid "Rotate selection 45 degrees counterclockwise" +msgstr "" + +msgid "Rotate selection 45 degrees clockwise" +msgstr "" + +msgid "Gizmo move" +msgstr "" + +msgid "Gizmo rotate" +msgstr "" + +msgid "Gizmo scale" +msgstr "" + +msgid "Gizmo place face on bed" +msgstr "" + +msgid "Gizmo cut" +msgstr "" + +msgid "Gizmo mesh boolean" +msgstr "" + +msgid "Gizmo FDM paint-on supports" +msgstr "" + +msgid "Gizmo FDM paint-on seam" +msgstr "" + +msgid "Gizmo FDM paint-on fuzzy skin" +msgstr "" + +msgid "Gizmo multi-material painting" +msgstr "" + +msgid "Gizmo text emboss/engrave" +msgstr "" + +msgid "Gizmo measure" +msgstr "" + +msgid "Gizmo assemble" +msgstr "" + +msgid "Gizmo brim ears" +msgstr "" + +msgid "Vertical slider - Move active thumb Up" +msgstr "" + +msgid "Vertical slider - Move active thumb Down" +msgstr "" + +msgid "Horizontal slider - Move active thumb Left" +msgstr "" + +msgid "Horizontal slider - Move active thumb Right" +msgstr "" + +msgid "Horizontal slider - Move to start position" +msgstr "" + +msgid "Horizontal slider - Move to last position" +msgstr "" + +msgid "Camera view - Default" +msgstr "" + +msgid "Camera view - Top" +msgstr "" + +msgid "Camera view - Bottom" +msgstr "" + +msgid "Camera view - Front" +msgstr "" + +msgid "Camera view - Behind" +msgstr "" + +msgid "Camera Angle - Left side" +msgstr "" + +msgid "Camera Angle - Right side" +msgstr "" + +msgid "Camera view - Current plate" +msgstr "" + +msgid "Zoom in" +msgstr "" + +msgid "Zoom out" +msgstr "" + +msgid "Show/Hide 3Dconnexion devices settings dialog" +msgstr "" + +msgid "Show/Hide wireframe" +msgstr "" + +msgid "On/Off G-code window" +msgstr "" + +msgid "On/Off one layer mode of the vertical slider" +msgstr "" + +msgid "Switch between Prepare/Preview" +msgstr "" + +msgid "Collapse/Expand the sidebar" +msgstr "" + +msgid "Open the speed dial" +msgstr "" + +msgid "Reload the device page" +msgstr "" + +msgid "Show keyboard shortcuts list" +msgstr "" + +msgid "Slicing and printing" +msgstr "" + +msgid "Editing" +msgstr "" + +msgid "Placement" +msgstr "" + +msgid "Gizmos" +msgstr "" + +msgid "Sliders" +msgstr "" + +msgid "Painting tools" +msgstr "" + +msgid "Application" +msgstr "" + #: resources/data/hints.ini: [hint:Precise wall] msgid "" "Precise wall\n" diff --git a/localization/i18n/es/OrcaSlicer_es.po b/localization/i18n/es/OrcaSlicer_es.po index 5d864aa200..4c2a634e3c 100644 --- a/localization/i18n/es/OrcaSlicer_es.po +++ b/localization/i18n/es/OrcaSlicer_es.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-09-18 15:50+0800\n" +"POT-Creation-Date: 2026-09-22 17:02+0800\n" "PO-Revision-Date: \n" "Last-Translator: Ian A. Bassi <>\n" "Language-Team: \n" @@ -5729,12 +5729,15 @@ msgctxt "Camera View" msgid "Right" msgstr "Derecha" -msgid "Add" -msgstr "Añadir" - msgid "Add plate" msgstr "Añadir cama" +msgid "Split to objects" +msgstr "Separar en objetos" + +msgid "Add" +msgstr "Añadir" + msgid "Auto orient all/selected objects" msgstr "Orientar automáticamente todos/seleccionados objetos" @@ -5747,9 +5750,6 @@ msgstr "Ordenar todos los objetos" msgid "Arrange objects on selected plates" msgstr "Organizar los objetos en las camas seleccionadas" -msgid "Split to objects" -msgstr "Separar en objetos" - msgid "Assembly View" msgstr "Vista de Emsamblado" @@ -5804,6 +5804,9 @@ msgstr "Contorno" msgid "Wireframe" msgstr "Malla alámbrica" +msgid "X-Ray" +msgstr "" + msgid "Realistic View" msgstr "Vista realista" @@ -6343,9 +6346,6 @@ msgstr "Mostrar el contorno alrededor del objeto seleccionado en la escena 3D." msgid "Preferences" msgstr "Preferencias" -msgid "Open speed dial..." -msgstr "" - msgctxt "Menu" msgid "Edit" msgstr "Edición" @@ -6353,6 +6353,9 @@ msgstr "Edición" msgid "View" msgstr "Vista" +msgid "Open Speed Dial" +msgstr "" + msgid "Preset Bundle" msgstr "Paquete de perfiles" @@ -8109,9 +8112,6 @@ msgstr "Expandir barra lateral" msgid "Collapse sidebar" msgstr "Colapsar barra lateral" -msgid "Tab" -msgstr "Pestaña" - #, c-format, boost-format msgid "Loading file: %s" msgstr "Cargando archivo: %s" @@ -9102,10 +9102,10 @@ msgstr "Gestión multidispositivo" msgid "With this option enabled, you can send a task to multiple devices at the same time and manage multiple devices." msgstr "Con esta opción activada, puede enviar una tarea a varios dispositivos al mismo tiempo y gestionar varios dispositivos." -msgid "Open the Speed Dial with the Space key" +msgid "Open the Speed Dial from the keyboard" msgstr "" -msgid "When enabled, pressing Space (with no other key held) opens the Speed Dial action search from any page." +msgid "When enabled, the Speed Dial keyboard shortcut (Space by default) opens the action search from any page." msgstr "" msgid "Recent actions" @@ -9237,6 +9237,15 @@ msgstr "Arrastrar con el botón derecho del ratón" msgid "Set the action that dragging the right mouse button should perform." msgstr "Establece la acción que se debe realizar al arrastrar el botón derecho del ratón." +msgid "Keyboard" +msgstr "" + +msgid "Keyboard shortcuts" +msgstr "" + +msgid "Choose the key for each action." +msgstr "" + msgid "Clear my choice on..." msgstr "Limpiar mi elección en..." @@ -9345,11 +9354,39 @@ msgstr "" "Limita la frecuencia de fotogramas de la ventana gráfica para reducir la carga de la GPU y el consumo de energía.\n" "Establece el valor en 0 para una frecuencia de fotogramas ilimitada." +msgid "Reuse the 3D scene while idle" +msgstr "" + +msgid "" +"Skips redrawing the 3D scene when only the mouse cursor moves over the viewport,\n" +"and reuses the previous frame's scene instead. Reduces GPU load.\n" +"Disable it if the viewport shows stale or missing contents.\n" +"\n" +"Takes effect immediately." +msgstr "" + +msgid "Skip unchanged frames" +msgstr "" + +msgid "" +"Skips drawing a frame altogether when it would be identical to the one already on screen.\n" +"Only applies to frames that reuse the 3D scene, so it needs Reuse the 3D scene while idle.\n" +"Disable it if a hover highlight, tooltip or animation stops updating.\n" +"\n" +"Takes effect immediately." +msgstr "" + msgid "Show FPS overlay" msgstr "Mostrar FPS en pantalla" -msgid "Displays current viewport FPS in the top-right corner." -msgstr "Muestra los FPS en la esquina superior derecha." +msgid "Displays rendering counts in the top-right corner of the viewport." +msgstr "" + +msgid "FPS: frames presented to the screen per second." +msgstr "" + +msgid "3D: frames per second that redrew the 3D scene." +msgstr "" msgid "G-code Preview" msgstr "Vista previa del G-code" @@ -9800,13 +9837,8 @@ msgstr "Publicar 3MF..." msgid "Select which settings to be published in the 3MF file" msgstr "Seleccione qué ajustes se publicarán en el archivo 3MF" -# AI Translated -msgid "Publish 3MF Wiki" -msgstr "Wiki de Publicar 3MF" - -# AI Translated -msgid "Publish 3MF Video Guide" -msgstr "Guía en vídeo de Publicar 3MF" +msgid "Video Guide" +msgstr "" # AI Translated msgid "Mixed filament - published as a whole when \"Enable\" above is selected" @@ -10008,6 +10040,12 @@ msgstr "" msgid "No wiki page for this action" msgstr "" +msgid "Show details" +msgstr "Mostrar detalles" + +msgid "Hide details" +msgstr "Ocultar detalles" + #, c-format, boost-format msgid "\"%s\" is a Developer setting. Enable Developer mode to edit it?" msgstr "" @@ -11783,66 +11821,38 @@ msgstr "El paquete de configuración se cambia en la Guía de configuración ant msgid "Configuration package changed" msgstr "Paquete de configuración cambiado" -msgid "Toolbar" -msgstr "Barra de herramientas" - -msgid "Objects list" -msgstr "Lista de objetos" - -msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" -msgstr "Importar datos de geometría de los archivos STL/STEP/3MF/OBJ/AMF" - -msgid "Paste from clipboard" -msgstr "Pegar desde el portapapeles" - -msgid "Show/Hide 3Dconnexion devices settings dialog" -msgstr "Mostrar/Ocultar el diálogo de ajustes de los dispositivos 3Dconnexion" - -msgid "Switch table page" -msgstr "Cambiar de página de tabla" - -msgctxt "Keyboard Shortcut" -msgid "Space" -msgstr "Espacio" - -msgid "Open speed dial" -msgstr "" - -msgid "Run a Speed Dial favourite (while the Speed Dial is open)" -msgstr "" - -msgid "Show keyboard shortcuts list" -msgstr "Muestra lista de atajos de teclado" - -msgid "Global shortcuts" -msgstr "Atajos globales" - msgid "Pan View" msgstr "Movimiento de la vista" msgid "Rotate View" msgstr "Rotación de vista" -msgid "Middle mouse button" -msgstr "Botón central del ratón" +#, c-format, boost-format +msgid "Use %s or %s, or a key that does not type a character." +msgstr "" -msgid "Zoom View" -msgstr "Zoom de vista" +msgctxt "Keyboard Shortcut" +msgid "Key" +msgstr "" -msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." -msgstr "Orienta automáticamente los objetos seleccionados o todos los objetos. Si hay objetos seleccionados, sólo orienta los seleccionados. En caso contrario, orientará todos los objetos del proyecto actual." +msgid "Left mouse" +msgstr "" -msgid "Auto orients all objects on the active plate." -msgstr "Orienta automáticamente todos los objetos de la placa actual." +msgid "Available anywhere in the window, even while typing in a text field." +msgstr "" -msgid "Collapse/Expand the sidebar" -msgstr "Ocultar/Expandir barra lateral" +msgid "Run a speed dial favorite while the dial is open" +msgstr "" -msgid "Any arrow" -msgstr "⌘+Cualquier flecha" +msgctxt "Keyboard Shortcut" +msgid "Tab" +msgstr "Tab" -msgid "Movement in camera space" -msgstr "Movimiento en el espacio de la cámara" +msgid "Switch to the next main tab" +msgstr "" + +msgid "Available while the 3D view on the Prepare tab has focus." +msgstr "" msgid "Select a part" msgstr "Seleccionar una pieza" @@ -11853,121 +11863,29 @@ msgstr "Seleccionar varios objetos" msgid "Select objects by rectangle" msgstr "Seleccionar objetos por rectángulo" -msgctxt "Keyboard Shortcut" -msgid "Arrow Up" -msgstr "Flecha arriba" - -msgid "Move selection 10mm in positive Y direction" -msgstr "Mover la selección 10 mm en dirección Y positiva" - -msgctxt "Keyboard Shortcut" -msgid "Arrow Down" -msgstr "Flecha abajo" - -msgid "Move selection 10mm in negative Y direction" -msgstr "Mover la selección 10 mm en dirección Y negativa" - -msgctxt "Keyboard Shortcut" -msgid "Arrow Left" -msgstr "Flecha izquierda" - -msgid "Move selection 10mm in negative X direction" -msgstr "Mover la selección 10 mm en dirección X negativa" - -msgctxt "Keyboard Shortcut" -msgid "Arrow Right" -msgstr "Flecha derecha" - -msgid "Move selection 10mm in positive X direction" -msgstr "Mover la selección 10 mm en dirección X positiva" +msgid "Keyboard 1-9: set filament for object/part" +msgstr "Teclado 1-9: ajustar el filamento para el objeto/pieza" msgid "Movement step set to 1mm" msgstr "Paso de movimiento configurado a 1 mm" -msgid "Keyboard 1-9: set filament for object/part" -msgstr "Teclado 1-9: ajustar el filamento para el objeto/pieza" +msgid "Movement in camera space" +msgstr "Movimiento en el espacio de la cámara" -msgid "Camera view - Default" -msgstr "Vista de la cámara - Por defecto" +msgid "Middle mouse" +msgstr "" -msgid "Camera view - Top" -msgstr "Vista de la cámara - Parte Superior" +msgid "Right mouse" +msgstr "" -msgid "Camera view - Bottom" -msgstr "Vista de la cámara - Parte inferior" +msgid "Zoom View" +msgstr "Zoom de vista" -msgid "Camera view - Front" -msgstr "Vista de la cámara - Frontal" +msgid "Painting" +msgstr "" -msgid "Camera view - Behind" -msgstr "Vista de la cámara - Posterior" - -msgid "Camera Angle - Left side" -msgstr "Ángulo de la cámara - Lado izquierdo" - -msgid "Camera Angle - Right side" -msgstr "Ángulo de la cámara - Lado derecho" - -msgid "Select all objects" -msgstr "Seleccionar todos los objetos" - -msgid "Gizmo move" -msgstr "Herramienta de movimiento" - -msgid "Gizmo rotate" -msgstr "Herramienta de rotación" - -msgid "Gizmo scale" -msgstr "Herramienta de escala" - -msgid "Gizmo place face on bed" -msgstr "Herramienta de situar cara en cama" - -msgid "Gizmo cut" -msgstr "Herramienta de corte" - -msgid "Gizmo mesh boolean" -msgstr "Gizmo buleana de malla" - -msgid "Gizmo FDM paint-on fuzzy skin" -msgstr "Herramienta FDM para pintar piel rugosa" - -msgid "Gizmo SLA support points" -msgstr "Herramienta de puntos de soporte SLA" - -msgid "Gizmo FDM paint-on seam" -msgstr "Herramienta de pintado de costuras FDM" - -msgid "Gizmo text emboss/engrave" -msgstr "Herramienta de texto en relieve/grabado" - -msgid "Gizmo measure" -msgstr "Gizmo medir" - -msgid "Gizmo assemble" -msgstr "Gizmo ensamblar" - -msgid "Gizmo brim ears" -msgstr "Gizmo orejas de borde" - -msgid "Zoom in" -msgstr "Acercar" - -msgid "Zoom out" -msgstr "Alejar" - -msgid "Toggle printable for object/part" -msgstr "Activar/desactivar la impresión para el objeto/pieza" - -msgctxt "Keyboard Shortcut" -msgid "Tab" -msgstr "Tab" - -msgid "Switch between Prepare/Preview" -msgstr "Cambiar entre Preparar/Previsualizar" - -msgid "Plater" -msgstr "Cama" +msgid "Available while a painting gizmo is open: supports, seam, fuzzy skin or color painting." +msgstr "" msgid "Move: press to snap by 1mm" msgstr "Mover: pulsar para ajustar 1mm" @@ -11978,14 +11896,18 @@ msgstr "Soporte/Pintado en color: ajuste del radio del pincel" msgid "Support/Color Painting: adjust section position" msgstr "Soporte/Pintado de color: ajuste de la posición de la sección" -msgid "Gizmo" -msgstr "Herramienta" +msgid "Objects list" +msgstr "Lista de objetos" + +msgid "Available while the object list has focus." +msgstr "" msgid "Set extruder number for the objects and parts" msgstr "Ajustar el número de extrusor para los objetos y las piezas" -msgid "Delete objects, parts, modifiers" -msgstr "Eliminar objetos, piezas, modificadores" +msgctxt "Keyboard Shortcut" +msgid "Space" +msgstr "Espacio" msgid "Select the object/part and press space to change the name" msgstr "Seleccione el objeto/pieza y pulse la barra espaciadora para cambiar el nombre" @@ -11996,43 +11918,48 @@ msgstr "Clic del ratón" msgid "Select the object/part and mouse click to change the name" msgstr "Seleccione el objeto/pieza y haga clic con el ratón para cambiar el nombre" -msgid "Objects List" -msgstr "Lista de Objetos" - -msgid "Vertical slider - Move active thumb Up" -msgstr "Control deslizante vertical - Mover el pulgar activo hacia Arriba" - -msgid "Vertical slider - Move active thumb Down" -msgstr "Control deslizante vertical - Mover el pulgar activo hacia Abajo" - -msgid "Horizontal slider - Move active thumb Left" -msgstr "Control deslizante horizontal - Mover el pulgar activo hacia la Izquierda" - -msgid "Horizontal slider - Move active thumb Right" -msgstr "Control deslizante horizontal - Mover el pulgar activo hacia la Derecha" - -msgid "On/Off one layer mode of the vertical slider" -msgstr "Activar/Desactivar el modo de una capa del control deslizante vertical" - -msgid "On/Off G-code window" -msgstr "Activar/Desactivar ventana de G-Code" +msgid "Available while the 3D view on the Preview tab has focus." +msgstr "" msgid "Move slider 5x faster" msgstr "Mover el deslizador 5 veces más rápido" -msgctxt "Keyboard Shortcut" -msgid "Home" -msgstr "Inicio" +msgid "Scroll slider 5x faster" +msgstr "" -msgid "Horizontal slider - Move to start position" -msgstr "Deslizador horizontal - Desplazarse a la posición inicial" +msgid "Not customizable" +msgstr "" -msgctxt "Keyboard Shortcut" -msgid "End" -msgstr "Fin" +#, c-format, boost-format +msgid "%s is assigned to %s. Reassign it to %s?" +msgstr "" -msgid "Horizontal slider - Move to last position" -msgstr "Deslizador horizontal - Desplazarse a la última posición" +#, c-format, boost-format +msgid "The default %s is assigned to %s. Reassign it to %s?" +msgstr "" + +msgid "Global shortcuts also apply while typing." +msgstr "" + +msgid "A key that types a character cannot be a global shortcut." +msgstr "" + +msgid "Esc cancels, Enter confirms." +msgstr "" + +#, c-format, boost-format +msgid "" +"Press the new shortcut for\n" +"\"%s\"" +msgstr "" + +#, c-format, boost-format +msgid "Already used as a step of %s." +msgstr "" + +#, c-format, boost-format +msgid "Already assigned to %s. Press OK to reassign it." +msgstr "" msgid "Release Note" msgstr "Notas de versión" @@ -16817,8 +16744,8 @@ msgstr "Pasos de precalentamiento" msgid "Insert multiple preheat commands (e.g. M104.1). Only useful for Prusa XL. For other printers, please set it to 1." msgstr "Insertar múltiples comandos de precalentamiento (por ejemplo, M104.1). Sólo útil para Prusa XL. Para otras impresoras, por favor ajústar a 1." -msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." -msgstr "G-code escrito en la parte superior del archivo de salida, antes de cualquier otro contenido. Útil para añadir metadatos que el firmware de la impresora lea desde las primeras líneas del archivo (por ejemplo, tiempo estimado de impresión, uso de filamento). Soporta marcadores como {print_time_sec} y {used_filament_length}." +msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_total_sec}, {print_time_day}, {print_time_hour}, {print_time_minute}, {print_time_sec} and {used_filament_length}." +msgstr "" msgid "Start G-code" msgstr "G-Code inicial" @@ -18326,12 +18253,36 @@ msgstr "Filamento usado" msgid "Total length of filament used in the print." msgstr "Longitud total de filamento utilizado en la impresión." -msgid "Print time (seconds)" -msgstr "Tiempo de impresión (segundos)" +msgid "Print time (total seconds)" +msgstr "" msgid "Total estimated print time in seconds. Replaced with actual value during post-processing." msgstr "Tiempo total estimado de impresión en segundos. Reemplazado con valor real durante el post-procesamiento." +msgid "Print time (days component)" +msgstr "" + +msgid "Estimated print time day component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (hours component)" +msgstr "" + +msgid "Estimated print time hour component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (minutes component)" +msgstr "" + +msgid "Estimated print time minute component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (seconds component)" +msgstr "" + +msgid "Estimated print time second component (normal mode). Replaced with actual value during post-processing." +msgstr "" + msgid "Filament length (meters)" msgstr "Longitud de filamento (metros)" @@ -20165,6 +20116,9 @@ msgstr "No se ha detectado una sesión válida. ¿Desea iniciar sesión en 3DPri msgid "Success!" msgstr "¡Éxito!" +msgid "Generate API Key" +msgstr "" + msgid "Are you sure to log out?" msgstr "¿Estás seguro de cerrar la sesión?" @@ -21115,12 +21069,6 @@ msgstr "El Plug-in de Bambu Network es necesario para las funciones en la nube, msgid "Error: %s" msgstr "Error: %s" -msgid "Show details" -msgstr "Mostrar detalles" - -msgid "Hide details" -msgstr "Ocultar detalles" - msgid "Version to install:" msgstr "Versión a instalar:" @@ -23704,6 +23652,12 @@ msgstr "" msgid "No binding for that field" msgstr "" +msgid "Enter a number" +msgstr "" + +msgid "Not a number" +msgstr "" + msgid "Primitive" msgstr "" @@ -23716,6 +23670,210 @@ msgstr "" msgid "Clear All" msgstr "" +msgctxt "Keyboard Shortcut" +msgid "Ins" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "Home" +msgstr "Inicio" + +msgctxt "Keyboard Shortcut" +msgid "End" +msgstr "Fin" + +msgctxt "Keyboard Shortcut" +msgid "PgUp" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "PgDn" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "Arrow Left" +msgstr "Flecha izquierda" + +msgctxt "Keyboard Shortcut" +msgid "Arrow Right" +msgstr "Flecha derecha" + +msgctxt "Keyboard Shortcut" +msgid "Arrow Up" +msgstr "Flecha arriba" + +msgctxt "Keyboard Shortcut" +msgid "Arrow Down" +msgstr "Flecha abajo" + +msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" +msgstr "Importar datos de geometría de los archivos STL/STEP/3MF/OBJ/AMF" + +msgid "Select all objects" +msgstr "Seleccionar todos los objetos" + +msgid "Paste from clipboard" +msgstr "Pegar desde el portapapeles" + +msgid "Toggle printable for object/part" +msgstr "Activar/desactivar la impresión para el objeto/pieza" + +msgid "Move selection 10mm in negative X direction" +msgstr "Mover la selección 10 mm en dirección X negativa" + +msgid "Move selection 10mm in positive X direction" +msgstr "Mover la selección 10 mm en dirección X positiva" + +msgid "Move selection 10mm in positive Y direction" +msgstr "Mover la selección 10 mm en dirección Y positiva" + +msgid "Move selection 10mm in negative Y direction" +msgstr "Mover la selección 10 mm en dirección Y negativa" + +msgid "Rotate selection 45 degrees counterclockwise" +msgstr "" + +msgid "Rotate selection 45 degrees clockwise" +msgstr "" + +msgid "Gizmo move" +msgstr "Herramienta de movimiento" + +msgid "Gizmo rotate" +msgstr "Herramienta de rotación" + +msgid "Gizmo scale" +msgstr "Herramienta de escala" + +msgid "Gizmo place face on bed" +msgstr "Herramienta de situar cara en cama" + +msgid "Gizmo cut" +msgstr "Herramienta de corte" + +msgid "Gizmo mesh boolean" +msgstr "Gizmo buleana de malla" + +msgid "Gizmo FDM paint-on supports" +msgstr "" + +msgid "Gizmo FDM paint-on seam" +msgstr "Herramienta de pintado de costuras FDM" + +msgid "Gizmo FDM paint-on fuzzy skin" +msgstr "Herramienta FDM para pintar piel rugosa" + +msgid "Gizmo multi-material painting" +msgstr "" + +msgid "Gizmo text emboss/engrave" +msgstr "Herramienta de texto en relieve/grabado" + +msgid "Gizmo measure" +msgstr "Gizmo medir" + +msgid "Gizmo assemble" +msgstr "Gizmo ensamblar" + +msgid "Gizmo brim ears" +msgstr "Gizmo orejas de borde" + +msgid "Vertical slider - Move active thumb Up" +msgstr "Control deslizante vertical - Mover el pulgar activo hacia Arriba" + +msgid "Vertical slider - Move active thumb Down" +msgstr "Control deslizante vertical - Mover el pulgar activo hacia Abajo" + +msgid "Horizontal slider - Move active thumb Left" +msgstr "Control deslizante horizontal - Mover el pulgar activo hacia la Izquierda" + +msgid "Horizontal slider - Move active thumb Right" +msgstr "Control deslizante horizontal - Mover el pulgar activo hacia la Derecha" + +msgid "Horizontal slider - Move to start position" +msgstr "Deslizador horizontal - Desplazarse a la posición inicial" + +msgid "Horizontal slider - Move to last position" +msgstr "Deslizador horizontal - Desplazarse a la última posición" + +msgid "Camera view - Default" +msgstr "Vista de la cámara - Por defecto" + +msgid "Camera view - Top" +msgstr "Vista de la cámara - Parte Superior" + +msgid "Camera view - Bottom" +msgstr "Vista de la cámara - Parte inferior" + +msgid "Camera view - Front" +msgstr "Vista de la cámara - Frontal" + +msgid "Camera view - Behind" +msgstr "Vista de la cámara - Posterior" + +msgid "Camera Angle - Left side" +msgstr "Ángulo de la cámara - Lado izquierdo" + +msgid "Camera Angle - Right side" +msgstr "Ángulo de la cámara - Lado derecho" + +msgid "Camera view - Current plate" +msgstr "" + +msgid "Zoom in" +msgstr "Acercar" + +msgid "Zoom out" +msgstr "Alejar" + +msgid "Show/Hide 3Dconnexion devices settings dialog" +msgstr "Mostrar/Ocultar el diálogo de ajustes de los dispositivos 3Dconnexion" + +msgid "Show/Hide wireframe" +msgstr "" + +msgid "On/Off G-code window" +msgstr "Activar/Desactivar ventana de G-Code" + +msgid "On/Off one layer mode of the vertical slider" +msgstr "Activar/Desactivar el modo de una capa del control deslizante vertical" + +msgid "Switch between Prepare/Preview" +msgstr "Cambiar entre Preparar/Previsualizar" + +msgid "Collapse/Expand the sidebar" +msgstr "Ocultar/Expandir barra lateral" + +msgid "Open the speed dial" +msgstr "" + +msgid "Reload the device page" +msgstr "" + +msgid "Show keyboard shortcuts list" +msgstr "Muestra lista de atajos de teclado" + +msgid "Slicing and printing" +msgstr "" + +msgid "Editing" +msgstr "" + +msgid "Placement" +msgstr "" + +msgid "Gizmos" +msgstr "" + +msgid "Sliders" +msgstr "" + +msgid "Painting tools" +msgstr "" + +msgid "Application" +msgstr "" + #: resources/data/hints.ini: [hint:Precise wall] msgid "" "Precise wall\n" @@ -24016,6 +24174,62 @@ msgstr "" "Evita la deformación\n" "¿Sabías que al imprimir materiales propensos a la deformación como el ABS, aumentar adecuadamente la temperatura de la cama térmica puede reducir la probabilidad de deformaciones?" +#~ msgid "Tab" +#~ msgstr "Pestaña" + +#~ msgid "Displays current viewport FPS in the top-right corner." +#~ msgstr "Muestra los FPS en la esquina superior derecha." + +# AI Translated +#~ msgid "Publish 3MF Wiki" +#~ msgstr "Wiki de Publicar 3MF" + +# AI Translated +#~ msgid "Publish 3MF Video Guide" +#~ msgstr "Guía en vídeo de Publicar 3MF" + +#~ msgid "Toolbar" +#~ msgstr "Barra de herramientas" + +#~ msgid "Switch table page" +#~ msgstr "Cambiar de página de tabla" + +#~ msgid "Global shortcuts" +#~ msgstr "Atajos globales" + +#~ msgid "Middle mouse button" +#~ msgstr "Botón central del ratón" + +#~ msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." +#~ msgstr "Orienta automáticamente los objetos seleccionados o todos los objetos. Si hay objetos seleccionados, sólo orienta los seleccionados. En caso contrario, orientará todos los objetos del proyecto actual." + +#~ msgid "Auto orients all objects on the active plate." +#~ msgstr "Orienta automáticamente todos los objetos de la placa actual." + +#~ msgid "Any arrow" +#~ msgstr "⌘+Cualquier flecha" + +#~ msgid "Gizmo SLA support points" +#~ msgstr "Herramienta de puntos de soporte SLA" + +#~ msgid "Plater" +#~ msgstr "Cama" + +#~ msgid "Gizmo" +#~ msgstr "Herramienta" + +#~ msgid "Delete objects, parts, modifiers" +#~ msgstr "Eliminar objetos, piezas, modificadores" + +#~ msgid "Objects List" +#~ msgstr "Lista de Objetos" + +#~ msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." +#~ msgstr "G-code escrito en la parte superior del archivo de salida, antes de cualquier otro contenido. Útil para añadir metadatos que el firmware de la impresora lea desde las primeras líneas del archivo (por ejemplo, tiempo estimado de impresión, uso de filamento). Soporta marcadores como {print_time_sec} y {used_filament_length}." + +#~ msgid "Print time (seconds)" +#~ msgstr "Tiempo de impresión (segundos)" + #~ msgid "Open actions speed dial" #~ msgstr "Abrir el menú rápido de acciones" diff --git a/localization/i18n/eu/OrcaSlicer_eu.po b/localization/i18n/eu/OrcaSlicer_eu.po index a3b02f9e87..c5f7363361 100644 --- a/localization/i18n/eu/OrcaSlicer_eu.po +++ b/localization/i18n/eu/OrcaSlicer_eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-09-18 15:50+0800\n" +"POT-Creation-Date: 2026-09-22 17:02+0800\n" "PO-Revision-Date: 2026-07-20 13:33+0200\n" "Last-Translator: Manu Goiogana \n" "Language-Team: \n" @@ -5779,12 +5779,15 @@ msgctxt "Camera View" msgid "Right" msgstr "Eskuinekoa" -msgid "Add" -msgstr "Gehitu" - msgid "Add plate" msgstr "Plaka gehitu" +msgid "Split to objects" +msgstr "Objektuetan zatitu" + +msgid "Add" +msgstr "Gehitu" + msgid "Auto orient all/selected objects" msgstr "Automatikoki orientatu hautatutako objektuak/objektu guztiak" @@ -5797,9 +5800,6 @@ msgstr "Antolatu objektu guztiak" msgid "Arrange objects on selected plates" msgstr "Antolatu hautatutako plaketako objektu guztiak" -msgid "Split to objects" -msgstr "Objektuetan zatitu" - msgid "Assembly View" msgstr "Multzoaren Ikuspegia" @@ -5854,6 +5854,9 @@ msgstr "Ingerada" msgid "Wireframe" msgstr "Alanbre-egitura" +msgid "X-Ray" +msgstr "" + msgid "Realistic View" msgstr "Ikuspegi errealista" @@ -6389,9 +6392,6 @@ msgstr "Erakutsi hautatutako objektuaren inguruko ingerada 3D eszenan." msgid "Preferences" msgstr "Hobespenak" -msgid "Open speed dial..." -msgstr "" - # AI Translated msgctxt "Menu" msgid "Edit" @@ -6400,6 +6400,9 @@ msgstr "Editatu" msgid "View" msgstr "Bista" +msgid "Open Speed Dial" +msgstr "" + msgid "Preset Bundle" msgstr "Aurrezarpen-paketea" @@ -8186,9 +8189,6 @@ msgstr "Zabaldu alboko barra" msgid "Collapse sidebar" msgstr "Tolestu alboko barra" -msgid "Tab" -msgstr "Fitxa" - #, c-format, boost-format msgid "Loading file: %s" msgstr "%s fitxategia kargatzen" @@ -9183,10 +9183,10 @@ msgstr "Gailu anitzen kudeaketa" msgid "With this option enabled, you can send a task to multiple devices at the same time and manage multiple devices." msgstr "Aukera hau gaituta, zeregin bat hainbat gailutara bidali eta hainbat gailu kudea ditzakezu aldi berean." -msgid "Open the Speed Dial with the Space key" +msgid "Open the Speed Dial from the keyboard" msgstr "" -msgid "When enabled, pressing Space (with no other key held) opens the Speed Dial action search from any page." +msgid "When enabled, the Speed Dial keyboard shortcut (Space by default) opens the action search from any page." msgstr "" msgid "Recent actions" @@ -9318,6 +9318,15 @@ msgstr "Saguaren eskuineko botoiarekin arrastatu" msgid "Set the action that dragging the right mouse button should perform." msgstr "Ezarri saguaren eskuineko botoia arrastatzean egin beharreko ekintza." +msgid "Keyboard" +msgstr "" + +msgid "Keyboard shortcuts" +msgstr "" + +msgid "Choose the key for each action." +msgstr "" + msgid "Clear my choice on..." msgstr "Garbitu nire aukera hemen..." @@ -9426,11 +9435,39 @@ msgstr "" "Ikuspegiaren fotograma-tasa mugatzen du GPUaren karga eta energia-kontsumoa murrizteko.\n" "Ezarri 0 fotograma-tasa mugagabea erabiltzeko." +msgid "Reuse the 3D scene while idle" +msgstr "" + +msgid "" +"Skips redrawing the 3D scene when only the mouse cursor moves over the viewport,\n" +"and reuses the previous frame's scene instead. Reduces GPU load.\n" +"Disable it if the viewport shows stale or missing contents.\n" +"\n" +"Takes effect immediately." +msgstr "" + +msgid "Skip unchanged frames" +msgstr "" + +msgid "" +"Skips drawing a frame altogether when it would be identical to the one already on screen.\n" +"Only applies to frames that reuse the 3D scene, so it needs Reuse the 3D scene while idle.\n" +"Disable it if a hover highlight, tooltip or animation stops updating.\n" +"\n" +"Takes effect immediately." +msgstr "" + msgid "Show FPS overlay" msgstr "Erakutsi FPS gainjartzea" -msgid "Displays current viewport FPS in the top-right corner." -msgstr "Uneko ikuspegiaren FPSa goiko eskuineko izkinan erakusten du." +msgid "Displays rendering counts in the top-right corner of the viewport." +msgstr "" + +msgid "FPS: frames presented to the screen per second." +msgstr "" + +msgid "3D: frames per second that redrew the 3D scene." +msgstr "" # AI Translated msgid "G-code Preview" @@ -9886,13 +9923,8 @@ msgstr "Argitaratu 3MF..." msgid "Select which settings to be published in the 3MF file" msgstr "Hautatu zein ezarpen argitaratuko diren 3MF fitxategian" -# AI Translated -msgid "Publish 3MF Wiki" -msgstr "3MF argitaratzeko wikia" - -# AI Translated -msgid "Publish 3MF Video Guide" -msgstr "3MF argitaratzeko bideo-gida" +msgid "Video Guide" +msgstr "" # AI Translated msgid "Mixed filament - published as a whole when \"Enable\" above is selected" @@ -10094,6 +10126,13 @@ msgstr "" msgid "No wiki page for this action" msgstr "" +msgid "Show details" +msgstr "Erakutsi xehetasunak" + +# AI Translated +msgid "Hide details" +msgstr "Ezkutatu xehetasunak" + #, c-format, boost-format msgid "\"%s\" is a Developer setting. Enable Developer mode to edit it?" msgstr "" @@ -11893,67 +11932,39 @@ msgstr "Konfigurazio-paketea aldatu da aurreko Konfigurazio Gidan" msgid "Configuration package changed" msgstr "Konfigurazio-paketea aldatu da" -msgid "Toolbar" -msgstr "Tresna-barra" - -msgid "Objects list" -msgstr "Objektuen zerrenda" - -msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" -msgstr "Inportatu geometriaren datuak STL/STEP/3MF/OBJ/AMF fitxategietatik" - -msgid "Paste from clipboard" -msgstr "Itsatsi arbeletik" - -msgid "Show/Hide 3Dconnexion devices settings dialog" -msgstr "Erakutsi/Ezkutatu 3Dconnexion gailuen ezarpenen elkarrizketa-koadroa" - -msgid "Switch table page" -msgstr "Aldatu taula-orria" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Space" -msgstr "Zuriunea" - -msgid "Open speed dial" -msgstr "" - -msgid "Run a Speed Dial favourite (while the Speed Dial is open)" -msgstr "" - -msgid "Show keyboard shortcuts list" -msgstr "Erakutsi teklatu-lasterbideen zerrenda" - -msgid "Global shortcuts" -msgstr "Lasterbide globalak" - msgid "Pan View" msgstr "Mugitu ikuspegia" msgid "Rotate View" msgstr "Biratu ikuspegia" -msgid "Middle mouse button" -msgstr "Saguaren erdiko botoia" +#, c-format, boost-format +msgid "Use %s or %s, or a key that does not type a character." +msgstr "" -msgid "Zoom View" -msgstr "Zooma ikuspegian" +msgctxt "Keyboard Shortcut" +msgid "Key" +msgstr "" -msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." -msgstr "Hautatutako objektuak edo objektu guztiak automatikoki orientatzen ditu. Objektuak hautatuta badaude, hautatutakoak bakarrik orientatzen ditu. Bestela, uneko proiektuko objektu guztiak orientatuko ditu." +msgid "Left mouse" +msgstr "" -msgid "Auto orients all objects on the active plate." -msgstr "Objektu guztiak automatikoki orientatzen ditu plaka aktiboan." +msgid "Available anywhere in the window, even while typing in a text field." +msgstr "" -msgid "Collapse/Expand the sidebar" -msgstr "Tolestu/Zabaldu alboko barra" +msgid "Run a speed dial favorite while the dial is open" +msgstr "" -msgid "Any arrow" -msgstr "Edozein gezi" +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Tab" +msgstr "Tab" -msgid "Movement in camera space" -msgstr "Mugimendua kameraren espazioan" +msgid "Switch to the next main tab" +msgstr "" + +msgid "Available while the 3D view on the Prepare tab has focus." +msgstr "" msgid "Select a part" msgstr "Hautatu pieza bat" @@ -11964,126 +11975,29 @@ msgstr "Hautatu objektu bat baino gehiago" msgid "Select objects by rectangle" msgstr "Hautatu objektuak laukizuzen bidez" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Up" -msgstr "Gora gezia" - -msgid "Move selection 10mm in positive Y direction" -msgstr "Mugitu hautapena 10 mm Y noranzko positiboan" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Down" -msgstr "Behera gezia" - -msgid "Move selection 10mm in negative Y direction" -msgstr "Mugitu hautapena 10 mm Y noranzko negatiboan" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Left" -msgstr "Ezkerrera gezia" - -msgid "Move selection 10mm in negative X direction" -msgstr "Mugitu hautapena 10 mm X noranzko negatiboan" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Right" -msgstr "Eskuinera gezia" - -msgid "Move selection 10mm in positive X direction" -msgstr "Mugitu hautapena 10 mm X noranzko positiboan" +msgid "Keyboard 1-9: set filament for object/part" +msgstr "1-9 teklak: ezarri filamentua objektuari/piezari" msgid "Movement step set to 1mm" msgstr "Mugimendu-urratsa 1 mm-an ezarri da" -msgid "Keyboard 1-9: set filament for object/part" -msgstr "1-9 teklak: ezarri filamentua objektuari/piezari" +msgid "Movement in camera space" +msgstr "Mugimendua kameraren espazioan" -msgid "Camera view - Default" -msgstr "Kameraren ikuspegia - Lehenetsia" +msgid "Middle mouse" +msgstr "" -msgid "Camera view - Top" -msgstr "Kameraren ikuspegia - Goia" +msgid "Right mouse" +msgstr "" -msgid "Camera view - Bottom" -msgstr "Kameraren ikuspegia - Behea" +msgid "Zoom View" +msgstr "Zooma ikuspegian" -msgid "Camera view - Front" -msgstr "Kameraren ikuspegia - Aurrea" +msgid "Painting" +msgstr "" -msgid "Camera view - Behind" -msgstr "Kameraren ikuspegia - Atzea" - -msgid "Camera Angle - Left side" -msgstr "Kameraren angelua - Ezker aldea" - -msgid "Camera Angle - Right side" -msgstr "Kameraren angelua - Eskuin aldea" - -msgid "Select all objects" -msgstr "Hautatu objektu guztiak" - -msgid "Gizmo move" -msgstr "Mugitzeko tresna" - -msgid "Gizmo rotate" -msgstr "Biraketa tresna" - -msgid "Gizmo scale" -msgstr "Eskalarako tresna" - -msgid "Gizmo place face on bed" -msgstr "Aurpegia ohean kokatzeko tresna" - -msgid "Gizmo cut" -msgstr "Ebakitzeko tresna" - -msgid "Gizmo mesh boolean" -msgstr "Sare boolearrerako tresna" - -msgid "Gizmo FDM paint-on fuzzy skin" -msgstr "FDM gainazal zimurra margotzeko tresna" - -msgid "Gizmo SLA support points" -msgstr "SLA euskarri-puntuentzako tresna" - -msgid "Gizmo FDM paint-on seam" -msgstr "FDM josturak margotzeko tresna" - -msgid "Gizmo text emboss/engrave" -msgstr "Testua erliebean/grabatuta ipintzeko tresna" - -msgid "Gizmo measure" -msgstr "Neurtzeko tresna" - -msgid "Gizmo assemble" -msgstr "Muntatzeko tresna" - -msgid "Gizmo brim ears" -msgstr "Belarri ertzen tresna" - -msgid "Zoom in" -msgstr "Zooma handitu" - -msgid "Zoom out" -msgstr "Txikiagotu zooma" - -msgid "Toggle printable for object/part" -msgstr "Txandakatu objektuaren/piezaren inprimagarritasuna" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Tab" -msgstr "Tab" - -msgid "Switch between Prepare/Preview" -msgstr "Aldatu Prestatu/Aurrebista artean" - -msgid "Plater" -msgstr "Plaka-antolatzailea" +msgid "Available while a painting gizmo is open: supports, seam, fuzzy skin or color painting." +msgstr "" msgid "Move: press to snap by 1mm" msgstr "Mugitu: sakatu 1 mm-ko jauzietan atxikitzeko" @@ -12094,14 +12008,19 @@ msgstr "Euskarri/Kolore margotzea: doitu boligrafoaren erradioa" msgid "Support/Color Painting: adjust section position" msgstr "Euskarri/Kolore-margotzea: doitu sekzioaren posizioa" -msgid "Gizmo" -msgstr "Tresna" +msgid "Objects list" +msgstr "Objektuen zerrenda" + +msgid "Available while the object list has focus." +msgstr "" msgid "Set extruder number for the objects and parts" msgstr "Ezarri objektuen eta piezen estrusore zenbakia" -msgid "Delete objects, parts, modifiers" -msgstr "Ezabatu objektuak, piezak eta aldatzaileak" +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Space" +msgstr "Zuriunea" msgid "Select the object/part and press space to change the name" msgstr "Hautatu objektua/partea eta sakatu zuriunea izena aldatzeko" @@ -12112,45 +12031,48 @@ msgstr "Saguaren klika" msgid "Select the object/part and mouse click to change the name" msgstr "Hautatu objektua/pieza eta egin klik izena aldatzeko" -msgid "Objects List" -msgstr "Objektuen zerrenda" - -msgid "Vertical slider - Move active thumb Up" -msgstr "Graduatzaile bertikala - Mugitu hatz aktiboa gora" - -msgid "Vertical slider - Move active thumb Down" -msgstr "Graduatzaile bertikala - Mugitu hatz aktiboa behera" - -msgid "Horizontal slider - Move active thumb Left" -msgstr "Graduatzaile horizontala - Mugitu hatz aktiboa ezkerrera" - -msgid "Horizontal slider - Move active thumb Right" -msgstr "Graduatzaile horizontala - Mugitu hatz aktiboa eskuinera" - -msgid "On/Off one layer mode of the vertical slider" -msgstr "Aktibatu/Desaktibatu graduatzaile bertikalaren geruza bakarreko modua" - -msgid "On/Off G-code window" -msgstr "G-code leihoa aktibatu/desaktibatu" +msgid "Available while the 3D view on the Preview tab has focus." +msgstr "" msgid "Move slider 5x faster" msgstr "Mugitu graduatzailea 5 aldiz azkarrago" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Home" -msgstr "Hasiera" +msgid "Scroll slider 5x faster" +msgstr "" -msgid "Horizontal slider - Move to start position" -msgstr "Graduatzaile horizontala - Mugitu hasierako posiziora" +msgid "Not customizable" +msgstr "" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "End" -msgstr "Amaiera" +#, c-format, boost-format +msgid "%s is assigned to %s. Reassign it to %s?" +msgstr "" -msgid "Horizontal slider - Move to last position" -msgstr "Graduatzaile horizontala - Mugitu azken posiziora" +#, c-format, boost-format +msgid "The default %s is assigned to %s. Reassign it to %s?" +msgstr "" + +msgid "Global shortcuts also apply while typing." +msgstr "" + +msgid "A key that types a character cannot be a global shortcut." +msgstr "" + +msgid "Esc cancels, Enter confirms." +msgstr "" + +#, c-format, boost-format +msgid "" +"Press the new shortcut for\n" +"\"%s\"" +msgstr "" + +#, c-format, boost-format +msgid "Already used as a step of %s." +msgstr "" + +#, c-format, boost-format +msgid "Already assigned to %s. Press OK to reassign it." +msgstr "" msgid "Release Note" msgstr "Argitalpen-oharra" @@ -16987,8 +16909,8 @@ msgstr "Aurrez berotzeko urratsak" msgid "Insert multiple preheat commands (e.g. M104.1). Only useful for Prusa XL. For other printers, please set it to 1." msgstr "Txertatu aurrez berotzeko hainbat komando (adib. M104.1). Prusa XL-rakobakarrik da erabilgarria. Beste inprimagailuetarako, ezarri 1." -msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." -msgstr "Irteerako fitxategiaren hasiera-hasieran idatzitako G-codea, beste edozein eduki baino lehen. Inprimagailuaren firmwareak fitxategiaren lehen lerroetatik irakurtzen dituen metadatuak gehitzeko erabilgarria da (adibidez, zenbatetsitako inprimatze-denbora edo filamentuen erabilera). {print_time_sec} eta {used_filament_length} moduko leku-markak onartzen ditu." +msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_total_sec}, {print_time_day}, {print_time_hour}, {print_time_minute}, {print_time_sec} and {used_filament_length}." +msgstr "" msgid "Start G-code" msgstr "Hasierako G-codea" @@ -18505,12 +18427,36 @@ msgstr "Erabilitako filamentua" msgid "Total length of filament used in the print." msgstr "Inprimaketan erabilitako filamentuen luzera osoa." -msgid "Print time (seconds)" -msgstr "Inprimatze-denbora (segundoak)" +msgid "Print time (total seconds)" +msgstr "" msgid "Total estimated print time in seconds. Replaced with actual value during post-processing." msgstr "Kalkulatutako guztizko inprimatze-denbora, segundotan. Benetako balioarekin ordezten da osteko prozesatzean." +msgid "Print time (days component)" +msgstr "" + +msgid "Estimated print time day component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (hours component)" +msgstr "" + +msgid "Estimated print time hour component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (minutes component)" +msgstr "" + +msgid "Estimated print time minute component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (seconds component)" +msgstr "" + +msgid "Estimated print time second component (normal mode). Replaced with actual value during post-processing." +msgstr "" + msgid "Filament length (meters)" msgstr "Filamentuaren luzera (metroak)" @@ -20345,6 +20291,9 @@ msgstr "Ez da baliozko saiorik detektatu. 3DPrinterOS-en saioa hasi nahi duzu?" msgid "Success!" msgstr "Ondo egin da!" +msgid "Generate API Key" +msgstr "" + msgid "Are you sure to log out?" msgstr "Ziur saioa amaitu nahi duzula?" @@ -21300,13 +21249,6 @@ msgstr "Bambu sareko plugina beharrezkoa da hodeiko funtzioetarako, inprimagailu msgid "Error: %s" msgstr "Errorea: %s" -msgid "Show details" -msgstr "Erakutsi xehetasunak" - -# AI Translated -msgid "Hide details" -msgstr "Ezkutatu xehetasunak" - msgid "Version to install:" msgstr "Instalatu beharreko bertsioa:" @@ -23891,6 +23833,12 @@ msgstr "" msgid "No binding for that field" msgstr "" +msgid "Enter a number" +msgstr "" + +msgid "Not a number" +msgstr "" + msgid "Primitive" msgstr "" @@ -23903,6 +23851,216 @@ msgstr "" msgid "Clear All" msgstr "" +msgctxt "Keyboard Shortcut" +msgid "Ins" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Home" +msgstr "Hasiera" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "End" +msgstr "Amaiera" + +msgctxt "Keyboard Shortcut" +msgid "PgUp" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "PgDn" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Left" +msgstr "Ezkerrera gezia" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Right" +msgstr "Eskuinera gezia" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Up" +msgstr "Gora gezia" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Down" +msgstr "Behera gezia" + +msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" +msgstr "Inportatu geometriaren datuak STL/STEP/3MF/OBJ/AMF fitxategietatik" + +msgid "Select all objects" +msgstr "Hautatu objektu guztiak" + +msgid "Paste from clipboard" +msgstr "Itsatsi arbeletik" + +msgid "Toggle printable for object/part" +msgstr "Txandakatu objektuaren/piezaren inprimagarritasuna" + +msgid "Move selection 10mm in negative X direction" +msgstr "Mugitu hautapena 10 mm X noranzko negatiboan" + +msgid "Move selection 10mm in positive X direction" +msgstr "Mugitu hautapena 10 mm X noranzko positiboan" + +msgid "Move selection 10mm in positive Y direction" +msgstr "Mugitu hautapena 10 mm Y noranzko positiboan" + +msgid "Move selection 10mm in negative Y direction" +msgstr "Mugitu hautapena 10 mm Y noranzko negatiboan" + +msgid "Rotate selection 45 degrees counterclockwise" +msgstr "" + +msgid "Rotate selection 45 degrees clockwise" +msgstr "" + +msgid "Gizmo move" +msgstr "Mugitzeko tresna" + +msgid "Gizmo rotate" +msgstr "Biraketa tresna" + +msgid "Gizmo scale" +msgstr "Eskalarako tresna" + +msgid "Gizmo place face on bed" +msgstr "Aurpegia ohean kokatzeko tresna" + +msgid "Gizmo cut" +msgstr "Ebakitzeko tresna" + +msgid "Gizmo mesh boolean" +msgstr "Sare boolearrerako tresna" + +msgid "Gizmo FDM paint-on supports" +msgstr "" + +msgid "Gizmo FDM paint-on seam" +msgstr "FDM josturak margotzeko tresna" + +msgid "Gizmo FDM paint-on fuzzy skin" +msgstr "FDM gainazal zimurra margotzeko tresna" + +msgid "Gizmo multi-material painting" +msgstr "" + +msgid "Gizmo text emboss/engrave" +msgstr "Testua erliebean/grabatuta ipintzeko tresna" + +msgid "Gizmo measure" +msgstr "Neurtzeko tresna" + +msgid "Gizmo assemble" +msgstr "Muntatzeko tresna" + +msgid "Gizmo brim ears" +msgstr "Belarri ertzen tresna" + +msgid "Vertical slider - Move active thumb Up" +msgstr "Graduatzaile bertikala - Mugitu hatz aktiboa gora" + +msgid "Vertical slider - Move active thumb Down" +msgstr "Graduatzaile bertikala - Mugitu hatz aktiboa behera" + +msgid "Horizontal slider - Move active thumb Left" +msgstr "Graduatzaile horizontala - Mugitu hatz aktiboa ezkerrera" + +msgid "Horizontal slider - Move active thumb Right" +msgstr "Graduatzaile horizontala - Mugitu hatz aktiboa eskuinera" + +msgid "Horizontal slider - Move to start position" +msgstr "Graduatzaile horizontala - Mugitu hasierako posiziora" + +msgid "Horizontal slider - Move to last position" +msgstr "Graduatzaile horizontala - Mugitu azken posiziora" + +msgid "Camera view - Default" +msgstr "Kameraren ikuspegia - Lehenetsia" + +msgid "Camera view - Top" +msgstr "Kameraren ikuspegia - Goia" + +msgid "Camera view - Bottom" +msgstr "Kameraren ikuspegia - Behea" + +msgid "Camera view - Front" +msgstr "Kameraren ikuspegia - Aurrea" + +msgid "Camera view - Behind" +msgstr "Kameraren ikuspegia - Atzea" + +msgid "Camera Angle - Left side" +msgstr "Kameraren angelua - Ezker aldea" + +msgid "Camera Angle - Right side" +msgstr "Kameraren angelua - Eskuin aldea" + +msgid "Camera view - Current plate" +msgstr "" + +msgid "Zoom in" +msgstr "Zooma handitu" + +msgid "Zoom out" +msgstr "Txikiagotu zooma" + +msgid "Show/Hide 3Dconnexion devices settings dialog" +msgstr "Erakutsi/Ezkutatu 3Dconnexion gailuen ezarpenen elkarrizketa-koadroa" + +msgid "Show/Hide wireframe" +msgstr "" + +msgid "On/Off G-code window" +msgstr "G-code leihoa aktibatu/desaktibatu" + +msgid "On/Off one layer mode of the vertical slider" +msgstr "Aktibatu/Desaktibatu graduatzaile bertikalaren geruza bakarreko modua" + +msgid "Switch between Prepare/Preview" +msgstr "Aldatu Prestatu/Aurrebista artean" + +msgid "Collapse/Expand the sidebar" +msgstr "Tolestu/Zabaldu alboko barra" + +msgid "Open the speed dial" +msgstr "" + +msgid "Reload the device page" +msgstr "" + +msgid "Show keyboard shortcuts list" +msgstr "Erakutsi teklatu-lasterbideen zerrenda" + +msgid "Slicing and printing" +msgstr "" + +msgid "Editing" +msgstr "" + +msgid "Placement" +msgstr "" + +msgid "Gizmos" +msgstr "" + +msgid "Sliders" +msgstr "" + +msgid "Painting tools" +msgstr "" + +msgid "Application" +msgstr "" + #: resources/data/hints.ini: [hint:Precise wall] msgid "" "Precise wall\n" @@ -24203,6 +24361,62 @@ msgstr "" "Saihestu okertzea\n" "Ba al zenekien ABS bezalako okertzeko joera duten materialak inprimatzean ohe beroaren tenperatura egoki igotzeak okertzeko probabilitatea murriztu dezakeela?" +#~ msgid "Tab" +#~ msgstr "Fitxa" + +#~ msgid "Displays current viewport FPS in the top-right corner." +#~ msgstr "Uneko ikuspegiaren FPSa goiko eskuineko izkinan erakusten du." + +# AI Translated +#~ msgid "Publish 3MF Wiki" +#~ msgstr "3MF argitaratzeko wikia" + +# AI Translated +#~ msgid "Publish 3MF Video Guide" +#~ msgstr "3MF argitaratzeko bideo-gida" + +#~ msgid "Toolbar" +#~ msgstr "Tresna-barra" + +#~ msgid "Switch table page" +#~ msgstr "Aldatu taula-orria" + +#~ msgid "Global shortcuts" +#~ msgstr "Lasterbide globalak" + +#~ msgid "Middle mouse button" +#~ msgstr "Saguaren erdiko botoia" + +#~ msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." +#~ msgstr "Hautatutako objektuak edo objektu guztiak automatikoki orientatzen ditu. Objektuak hautatuta badaude, hautatutakoak bakarrik orientatzen ditu. Bestela, uneko proiektuko objektu guztiak orientatuko ditu." + +#~ msgid "Auto orients all objects on the active plate." +#~ msgstr "Objektu guztiak automatikoki orientatzen ditu plaka aktiboan." + +#~ msgid "Any arrow" +#~ msgstr "Edozein gezi" + +#~ msgid "Gizmo SLA support points" +#~ msgstr "SLA euskarri-puntuentzako tresna" + +#~ msgid "Plater" +#~ msgstr "Plaka-antolatzailea" + +#~ msgid "Gizmo" +#~ msgstr "Tresna" + +#~ msgid "Delete objects, parts, modifiers" +#~ msgstr "Ezabatu objektuak, piezak eta aldatzaileak" + +#~ msgid "Objects List" +#~ msgstr "Objektuen zerrenda" + +#~ msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." +#~ msgstr "Irteerako fitxategiaren hasiera-hasieran idatzitako G-codea, beste edozein eduki baino lehen. Inprimagailuaren firmwareak fitxategiaren lehen lerroetatik irakurtzen dituen metadatuak gehitzeko erabilgarria da (adibidez, zenbatetsitako inprimatze-denbora edo filamentuen erabilera). {print_time_sec} eta {used_filament_length} moduko leku-markak onartzen ditu." + +#~ msgid "Print time (seconds)" +#~ msgstr "Inprimatze-denbora (segundoak)" + #~ msgid "Open actions speed dial" #~ msgstr "Ekintzen markatze azkarra ireki" diff --git a/localization/i18n/fr/OrcaSlicer_fr.po b/localization/i18n/fr/OrcaSlicer_fr.po index a4c3c88954..51e021d073 100644 --- a/localization/i18n/fr/OrcaSlicer_fr.po +++ b/localization/i18n/fr/OrcaSlicer_fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-09-18 15:50+0800\n" +"POT-Creation-Date: 2026-09-22 17:02+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: Guislain Cyril, Thomas Lété\n" @@ -5822,12 +5822,15 @@ msgctxt "Camera View" msgid "Right" msgstr "Droite" -msgid "Add" -msgstr "Ajouter" - msgid "Add plate" msgstr "Ajouter un plateau" +msgid "Split to objects" +msgstr "Diviser en objets individuels" + +msgid "Add" +msgstr "Ajouter" + msgid "Auto orient all/selected objects" msgstr "Orientation automatique de tous les objets sélectionnés" @@ -5840,9 +5843,6 @@ msgstr "Organiser tous les objets" msgid "Arrange objects on selected plates" msgstr "Organiser les objets sur les plaques sélectionnées" -msgid "Split to objects" -msgstr "Diviser en objets individuels" - msgid "Assembly View" msgstr "Vue de l'assemblage" @@ -5897,6 +5897,9 @@ msgstr "Contour" msgid "Wireframe" msgstr "Fil de fer" +msgid "X-Ray" +msgstr "" + msgid "Realistic View" msgstr "Vue réaliste" @@ -6436,9 +6439,6 @@ msgstr "Afficher le tracé contour de l’objet sélectionné dans la scène 3D. msgid "Preferences" msgstr "Préférences" -msgid "Open speed dial..." -msgstr "" - # AI Translated msgctxt "Menu" msgid "Edit" @@ -6447,6 +6447,9 @@ msgstr "Édition" msgid "View" msgstr "Affichage" +msgid "Open Speed Dial" +msgstr "" + msgid "Preset Bundle" msgstr "Paquet de préréglages" @@ -8242,9 +8245,6 @@ msgstr "Agrandir la barre latérale" msgid "Collapse sidebar" msgstr "Réduire la barre latérale" -msgid "Tab" -msgstr "Onglet" - #, c-format, boost-format msgid "Loading file: %s" msgstr "Chargement du fichier : %s" @@ -9250,10 +9250,10 @@ msgstr "Gestion multi appareils" msgid "With this option enabled, you can send a task to multiple devices at the same time and manage multiple devices." msgstr "Si cette option est activée, vous pouvez envoyer une tâche à plusieurs appareils en même temps et gérer plusieurs appareils." -msgid "Open the Speed Dial with the Space key" +msgid "Open the Speed Dial from the keyboard" msgstr "" -msgid "When enabled, pressing Space (with no other key held) opens the Speed Dial action search from any page." +msgid "When enabled, the Speed Dial keyboard shortcut (Space by default) opens the action search from any page." msgstr "" msgid "Recent actions" @@ -9385,6 +9385,15 @@ msgstr "Glisser avec le bouton droit de la souris" msgid "Set the action that dragging the right mouse button should perform." msgstr "Définit l’action effectuée en faisant glisser le bouton droit de la souris." +msgid "Keyboard" +msgstr "" + +msgid "Keyboard shortcuts" +msgstr "" + +msgid "Choose the key for each action." +msgstr "" + msgid "Clear my choice on..." msgstr "Effacer mon choix sur…" @@ -9495,11 +9504,39 @@ msgstr "" "Limite la fréquence d’images de la vue pour réduire la charge du GPU et la consommation d’énergie.\n" "Réglez sur 0 pour une fréquence d’images illimitée." +msgid "Reuse the 3D scene while idle" +msgstr "" + +msgid "" +"Skips redrawing the 3D scene when only the mouse cursor moves over the viewport,\n" +"and reuses the previous frame's scene instead. Reduces GPU load.\n" +"Disable it if the viewport shows stale or missing contents.\n" +"\n" +"Takes effect immediately." +msgstr "" + +msgid "Skip unchanged frames" +msgstr "" + +msgid "" +"Skips drawing a frame altogether when it would be identical to the one already on screen.\n" +"Only applies to frames that reuse the 3D scene, so it needs Reuse the 3D scene while idle.\n" +"Disable it if a hover highlight, tooltip or animation stops updating.\n" +"\n" +"Takes effect immediately." +msgstr "" + msgid "Show FPS overlay" msgstr "Afficher la superposition des FPS" -msgid "Displays current viewport FPS in the top-right corner." -msgstr "Affiche les FPS actuels de la vue dans le coin supérieur droit." +msgid "Displays rendering counts in the top-right corner of the viewport." +msgstr "" + +msgid "FPS: frames presented to the screen per second." +msgstr "" + +msgid "3D: frames per second that redrew the 3D scene." +msgstr "" # AI Translated msgid "G-code Preview" @@ -9956,13 +9993,8 @@ msgstr "Publier 3MF..." msgid "Select which settings to be published in the 3MF file" msgstr "Sélectionnez les réglages à publier dans le fichier 3MF" -# AI Translated -msgid "Publish 3MF Wiki" -msgstr "Wiki de Publier 3MF" - -# AI Translated -msgid "Publish 3MF Video Guide" -msgstr "Guide vidéo de Publier 3MF" +msgid "Video Guide" +msgstr "" # AI Translated msgid "Mixed filament - published as a whole when \"Enable\" above is selected" @@ -10164,6 +10196,13 @@ msgstr "" msgid "No wiki page for this action" msgstr "" +msgid "Show details" +msgstr "Afficher les détails" + +# AI Translated +msgid "Hide details" +msgstr "Masquer les détails" + #, c-format, boost-format msgid "\"%s\" is a Developer setting. Enable Developer mode to edit it?" msgstr "" @@ -11988,67 +12027,39 @@ msgstr "Le paquet de configuration a été modifié dans le guide de configurati msgid "Configuration package changed" msgstr "Package de configuration modifié" -msgid "Toolbar" -msgstr "Barre d'outils" - -msgid "Objects list" -msgstr "Liste des objets" - -msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" -msgstr "Importez des données de géométrie à partir de fichiers STL/STEP/3MF/OBJ/AMF" - -msgid "Paste from clipboard" -msgstr "Coller depuis le presse-papier" - -msgid "Show/Hide 3Dconnexion devices settings dialog" -msgstr "Afficher/Masquer la boîte de dialogue des paramètres des périphériques 3Dconnexion" - -msgid "Switch table page" -msgstr "Page du tableau de commutation" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Space" -msgstr "Espace" - -msgid "Open speed dial" -msgstr "" - -msgid "Run a Speed Dial favourite (while the Speed Dial is open)" -msgstr "" - -msgid "Show keyboard shortcuts list" -msgstr "Afficher la liste des raccourcis clavier" - -msgid "Global shortcuts" -msgstr "Raccourcis globaux" - msgid "Pan View" msgstr "Déplacement de la vue" msgid "Rotate View" msgstr "Rotation de la vue" -msgid "Middle mouse button" -msgstr "Bouton central de la souris" +#, c-format, boost-format +msgid "Use %s or %s, or a key that does not type a character." +msgstr "" -msgid "Zoom View" -msgstr "Zoom de la vue" +msgctxt "Keyboard Shortcut" +msgid "Key" +msgstr "" -msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." -msgstr "Oriente automatiquement les objets sélectionnés ou tous les objets. S’il y a des objets sélectionnés, seuls ceux-ci sont orientés. Sinon, tous les objets du projet en cours sont orientés." +msgid "Left mouse" +msgstr "" -msgid "Auto orients all objects on the active plate." -msgstr "Oriente automatiquement tous les objets de la plaque actuelle." +msgid "Available anywhere in the window, even while typing in a text field." +msgstr "" -msgid "Collapse/Expand the sidebar" -msgstr "Réduire/développer la barre latérale" +msgid "Run a speed dial favorite while the dial is open" +msgstr "" -msgid "Any arrow" -msgstr "Toutes les flèches" +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Tab" +msgstr "Tab" -msgid "Movement in camera space" -msgstr "Mouvement dans l'espace de la caméra" +msgid "Switch to the next main tab" +msgstr "" + +msgid "Available while the 3D view on the Prepare tab has focus." +msgstr "" msgid "Select a part" msgstr "Sélectionner une pièce" @@ -12059,126 +12070,29 @@ msgstr "Sélectionner plusieurs objets" msgid "Select objects by rectangle" msgstr "Sélectionner les objets par rectangle" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Up" -msgstr "Flèche haut" - -msgid "Move selection 10mm in positive Y direction" -msgstr "Déplacer la sélection de 10 mm dans la direction positive Y" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Down" -msgstr "Flèche bas" - -msgid "Move selection 10mm in negative Y direction" -msgstr "Déplacer la sélection de 10 mm dans la direction négative Y" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Left" -msgstr "Flèche gauche" - -msgid "Move selection 10mm in negative X direction" -msgstr "Déplacer la sélection de 10 mm dans la direction négative X" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Right" -msgstr "Flèche droite" - -msgid "Move selection 10mm in positive X direction" -msgstr "Déplacer la sélection de 10 mm dans la direction positive X" +msgid "Keyboard 1-9: set filament for object/part" +msgstr "clavier 1-9 : définir le filament pour l'objet/la pièce" msgid "Movement step set to 1mm" msgstr "Pas du mouvement réglé sur 1 mm" -msgid "Keyboard 1-9: set filament for object/part" -msgstr "clavier 1-9 : définir le filament pour l'objet/la pièce" +msgid "Movement in camera space" +msgstr "Mouvement dans l'espace de la caméra" -msgid "Camera view - Default" -msgstr "Vue caméra - Par défaut" +msgid "Middle mouse" +msgstr "" -msgid "Camera view - Top" -msgstr "Vue caméra - Haut" +msgid "Right mouse" +msgstr "" -msgid "Camera view - Bottom" -msgstr "Vue caméra - Bas" +msgid "Zoom View" +msgstr "Zoom de la vue" -msgid "Camera view - Front" -msgstr "Vue de la caméra - Avant" +msgid "Painting" +msgstr "" -msgid "Camera view - Behind" -msgstr "Vue caméra - Derrière" - -msgid "Camera Angle - Left side" -msgstr "Angle de caméra - Côté gauche" - -msgid "Camera Angle - Right side" -msgstr "Angle de caméra - Côté droit" - -msgid "Select all objects" -msgstr "Sélectionner tous les objets" - -msgid "Gizmo move" -msgstr "Gizmo déplacer" - -msgid "Gizmo rotate" -msgstr "Gizmo pivoter" - -msgid "Gizmo scale" -msgstr "Gizmo redimensionner" - -msgid "Gizmo place face on bed" -msgstr "Gizmo placer la face sur le plateau" - -msgid "Gizmo cut" -msgstr "Gizmo couper" - -msgid "Gizmo mesh boolean" -msgstr "Gizmo booléennes" - -msgid "Gizmo FDM paint-on fuzzy skin" -msgstr "Outil FDM de surface irrégulière peinte" - -msgid "Gizmo SLA support points" -msgstr "Gizmo Point de support SLA" - -msgid "Gizmo FDM paint-on seam" -msgstr "Gizmo Peinture de la couture FDM" - -msgid "Gizmo text emboss/engrave" -msgstr "Gizmo embosser/graver du texte" - -msgid "Gizmo measure" -msgstr "Gizmo mesurer" - -msgid "Gizmo assemble" -msgstr "Gizmo assembler" - -msgid "Gizmo brim ears" -msgstr "Gizmo bordure à oreilles" - -msgid "Zoom in" -msgstr "Zoom avant" - -msgid "Zoom out" -msgstr "Zoom arrière" - -msgid "Toggle printable for object/part" -msgstr "Basculer l’état imprimable de l’objet/de la pièce" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Tab" -msgstr "Tab" - -msgid "Switch between Prepare/Preview" -msgstr "Basculer entre Préparer/Aperçu" - -msgid "Plater" -msgstr "Plateau" +msgid "Available while a painting gizmo is open: supports, seam, fuzzy skin or color painting." +msgstr "" msgid "Move: press to snap by 1mm" msgstr "Déplacer : appuyez pour aligner de 1 mm" @@ -12189,14 +12103,19 @@ msgstr "Support/Peinture couleur : ajustez le rayon du stylet" msgid "Support/Color Painting: adjust section position" msgstr "Support/Peinture couleur : ajuster la position de la section" -msgid "Gizmo" -msgstr "Gizmo" +msgid "Objects list" +msgstr "Liste des objets" + +msgid "Available while the object list has focus." +msgstr "" msgid "Set extruder number for the objects and parts" msgstr "Définir le numéro d'extrudeur pour les objets et les pièces" -msgid "Delete objects, parts, modifiers" -msgstr "Supprimer des objets, des pièces, des modificateurs" +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Space" +msgstr "Espace" msgid "Select the object/part and press space to change the name" msgstr "Sélectionnez l'objet/la pièce et appuyez sur espace pour changer le nom" @@ -12207,45 +12126,48 @@ msgstr "Clic de souris" msgid "Select the object/part and mouse click to change the name" msgstr "Sélectionnez l'objet/la pièce et cliquez avec la souris pour changer le nom" -msgid "Objects List" -msgstr "Liste des objets" - -msgid "Vertical slider - Move active thumb Up" -msgstr "Barre de défilement verticale - Déplacer le curseur actif vers le Haut" - -msgid "Vertical slider - Move active thumb Down" -msgstr "Barre de défilement verticale - Déplacer le curseur actif vers le Bas" - -msgid "Horizontal slider - Move active thumb Left" -msgstr "Barre de défilement horizontale - Déplacer le curseur actif vers la Gauche" - -msgid "Horizontal slider - Move active thumb Right" -msgstr "Barre de défilement horizontale - Déplacer le curseur actif vers la Droite" - -msgid "On/Off one layer mode of the vertical slider" -msgstr "On/Off mode couche unique de la barre de défilement verticale" - -msgid "On/Off G-code window" -msgstr "On/Off Fenêtre G-code" +msgid "Available while the 3D view on the Preview tab has focus." +msgstr "" msgid "Move slider 5x faster" msgstr "Déplacez le curseur 5 fois plus vite" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Home" -msgstr "Début" +msgid "Scroll slider 5x faster" +msgstr "" -msgid "Horizontal slider - Move to start position" -msgstr "Curseur horizontal - Déplacement vers la position de départ" +msgid "Not customizable" +msgstr "" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "End" -msgstr "Fin" +#, c-format, boost-format +msgid "%s is assigned to %s. Reassign it to %s?" +msgstr "" -msgid "Horizontal slider - Move to last position" -msgstr "Curseur horizontal - Déplacer vers la dernière position" +#, c-format, boost-format +msgid "The default %s is assigned to %s. Reassign it to %s?" +msgstr "" + +msgid "Global shortcuts also apply while typing." +msgstr "" + +msgid "A key that types a character cannot be a global shortcut." +msgstr "" + +msgid "Esc cancels, Enter confirms." +msgstr "" + +#, c-format, boost-format +msgid "" +"Press the new shortcut for\n" +"\"%s\"" +msgstr "" + +#, c-format, boost-format +msgid "Already used as a step of %s." +msgstr "" + +#, c-format, boost-format +msgid "Already assigned to %s. Press OK to reassign it." +msgstr "" msgid "Release Note" msgstr "Note de version" @@ -17090,8 +17012,8 @@ msgstr "Étapes de préchauffage" msgid "Insert multiple preheat commands (e.g. M104.1). Only useful for Prusa XL. For other printers, please set it to 1." msgstr "Insérer plusieurs commandes de préchauffage (par exemple M104.1). Uniquement utile pour la Prusa XL. Pour les autres imprimantes, veuillez le régler sur 1." -msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." -msgstr "G-code écrit tout en haut du fichier de sortie, avant tout autre contenu. Utile pour ajouter des métadonnées que le firmware de l'imprimante lit depuis les premières lignes du fichier (ex. temps d'impression estimé, utilisation du filament). Prend en charge les espaces réservés comme {print_time_sec} et {used_filament_length}." +msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_total_sec}, {print_time_day}, {print_time_hour}, {print_time_minute}, {print_time_sec} and {used_filament_length}." +msgstr "" msgid "Start G-code" msgstr "G-code de démarrage" @@ -18615,12 +18537,36 @@ msgstr "Filament utilisé" msgid "Total length of filament used in the print." msgstr "Longueur totale de filament utilisé dans l'impression." -msgid "Print time (seconds)" -msgstr "Temps d'impression (secondes)" +msgid "Print time (total seconds)" +msgstr "" msgid "Total estimated print time in seconds. Replaced with actual value during post-processing." msgstr "Temps d'impression total estimé en secondes. Remplacé par la valeur réelle lors du post-traitement." +msgid "Print time (days component)" +msgstr "" + +msgid "Estimated print time day component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (hours component)" +msgstr "" + +msgid "Estimated print time hour component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (minutes component)" +msgstr "" + +msgid "Estimated print time minute component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (seconds component)" +msgstr "" + +msgid "Estimated print time second component (normal mode). Replaced with actual value during post-processing." +msgstr "" + msgid "Filament length (meters)" msgstr "Longueur de filament (mètres)" @@ -20455,6 +20401,9 @@ msgstr "Aucune session valide détectée. Procéder à la connexion à 3DPrinter msgid "Success!" msgstr "Succès !" +msgid "Generate API Key" +msgstr "" + msgid "Are you sure to log out?" msgstr "Voulez-vous vraiment vous déconnecter ?" @@ -21410,13 +21359,6 @@ msgstr "Le plug-in réseau Bambu est requis pour les fonctionnalités cloud, la msgid "Error: %s" msgstr "Erreur : %s" -msgid "Show details" -msgstr "Afficher les détails" - -# AI Translated -msgid "Hide details" -msgstr "Masquer les détails" - msgid "Version to install:" msgstr "Version à installer :" @@ -24045,6 +23987,12 @@ msgstr "" msgid "No binding for that field" msgstr "" +msgid "Enter a number" +msgstr "" + +msgid "Not a number" +msgstr "" + msgid "Primitive" msgstr "" @@ -24057,6 +24005,216 @@ msgstr "" msgid "Clear All" msgstr "" +msgctxt "Keyboard Shortcut" +msgid "Ins" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Home" +msgstr "Début" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "End" +msgstr "Fin" + +msgctxt "Keyboard Shortcut" +msgid "PgUp" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "PgDn" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Left" +msgstr "Flèche gauche" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Right" +msgstr "Flèche droite" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Up" +msgstr "Flèche haut" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Down" +msgstr "Flèche bas" + +msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" +msgstr "Importez des données de géométrie à partir de fichiers STL/STEP/3MF/OBJ/AMF" + +msgid "Select all objects" +msgstr "Sélectionner tous les objets" + +msgid "Paste from clipboard" +msgstr "Coller depuis le presse-papier" + +msgid "Toggle printable for object/part" +msgstr "Basculer l’état imprimable de l’objet/de la pièce" + +msgid "Move selection 10mm in negative X direction" +msgstr "Déplacer la sélection de 10 mm dans la direction négative X" + +msgid "Move selection 10mm in positive X direction" +msgstr "Déplacer la sélection de 10 mm dans la direction positive X" + +msgid "Move selection 10mm in positive Y direction" +msgstr "Déplacer la sélection de 10 mm dans la direction positive Y" + +msgid "Move selection 10mm in negative Y direction" +msgstr "Déplacer la sélection de 10 mm dans la direction négative Y" + +msgid "Rotate selection 45 degrees counterclockwise" +msgstr "" + +msgid "Rotate selection 45 degrees clockwise" +msgstr "" + +msgid "Gizmo move" +msgstr "Gizmo déplacer" + +msgid "Gizmo rotate" +msgstr "Gizmo pivoter" + +msgid "Gizmo scale" +msgstr "Gizmo redimensionner" + +msgid "Gizmo place face on bed" +msgstr "Gizmo placer la face sur le plateau" + +msgid "Gizmo cut" +msgstr "Gizmo couper" + +msgid "Gizmo mesh boolean" +msgstr "Gizmo booléennes" + +msgid "Gizmo FDM paint-on supports" +msgstr "" + +msgid "Gizmo FDM paint-on seam" +msgstr "Gizmo Peinture de la couture FDM" + +msgid "Gizmo FDM paint-on fuzzy skin" +msgstr "Outil FDM de surface irrégulière peinte" + +msgid "Gizmo multi-material painting" +msgstr "" + +msgid "Gizmo text emboss/engrave" +msgstr "Gizmo embosser/graver du texte" + +msgid "Gizmo measure" +msgstr "Gizmo mesurer" + +msgid "Gizmo assemble" +msgstr "Gizmo assembler" + +msgid "Gizmo brim ears" +msgstr "Gizmo bordure à oreilles" + +msgid "Vertical slider - Move active thumb Up" +msgstr "Barre de défilement verticale - Déplacer le curseur actif vers le Haut" + +msgid "Vertical slider - Move active thumb Down" +msgstr "Barre de défilement verticale - Déplacer le curseur actif vers le Bas" + +msgid "Horizontal slider - Move active thumb Left" +msgstr "Barre de défilement horizontale - Déplacer le curseur actif vers la Gauche" + +msgid "Horizontal slider - Move active thumb Right" +msgstr "Barre de défilement horizontale - Déplacer le curseur actif vers la Droite" + +msgid "Horizontal slider - Move to start position" +msgstr "Curseur horizontal - Déplacement vers la position de départ" + +msgid "Horizontal slider - Move to last position" +msgstr "Curseur horizontal - Déplacer vers la dernière position" + +msgid "Camera view - Default" +msgstr "Vue caméra - Par défaut" + +msgid "Camera view - Top" +msgstr "Vue caméra - Haut" + +msgid "Camera view - Bottom" +msgstr "Vue caméra - Bas" + +msgid "Camera view - Front" +msgstr "Vue de la caméra - Avant" + +msgid "Camera view - Behind" +msgstr "Vue caméra - Derrière" + +msgid "Camera Angle - Left side" +msgstr "Angle de caméra - Côté gauche" + +msgid "Camera Angle - Right side" +msgstr "Angle de caméra - Côté droit" + +msgid "Camera view - Current plate" +msgstr "" + +msgid "Zoom in" +msgstr "Zoom avant" + +msgid "Zoom out" +msgstr "Zoom arrière" + +msgid "Show/Hide 3Dconnexion devices settings dialog" +msgstr "Afficher/Masquer la boîte de dialogue des paramètres des périphériques 3Dconnexion" + +msgid "Show/Hide wireframe" +msgstr "" + +msgid "On/Off G-code window" +msgstr "On/Off Fenêtre G-code" + +msgid "On/Off one layer mode of the vertical slider" +msgstr "On/Off mode couche unique de la barre de défilement verticale" + +msgid "Switch between Prepare/Preview" +msgstr "Basculer entre Préparer/Aperçu" + +msgid "Collapse/Expand the sidebar" +msgstr "Réduire/développer la barre latérale" + +msgid "Open the speed dial" +msgstr "" + +msgid "Reload the device page" +msgstr "" + +msgid "Show keyboard shortcuts list" +msgstr "Afficher la liste des raccourcis clavier" + +msgid "Slicing and printing" +msgstr "" + +msgid "Editing" +msgstr "" + +msgid "Placement" +msgstr "" + +msgid "Gizmos" +msgstr "" + +msgid "Sliders" +msgstr "" + +msgid "Painting tools" +msgstr "" + +msgid "Application" +msgstr "" + #: resources/data/hints.ini: [hint:Precise wall] msgid "" "Precise wall\n" @@ -24357,6 +24515,62 @@ msgstr "" "Éviter la déformation\n" "Saviez-vous que lors de l’impression de matériaux susceptibles de se déformer, tels que l’ABS, une augmentation appropriée de la température du plateau chauffant peut réduire la probabilité de déformation?" +#~ msgid "Tab" +#~ msgstr "Onglet" + +#~ msgid "Displays current viewport FPS in the top-right corner." +#~ msgstr "Affiche les FPS actuels de la vue dans le coin supérieur droit." + +# AI Translated +#~ msgid "Publish 3MF Wiki" +#~ msgstr "Wiki de Publier 3MF" + +# AI Translated +#~ msgid "Publish 3MF Video Guide" +#~ msgstr "Guide vidéo de Publier 3MF" + +#~ msgid "Toolbar" +#~ msgstr "Barre d'outils" + +#~ msgid "Switch table page" +#~ msgstr "Page du tableau de commutation" + +#~ msgid "Global shortcuts" +#~ msgstr "Raccourcis globaux" + +#~ msgid "Middle mouse button" +#~ msgstr "Bouton central de la souris" + +#~ msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." +#~ msgstr "Oriente automatiquement les objets sélectionnés ou tous les objets. S’il y a des objets sélectionnés, seuls ceux-ci sont orientés. Sinon, tous les objets du projet en cours sont orientés." + +#~ msgid "Auto orients all objects on the active plate." +#~ msgstr "Oriente automatiquement tous les objets de la plaque actuelle." + +#~ msgid "Any arrow" +#~ msgstr "Toutes les flèches" + +#~ msgid "Gizmo SLA support points" +#~ msgstr "Gizmo Point de support SLA" + +#~ msgid "Plater" +#~ msgstr "Plateau" + +#~ msgid "Gizmo" +#~ msgstr "Gizmo" + +#~ msgid "Delete objects, parts, modifiers" +#~ msgstr "Supprimer des objets, des pièces, des modificateurs" + +#~ msgid "Objects List" +#~ msgstr "Liste des objets" + +#~ msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." +#~ msgstr "G-code écrit tout en haut du fichier de sortie, avant tout autre contenu. Utile pour ajouter des métadonnées que le firmware de l'imprimante lit depuis les premières lignes du fichier (ex. temps d'impression estimé, utilisation du filament). Prend en charge les espaces réservés comme {print_time_sec} et {used_filament_length}." + +#~ msgid "Print time (seconds)" +#~ msgstr "Temps d'impression (secondes)" + # AI Translated #~ msgid "Open actions speed dial" #~ msgstr "Ouvrir le menu d'actions rapides" diff --git a/localization/i18n/hu/OrcaSlicer_hu.po b/localization/i18n/hu/OrcaSlicer_hu.po index f83b1679e5..4e1f233351 100644 --- a/localization/i18n/hu/OrcaSlicer_hu.po +++ b/localization/i18n/hu/OrcaSlicer_hu.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-09-18 15:50+0800\n" +"POT-Creation-Date: 2026-09-22 17:02+0800\n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -5919,12 +5919,15 @@ msgctxt "Camera View" msgid "Right" msgstr "Jobb" -msgid "Add" -msgstr "Hozzáadás" - msgid "Add plate" msgstr "Tálca hozzáadása" +msgid "Split to objects" +msgstr "Felosztás objektumokra" + +msgid "Add" +msgstr "Hozzáadás" + msgid "Auto orient all/selected objects" msgstr "Az összes/kiválasztott objektum automatikus tájolása" @@ -5937,9 +5940,6 @@ msgstr "Összes objektum elrendezése" msgid "Arrange objects on selected plates" msgstr "Objektumok elrendezése a kiválasztott tálcákon" -msgid "Split to objects" -msgstr "Felosztás objektumokra" - msgid "Assembly View" msgstr "Összeszerelési nézet" @@ -5996,6 +5996,9 @@ msgstr "Körvonal" msgid "Wireframe" msgstr "Drótváz" +msgid "X-Ray" +msgstr "" + # AI Translated msgid "Realistic View" msgstr "Valósághű nézet" @@ -6538,9 +6541,6 @@ msgstr "Körvonal megjelenítése a kijelölt objektum körül a 3D nézetben." msgid "Preferences" msgstr "Beállítások" -msgid "Open speed dial..." -msgstr "" - # AI Translated msgctxt "Menu" msgid "Edit" @@ -6549,6 +6549,9 @@ msgstr "Szerkesztés" msgid "View" msgstr "Nézet" +msgid "Open Speed Dial" +msgstr "" + msgid "Preset Bundle" msgstr "Beállításcsomag" @@ -8358,10 +8361,6 @@ msgstr "Az oldalsáv kibontása" msgid "Collapse sidebar" msgstr "&Az oldalsáv összecsukása" -# AI Translated -msgid "Tab" -msgstr "Tab" - #, c-format, boost-format msgid "Loading file: %s" msgstr "Fájl betöltése: %s" @@ -9386,10 +9385,10 @@ msgstr "Többeszközös kezelés" msgid "With this option enabled, you can send a task to multiple devices at the same time and manage multiple devices." msgstr "Ezzel az opcióval egyszerre több eszközre küldhetsz feladatot és több eszközt kezelhetsz." -msgid "Open the Speed Dial with the Space key" +msgid "Open the Speed Dial from the keyboard" msgstr "" -msgid "When enabled, pressing Space (with no other key held) opens the Speed Dial action search from any page." +msgid "When enabled, the Speed Dial keyboard shortcut (Space by default) opens the action search from any page." msgstr "" msgid "Recent actions" @@ -9521,6 +9520,15 @@ msgstr "Jobb egérhúzás" msgid "Set the action that dragging the right mouse button should perform." msgstr "Állítsd be a jobb egérgomb húzásával végrehajtandó műveletet." +msgid "Keyboard" +msgstr "" + +msgid "Keyboard shortcuts" +msgstr "" + +msgid "Choose the key for each action." +msgstr "" + msgid "Clear my choice on..." msgstr "Választásom törlése ennél..." @@ -9637,11 +9645,39 @@ msgstr "" "Korlátozza a nézetablak képsebességét a GPU terhelés és az energiafogyasztás csökkentése érdekében.\n" "Állítsd 0-ra a korlátlan képkockasebességhez." +msgid "Reuse the 3D scene while idle" +msgstr "" + +msgid "" +"Skips redrawing the 3D scene when only the mouse cursor moves over the viewport,\n" +"and reuses the previous frame's scene instead. Reduces GPU load.\n" +"Disable it if the viewport shows stale or missing contents.\n" +"\n" +"Takes effect immediately." +msgstr "" + +msgid "Skip unchanged frames" +msgstr "" + +msgid "" +"Skips drawing a frame altogether when it would be identical to the one already on screen.\n" +"Only applies to frames that reuse the 3D scene, so it needs Reuse the 3D scene while idle.\n" +"Disable it if a hover highlight, tooltip or animation stops updating.\n" +"\n" +"Takes effect immediately." +msgstr "" + msgid "Show FPS overlay" msgstr "FPS fedvény megjelenítése" -msgid "Displays current viewport FPS in the top-right corner." -msgstr "Megjeleníti az aktuális nézetablak FPS-t a jobb felső sarokban." +msgid "Displays rendering counts in the top-right corner of the viewport." +msgstr "" + +msgid "FPS: frames presented to the screen per second." +msgstr "" + +msgid "3D: frames per second that redrew the 3D scene." +msgstr "" # AI Translated msgid "G-code Preview" @@ -10116,13 +10152,8 @@ msgstr "3MF közzététele..." msgid "Select which settings to be published in the 3MF file" msgstr "Válaszd ki, mely beállítások kerüljenek közzétételre a 3MF fájlban" -# AI Translated -msgid "Publish 3MF Wiki" -msgstr "3MF közzététele wiki" - -# AI Translated -msgid "Publish 3MF Video Guide" -msgstr "3MF közzététele videós útmutató" +msgid "Video Guide" +msgstr "" # AI Translated msgid "Mixed filament - published as a whole when \"Enable\" above is selected" @@ -10324,6 +10355,13 @@ msgstr "" msgid "No wiki page for this action" msgstr "" +msgid "Show details" +msgstr "Részletek megjelenítése" + +# AI Translated +msgid "Hide details" +msgstr "Részletek elrejtése" + #, c-format, boost-format msgid "\"%s\" is a Developer setting. Enable Developer mode to edit it?" msgstr "" @@ -12170,67 +12208,39 @@ msgstr "A konfigurációs csomag az előző konfigurációs útmutatóban módos msgid "Configuration package changed" msgstr "Konfigurációs csomag megváltozott" -msgid "Toolbar" -msgstr "Eszköztár" - -msgid "Objects list" -msgstr "Objektumok listája" - -msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" -msgstr "Geometriai adatok importálása STL/STEP/3MF/OBJ/AMF fájlokból" - -msgid "Paste from clipboard" -msgstr "Beillesztés a vágólapról" - -msgid "Show/Hide 3Dconnexion devices settings dialog" -msgstr "3Dconnexion-eszközbeállítások párbeszédablak megjelenítése/elrejtése" - -msgid "Switch table page" -msgstr "Váltás táblázatra" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Space" -msgstr "Szóköz" - -msgid "Open speed dial" -msgstr "" - -msgid "Run a Speed Dial favourite (while the Speed Dial is open)" -msgstr "" - -msgid "Show keyboard shortcuts list" -msgstr "Gyorsgombok listájának megjelenítése" - -msgid "Global shortcuts" -msgstr "Globális gyorsbillentyűk" - msgid "Pan View" msgstr "Pásztázó nézet" msgid "Rotate View" msgstr "Forgató nézet" -msgid "Middle mouse button" -msgstr "Középső egérgomb" +#, c-format, boost-format +msgid "Use %s or %s, or a key that does not type a character." +msgstr "" -msgid "Zoom View" -msgstr "Nagyító nézet" +msgctxt "Keyboard Shortcut" +msgid "Key" +msgstr "" -msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." -msgstr "Automatikusan beállítja a kijelölt objektumok vagy az összes objektum tájolását. Ha vannak kijelölt objektumok, akkor csak a kijelölteket, ellenkező esetben pedig a projektben levő összes objektumot orientálja." +msgid "Left mouse" +msgstr "" -msgid "Auto orients all objects on the active plate." -msgstr "Automatikusan orientálja az aktuális tálcán levő összes objektumot." +msgid "Available anywhere in the window, even while typing in a text field." +msgstr "" -msgid "Collapse/Expand the sidebar" -msgstr "Az oldalsáv összecsukása/kinyitása" +msgid "Run a speed dial favorite while the dial is open" +msgstr "" -msgid "Any arrow" -msgstr "Bármelyik nyílbillentyű" +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Tab" +msgstr "Tab" -msgid "Movement in camera space" -msgstr "Mozgás a kameratérben" +msgid "Switch to the next main tab" +msgstr "" + +msgid "Available while the 3D view on the Prepare tab has focus." +msgstr "" msgid "Select a part" msgstr "Válassz egy tárgyat" @@ -12241,126 +12251,29 @@ msgstr "Több objektum kijelölése" msgid "Select objects by rectangle" msgstr "Objektumok kijelölése téglalapok alapján" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Up" -msgstr "Felfelé nyíl" - -msgid "Move selection 10mm in positive Y direction" -msgstr "Kijelölés mozgatása 10 mm-rel pozitív Y irányban" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Down" -msgstr "Lefelé nyíl" - -msgid "Move selection 10mm in negative Y direction" -msgstr "Kijelölés mozgatása 10 mm-rel negatív Y irányban" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Left" -msgstr "Balra nyíl" - -msgid "Move selection 10mm in negative X direction" -msgstr "Kijelölés mozgatása 10 mm-rel negatív X irányban" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Right" -msgstr "Jobbra nyíl" - -msgid "Move selection 10mm in positive X direction" -msgstr "Kijelölés mozgatása 10 mm-rel pozitív X irányban" +msgid "Keyboard 1-9: set filament for object/part" +msgstr "filament hozzárendelése az objektumhoz/tárgyhoz" msgid "Movement step set to 1mm" msgstr "Mozgatás lépéstávolsága 1mm-re állítva" -msgid "Keyboard 1-9: set filament for object/part" -msgstr "filament hozzárendelése az objektumhoz/tárgyhoz" +msgid "Movement in camera space" +msgstr "Mozgás a kameratérben" -msgid "Camera view - Default" -msgstr "Kameranézet - Alapértelmezett" +msgid "Middle mouse" +msgstr "" -msgid "Camera view - Top" -msgstr "Kameranézet - Felülről" +msgid "Right mouse" +msgstr "" -msgid "Camera view - Bottom" -msgstr "Kameranézet - Alulról" +msgid "Zoom View" +msgstr "Nagyító nézet" -msgid "Camera view - Front" -msgstr "Kameranézet - Elölről" +msgid "Painting" +msgstr "" -msgid "Camera view - Behind" -msgstr "Kameranézet - Hátulról" - -msgid "Camera Angle - Left side" -msgstr "Kameranézet - Bal oldal" - -msgid "Camera Angle - Right side" -msgstr "Kameranézet - Jobb oldal" - -msgid "Select all objects" -msgstr "Összes objektum kijelölése" - -msgid "Gizmo move" -msgstr "Gizmo mozgatás" - -msgid "Gizmo rotate" -msgstr "Gizmo forgatás" - -msgid "Gizmo scale" -msgstr "Gizmo átméretezés" - -msgid "Gizmo place face on bed" -msgstr "Gizmo felület asztalra illesztése" - -msgid "Gizmo cut" -msgstr "Gizmo vágás" - -msgid "Gizmo mesh boolean" -msgstr "Gizmo modellháló logikai műveletek" - -msgid "Gizmo FDM paint-on fuzzy skin" -msgstr "Gizmo FDM barázdált felület festése" - -msgid "Gizmo SLA support points" -msgstr "Gizmo SLA támaszpontok" - -msgid "Gizmo FDM paint-on seam" -msgstr "Gizmo FDM varrat festés" - -msgid "Gizmo text emboss/engrave" -msgstr "Gizmo szöveg dombornyomás/gravírozás" - -msgid "Gizmo measure" -msgstr "Gizmo mérés" - -msgid "Gizmo assemble" -msgstr "Gizmo összeállítás" - -msgid "Gizmo brim ears" -msgstr "Gizmo peremfülek" - -msgid "Zoom in" -msgstr "Zoom közelítés" - -msgid "Zoom out" -msgstr "Zoom távolítás" - -msgid "Toggle printable for object/part" -msgstr "Nyomtathatóság váltása objektumhoz/alkatrészhez" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Tab" -msgstr "Tab" - -msgid "Switch between Prepare/Preview" -msgstr "Váltás előkészítés/előnézet között" - -msgid "Plater" -msgstr "Tálca" +msgid "Available while a painting gizmo is open: supports, seam, fuzzy skin or color painting." +msgstr "" msgid "Move: press to snap by 1mm" msgstr "Mozgatás: lenyomva 1 mm-es lépésekre illeszt" @@ -12371,15 +12284,19 @@ msgstr "Támasz/Színfestés: toll méretének beállítása" msgid "Support/Color Painting: adjust section position" msgstr "Támasz/Színfestés: metszet pozíciójának beállítása" -# AI Translated -msgid "Gizmo" -msgstr "Gizmo" +msgid "Objects list" +msgstr "Objektumok listája" + +msgid "Available while the object list has focus." +msgstr "" msgid "Set extruder number for the objects and parts" msgstr "Extruder szám beállítása az objektumok és tárgyak számára" -msgid "Delete objects, parts, modifiers" -msgstr "Objektumok, tárgyak, módosítók törlése" +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Space" +msgstr "Szóköz" msgid "Select the object/part and press space to change the name" msgstr "Válaszd ki az objektumot vagy alkatrészt, majd nyomd meg a szóközt a név megváltoztatásához" @@ -12390,45 +12307,48 @@ msgstr "Egérkattintás" msgid "Select the object/part and mouse click to change the name" msgstr "Válaszd ki az objektumot vagy alkatrészt, majd kattints a nevére az átnevezéshez" -msgid "Objects List" -msgstr "Tárgyak listája" - -msgid "Vertical slider - Move active thumb Up" -msgstr "Függőleges csúszka - Az aktív csúszka felfelé mozgatása" - -msgid "Vertical slider - Move active thumb Down" -msgstr "Függőleges csúszka - Az aktív csúszka lefelé mozgatása" - -msgid "Horizontal slider - Move active thumb Left" -msgstr "Vízszintes csúszka - Az aktív csúszka balra mozgatása" - -msgid "Horizontal slider - Move active thumb Right" -msgstr "Vízszintes csúszka - Az aktív csúszka jobbra mozgatása" - -msgid "On/Off one layer mode of the vertical slider" -msgstr "Függőleges csúszka egyréteges módjának ki/bekapcsolása" - -msgid "On/Off G-code window" -msgstr "G-kód ablak be/ki" +msgid "Available while the 3D view on the Preview tab has focus." +msgstr "" msgid "Move slider 5x faster" msgstr "Csúszka 5x gyorsabb mozgatása" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Home" -msgstr "Home" +msgid "Scroll slider 5x faster" +msgstr "" -msgid "Horizontal slider - Move to start position" -msgstr "Vízszintes csúszka - Ugrás a kezdőpozícióra" +msgid "Not customizable" +msgstr "" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "End" -msgstr "End" +#, c-format, boost-format +msgid "%s is assigned to %s. Reassign it to %s?" +msgstr "" -msgid "Horizontal slider - Move to last position" -msgstr "Vízszintes csúszka - Ugrás az utolsó pozícióra" +#, c-format, boost-format +msgid "The default %s is assigned to %s. Reassign it to %s?" +msgstr "" + +msgid "Global shortcuts also apply while typing." +msgstr "" + +msgid "A key that types a character cannot be a global shortcut." +msgstr "" + +msgid "Esc cancels, Enter confirms." +msgstr "" + +#, c-format, boost-format +msgid "" +"Press the new shortcut for\n" +"\"%s\"" +msgstr "" + +#, c-format, boost-format +msgid "Already used as a step of %s." +msgstr "" + +#, c-format, boost-format +msgid "Already assigned to %s. Press OK to reassign it." +msgstr "" msgid "Release Note" msgstr "Verzióinformáció" @@ -17350,8 +17270,8 @@ msgstr "Előmelegítési lépések" msgid "Insert multiple preheat commands (e.g. M104.1). Only useful for Prusa XL. For other printers, please set it to 1." msgstr "Több előmelegítési parancs beszúrása (pl. M104.1). Ez csak a Prusa XL esetén hasznos. Más nyomtatóknál állítsd 1-re." -msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." -msgstr "A kimeneti fájl legelejére írt G-kód, minden más tartalom előtt. Hasznos olyan metaadatok hozzáadására, amelyeket a nyomtató firmware-e a fájl első soraiból olvas ki (pl. becsült nyomtatási idő, filamentfelhasználás). Támogatja az olyan helyőrzőket, mint a {print_time_sec} és a {used_filament_length}." +msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_total_sec}, {print_time_day}, {print_time_hour}, {print_time_minute}, {print_time_sec} and {used_filament_length}." +msgstr "" msgid "Start G-code" msgstr "Kezdő G-kód" @@ -18888,12 +18808,36 @@ msgstr "Használt filament" msgid "Total length of filament used in the print." msgstr "A nyomtatás során felhasznált filament teljes hossza." -msgid "Print time (seconds)" -msgstr "Nyomtatási idő (másodperc)" +msgid "Print time (total seconds)" +msgstr "" msgid "Total estimated print time in seconds. Replaced with actual value during post-processing." msgstr "A teljes becsült nyomtatási idő másodpercben. Az utófeldolgozás során a tényleges értékre cserélődik." +msgid "Print time (days component)" +msgstr "" + +msgid "Estimated print time day component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (hours component)" +msgstr "" + +msgid "Estimated print time hour component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (minutes component)" +msgstr "" + +msgid "Estimated print time minute component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (seconds component)" +msgstr "" + +msgid "Estimated print time second component (normal mode). Replaced with actual value during post-processing." +msgstr "" + msgid "Filament length (meters)" msgstr "Filament hossza (méter)" @@ -20761,6 +20705,9 @@ msgstr "Nem található érvényes munkamenet. Folytatod a bejelentkezést a 3DP msgid "Success!" msgstr "Sikerült!" +msgid "Generate API Key" +msgstr "" + msgid "Are you sure to log out?" msgstr "Biztosan kijelentkezel?" @@ -21810,13 +21757,6 @@ msgstr "A Bambu hálózati bővítmény szükséges a felhőfunkciókhoz, a nyom msgid "Error: %s" msgstr "Hiba: %s" -msgid "Show details" -msgstr "Részletek megjelenítése" - -# AI Translated -msgid "Hide details" -msgstr "Részletek elrejtése" - msgid "Version to install:" msgstr "Telepítendő verzió:" @@ -24473,6 +24413,12 @@ msgstr "" msgid "No binding for that field" msgstr "" +msgid "Enter a number" +msgstr "" + +msgid "Not a number" +msgstr "" + msgid "Primitive" msgstr "" @@ -24485,6 +24431,216 @@ msgstr "" msgid "Clear All" msgstr "" +msgctxt "Keyboard Shortcut" +msgid "Ins" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Home" +msgstr "Home" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "End" +msgstr "End" + +msgctxt "Keyboard Shortcut" +msgid "PgUp" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "PgDn" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Left" +msgstr "Balra nyíl" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Right" +msgstr "Jobbra nyíl" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Up" +msgstr "Felfelé nyíl" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Down" +msgstr "Lefelé nyíl" + +msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" +msgstr "Geometriai adatok importálása STL/STEP/3MF/OBJ/AMF fájlokból" + +msgid "Select all objects" +msgstr "Összes objektum kijelölése" + +msgid "Paste from clipboard" +msgstr "Beillesztés a vágólapról" + +msgid "Toggle printable for object/part" +msgstr "Nyomtathatóság váltása objektumhoz/alkatrészhez" + +msgid "Move selection 10mm in negative X direction" +msgstr "Kijelölés mozgatása 10 mm-rel negatív X irányban" + +msgid "Move selection 10mm in positive X direction" +msgstr "Kijelölés mozgatása 10 mm-rel pozitív X irányban" + +msgid "Move selection 10mm in positive Y direction" +msgstr "Kijelölés mozgatása 10 mm-rel pozitív Y irányban" + +msgid "Move selection 10mm in negative Y direction" +msgstr "Kijelölés mozgatása 10 mm-rel negatív Y irányban" + +msgid "Rotate selection 45 degrees counterclockwise" +msgstr "" + +msgid "Rotate selection 45 degrees clockwise" +msgstr "" + +msgid "Gizmo move" +msgstr "Gizmo mozgatás" + +msgid "Gizmo rotate" +msgstr "Gizmo forgatás" + +msgid "Gizmo scale" +msgstr "Gizmo átméretezés" + +msgid "Gizmo place face on bed" +msgstr "Gizmo felület asztalra illesztése" + +msgid "Gizmo cut" +msgstr "Gizmo vágás" + +msgid "Gizmo mesh boolean" +msgstr "Gizmo modellháló logikai műveletek" + +msgid "Gizmo FDM paint-on supports" +msgstr "" + +msgid "Gizmo FDM paint-on seam" +msgstr "Gizmo FDM varrat festés" + +msgid "Gizmo FDM paint-on fuzzy skin" +msgstr "Gizmo FDM barázdált felület festése" + +msgid "Gizmo multi-material painting" +msgstr "" + +msgid "Gizmo text emboss/engrave" +msgstr "Gizmo szöveg dombornyomás/gravírozás" + +msgid "Gizmo measure" +msgstr "Gizmo mérés" + +msgid "Gizmo assemble" +msgstr "Gizmo összeállítás" + +msgid "Gizmo brim ears" +msgstr "Gizmo peremfülek" + +msgid "Vertical slider - Move active thumb Up" +msgstr "Függőleges csúszka - Az aktív csúszka felfelé mozgatása" + +msgid "Vertical slider - Move active thumb Down" +msgstr "Függőleges csúszka - Az aktív csúszka lefelé mozgatása" + +msgid "Horizontal slider - Move active thumb Left" +msgstr "Vízszintes csúszka - Az aktív csúszka balra mozgatása" + +msgid "Horizontal slider - Move active thumb Right" +msgstr "Vízszintes csúszka - Az aktív csúszka jobbra mozgatása" + +msgid "Horizontal slider - Move to start position" +msgstr "Vízszintes csúszka - Ugrás a kezdőpozícióra" + +msgid "Horizontal slider - Move to last position" +msgstr "Vízszintes csúszka - Ugrás az utolsó pozícióra" + +msgid "Camera view - Default" +msgstr "Kameranézet - Alapértelmezett" + +msgid "Camera view - Top" +msgstr "Kameranézet - Felülről" + +msgid "Camera view - Bottom" +msgstr "Kameranézet - Alulról" + +msgid "Camera view - Front" +msgstr "Kameranézet - Elölről" + +msgid "Camera view - Behind" +msgstr "Kameranézet - Hátulról" + +msgid "Camera Angle - Left side" +msgstr "Kameranézet - Bal oldal" + +msgid "Camera Angle - Right side" +msgstr "Kameranézet - Jobb oldal" + +msgid "Camera view - Current plate" +msgstr "" + +msgid "Zoom in" +msgstr "Zoom közelítés" + +msgid "Zoom out" +msgstr "Zoom távolítás" + +msgid "Show/Hide 3Dconnexion devices settings dialog" +msgstr "3Dconnexion-eszközbeállítások párbeszédablak megjelenítése/elrejtése" + +msgid "Show/Hide wireframe" +msgstr "" + +msgid "On/Off G-code window" +msgstr "G-kód ablak be/ki" + +msgid "On/Off one layer mode of the vertical slider" +msgstr "Függőleges csúszka egyréteges módjának ki/bekapcsolása" + +msgid "Switch between Prepare/Preview" +msgstr "Váltás előkészítés/előnézet között" + +msgid "Collapse/Expand the sidebar" +msgstr "Az oldalsáv összecsukása/kinyitása" + +msgid "Open the speed dial" +msgstr "" + +msgid "Reload the device page" +msgstr "" + +msgid "Show keyboard shortcuts list" +msgstr "Gyorsgombok listájának megjelenítése" + +msgid "Slicing and printing" +msgstr "" + +msgid "Editing" +msgstr "" + +msgid "Placement" +msgstr "" + +msgid "Gizmos" +msgstr "" + +msgid "Sliders" +msgstr "" + +msgid "Painting tools" +msgstr "" + +msgid "Application" +msgstr "" + #: resources/data/hints.ini: [hint:Precise wall] msgid "" "Precise wall\n" @@ -24786,6 +24942,64 @@ msgstr "" "Kunkorodás elkerülése\n" "Tudtad, hogy a kunkorodásra hajlamos anyagok (például ABS) nyomtatásakor az asztal hőmérsékletének növelése csökkentheti a kunkorodás valószínűségét?" +# AI Translated +#~ msgid "Tab" +#~ msgstr "Tab" + +#~ msgid "Displays current viewport FPS in the top-right corner." +#~ msgstr "Megjeleníti az aktuális nézetablak FPS-t a jobb felső sarokban." + +# AI Translated +#~ msgid "Publish 3MF Wiki" +#~ msgstr "3MF közzététele wiki" + +# AI Translated +#~ msgid "Publish 3MF Video Guide" +#~ msgstr "3MF közzététele videós útmutató" + +#~ msgid "Toolbar" +#~ msgstr "Eszköztár" + +#~ msgid "Switch table page" +#~ msgstr "Váltás táblázatra" + +#~ msgid "Global shortcuts" +#~ msgstr "Globális gyorsbillentyűk" + +#~ msgid "Middle mouse button" +#~ msgstr "Középső egérgomb" + +#~ msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." +#~ msgstr "Automatikusan beállítja a kijelölt objektumok vagy az összes objektum tájolását. Ha vannak kijelölt objektumok, akkor csak a kijelölteket, ellenkező esetben pedig a projektben levő összes objektumot orientálja." + +#~ msgid "Auto orients all objects on the active plate." +#~ msgstr "Automatikusan orientálja az aktuális tálcán levő összes objektumot." + +#~ msgid "Any arrow" +#~ msgstr "Bármelyik nyílbillentyű" + +#~ msgid "Gizmo SLA support points" +#~ msgstr "Gizmo SLA támaszpontok" + +#~ msgid "Plater" +#~ msgstr "Tálca" + +# AI Translated +#~ msgid "Gizmo" +#~ msgstr "Gizmo" + +#~ msgid "Delete objects, parts, modifiers" +#~ msgstr "Objektumok, tárgyak, módosítók törlése" + +#~ msgid "Objects List" +#~ msgstr "Tárgyak listája" + +#~ msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." +#~ msgstr "A kimeneti fájl legelejére írt G-kód, minden más tartalom előtt. Hasznos olyan metaadatok hozzáadására, amelyeket a nyomtató firmware-e a fájl első soraiból olvas ki (pl. becsült nyomtatási idő, filamentfelhasználás). Támogatja az olyan helyőrzőket, mint a {print_time_sec} és a {used_filament_length}." + +#~ msgid "Print time (seconds)" +#~ msgstr "Nyomtatási idő (másodperc)" + # AI Translated #~ msgid "Open actions speed dial" #~ msgstr "Műveletek gyorsmenüjének megnyitása" diff --git a/localization/i18n/it/OrcaSlicer_it.po b/localization/i18n/it/OrcaSlicer_it.po index 087189ae93..f17bfc5ba3 100644 --- a/localization/i18n/it/OrcaSlicer_it.po +++ b/localization/i18n/it/OrcaSlicer_it.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-09-18 15:50+0800\n" +"POT-Creation-Date: 2026-09-22 17:02+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -5920,12 +5920,15 @@ msgctxt "Camera View" msgid "Right" msgstr "Destra" -msgid "Add" -msgstr "Aggiungi" - msgid "Add plate" msgstr "Aggiungi piatto" +msgid "Split to objects" +msgstr "Dividi in oggetti" + +msgid "Add" +msgstr "Aggiungi" + msgid "Auto orient all/selected objects" msgstr "Orientamento automatico tutti/selezionati oggetti" @@ -5938,9 +5941,6 @@ msgstr "Disponi tutti gli oggetti" msgid "Arrange objects on selected plates" msgstr "Disponi gli oggetti sui piatti selezionati" -msgid "Split to objects" -msgstr "Dividi in oggetti" - msgid "Assembly View" msgstr "Vista di montaggio" @@ -5997,6 +5997,9 @@ msgstr "Contorno" msgid "Wireframe" msgstr "Modello reticolato" +msgid "X-Ray" +msgstr "" + # AI Translated msgid "Realistic View" msgstr "Vista realistica" @@ -6540,9 +6543,6 @@ msgstr "Mostra il contorno attorno all'oggetto selezionato nella scena 3D." msgid "Preferences" msgstr "Preferenze" -msgid "Open speed dial..." -msgstr "" - # AI Translated msgctxt "Menu" msgid "Edit" @@ -6551,6 +6551,9 @@ msgstr "Modifica" msgid "View" msgstr "Vista" +msgid "Open Speed Dial" +msgstr "" + msgid "Preset Bundle" msgstr "Pacchetto profili" @@ -8362,10 +8365,6 @@ msgstr "Espandi barra laterale" msgid "Collapse sidebar" msgstr "Riduci barra laterale" -# AI Translated -msgid "Tab" -msgstr "Tab" - #, c-format, boost-format msgid "Loading file: %s" msgstr "Caricamento file: %s" @@ -9388,10 +9387,10 @@ msgstr "Gestione multi-dispositivo" msgid "With this option enabled, you can send a task to multiple devices at the same time and manage multiple devices." msgstr "Abilitando questa opzione, puoi inviare un'attività a più dispositivi contemporaneamente e gestire più dispositivi." -msgid "Open the Speed Dial with the Space key" +msgid "Open the Speed Dial from the keyboard" msgstr "" -msgid "When enabled, pressing Space (with no other key held) opens the Speed Dial action search from any page." +msgid "When enabled, the Speed Dial keyboard shortcut (Space by default) opens the action search from any page." msgstr "" msgid "Recent actions" @@ -9530,6 +9529,15 @@ msgstr "Trascinamento con il tasto destro del mouse" msgid "Set the action that dragging the right mouse button should perform." msgstr "Imposta l'azione che deve eseguire il trascinamento con il tasto destro del mouse." +msgid "Keyboard" +msgstr "" + +msgid "Keyboard shortcuts" +msgstr "" + +msgid "Choose the key for each action." +msgstr "" + msgid "Clear my choice on..." msgstr "Cancella la mia scelta su..." @@ -9654,13 +9662,40 @@ msgstr "" "Limita la frequenza dei fotogrammi della vista per ridurre il carico della GPU e il consumo energetico.\n" "Imposta a 0 per una frequenza dei fotogrammi illimitata." +msgid "Reuse the 3D scene while idle" +msgstr "" + +msgid "" +"Skips redrawing the 3D scene when only the mouse cursor moves over the viewport,\n" +"and reuses the previous frame's scene instead. Reduces GPU load.\n" +"Disable it if the viewport shows stale or missing contents.\n" +"\n" +"Takes effect immediately." +msgstr "" + +msgid "Skip unchanged frames" +msgstr "" + +msgid "" +"Skips drawing a frame altogether when it would be identical to the one already on screen.\n" +"Only applies to frames that reuse the 3D scene, so it needs Reuse the 3D scene while idle.\n" +"Disable it if a hover highlight, tooltip or animation stops updating.\n" +"\n" +"Takes effect immediately." +msgstr "" + # AI Translated msgid "Show FPS overlay" msgstr "Mostra overlay FPS" -# AI Translated -msgid "Displays current viewport FPS in the top-right corner." -msgstr "Mostra gli FPS correnti della vista nell'angolo in alto a destra." +msgid "Displays rendering counts in the top-right corner of the viewport." +msgstr "" + +msgid "FPS: frames presented to the screen per second." +msgstr "" + +msgid "3D: frames per second that redrew the 3D scene." +msgstr "" # AI Translated msgid "G-code Preview" @@ -10134,13 +10169,8 @@ msgstr "Pubblica 3MF..." msgid "Select which settings to be published in the 3MF file" msgstr "Seleziona quali impostazioni pubblicare nel file 3MF" -# AI Translated -msgid "Publish 3MF Wiki" -msgstr "Wiki di Pubblica 3MF" - -# AI Translated -msgid "Publish 3MF Video Guide" -msgstr "Guida video di Pubblica 3MF" +msgid "Video Guide" +msgstr "" # AI Translated msgid "Mixed filament - published as a whole when \"Enable\" above is selected" @@ -10342,6 +10372,13 @@ msgstr "" msgid "No wiki page for this action" msgstr "" +msgid "Show details" +msgstr "Mostra dettagli" + +# AI Translated +msgid "Hide details" +msgstr "Nascondi dettagli" + #, c-format, boost-format msgid "\"%s\" is a Developer setting. Enable Developer mode to edit it?" msgstr "" @@ -12190,68 +12227,39 @@ msgstr "Il pacchetto di configurazione è stato modificato nella precedente Guid msgid "Configuration package changed" msgstr "Pacchetto di configurazione modificato" -msgid "Toolbar" -msgstr "Barra degli strumenti" - -msgid "Objects list" -msgstr "Elenco oggetti" - -msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" -msgstr "Importa geometrie da file STL/STEP/3MF/OBJ/AMF" - -msgid "Paste from clipboard" -msgstr "Incolla dagli appunti" - -msgid "Show/Hide 3Dconnexion devices settings dialog" -msgstr "Mostra/nascondi la finestra di dialogo delle impostazioni dei dispositivi 3Dconnexion" - -msgid "Switch table page" -msgstr "Cambia pagina tabella" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Space" -msgstr "Spazio" - -msgid "Open speed dial" -msgstr "" - -msgid "Run a Speed Dial favourite (while the Speed Dial is open)" -msgstr "" - -msgid "Show keyboard shortcuts list" -msgstr "Mostra elenco scorciatoie da tastiera" - -msgid "Global shortcuts" -msgstr "Scorciatoie globali" - msgid "Pan View" msgstr "Vista panoramica" msgid "Rotate View" msgstr "Ruota vista" +#, c-format, boost-format +msgid "Use %s or %s, or a key that does not type a character." +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "Key" +msgstr "" + +msgid "Left mouse" +msgstr "" + +msgid "Available anywhere in the window, even while typing in a text field." +msgstr "" + +msgid "Run a speed dial favorite while the dial is open" +msgstr "" + # AI Translated -msgid "Middle mouse button" -msgstr "Tasto centrale del mouse" +msgctxt "Keyboard Shortcut" +msgid "Tab" +msgstr "Tab" -msgid "Zoom View" -msgstr "Vista Zoom" +msgid "Switch to the next main tab" +msgstr "" -msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." -msgstr "Questo orienta automaticamente gli oggetti selezionati o tutti gli oggetti. Se ci sono oggetti selezionati, orienta solo quelli selezionati. Altrimenti, orienterà tutti gli elementi nel progetto corrente." - -msgid "Auto orients all objects on the active plate." -msgstr "Questo orienta tutti gli oggetti nel piatto corrente." - -msgid "Collapse/Expand the sidebar" -msgstr "Riduci/Espandi barra laterale" - -msgid "Any arrow" -msgstr "Qualsiasi freccia" - -msgid "Movement in camera space" -msgstr "Movimento nello spazio della telecamera" +msgid "Available while the 3D view on the Prepare tab has focus." +msgstr "" msgid "Select a part" msgstr "Seleziona parte" @@ -12262,126 +12270,29 @@ msgstr "Seleziona più oggetti" msgid "Select objects by rectangle" msgstr "Seleziona oggetti per rettangolo" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Up" -msgstr "Freccia su" - -msgid "Move selection 10mm in positive Y direction" -msgstr "Sposta selezione di 10 mm in direzione Y positiva" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Down" -msgstr "Freccia giù" - -msgid "Move selection 10mm in negative Y direction" -msgstr "Sposta selezione di 10 mm in direzione Y negativa" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Left" -msgstr "Freccia sinistra" - -msgid "Move selection 10mm in negative X direction" -msgstr "Sposta selezione di 10 mm in direzione X negativa" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Right" -msgstr "Freccia destra" - -msgid "Move selection 10mm in positive X direction" -msgstr "Sposta selezione di 10 mm in direzione X positiva" +msgid "Keyboard 1-9: set filament for object/part" +msgstr "Tastiera 1-9: imposta il filamento per l'oggetto/parte" msgid "Movement step set to 1mm" msgstr "Passo movimento impostato a 1 mm" -msgid "Keyboard 1-9: set filament for object/part" -msgstr "Tastiera 1-9: imposta il filamento per l'oggetto/parte" +msgid "Movement in camera space" +msgstr "Movimento nello spazio della telecamera" -msgid "Camera view - Default" -msgstr "Vista telecamera - Predefinito" +msgid "Middle mouse" +msgstr "" -msgid "Camera view - Top" -msgstr "Vista telecamera - In Alto" +msgid "Right mouse" +msgstr "" -msgid "Camera view - Bottom" -msgstr "Vista telecamera - In Basso" +msgid "Zoom View" +msgstr "Vista Zoom" -msgid "Camera view - Front" -msgstr "Vista telecamera - Anteriore" +msgid "Painting" +msgstr "" -msgid "Camera view - Behind" -msgstr "Vista telecamera - Posteriore" - -msgid "Camera Angle - Left side" -msgstr "Angolo della camera - Lato sinistro" - -msgid "Camera Angle - Right side" -msgstr "Angolo della camera - Lato destro" - -msgid "Select all objects" -msgstr "Seleziona tutti gli oggetti" - -msgid "Gizmo move" -msgstr "Strumento Muovi" - -msgid "Gizmo rotate" -msgstr "Strumento Ruota" - -msgid "Gizmo scale" -msgstr "Strumento Scala" - -msgid "Gizmo place face on bed" -msgstr "Strumento posiziona faccia sul piatto" - -msgid "Gizmo cut" -msgstr "Strumento Taglia" - -msgid "Gizmo mesh boolean" -msgstr "Gizmo maglia booleana" - -msgid "Gizmo FDM paint-on fuzzy skin" -msgstr "Strumento FDM per superficie ruvida dipinta" - -msgid "Gizmo SLA support points" -msgstr "Strumento Punti di supporto SLA" - -msgid "Gizmo FDM paint-on seam" -msgstr "Strumento Dipingi cucitura FDM" - -msgid "Gizmo text emboss/engrave" -msgstr "Strumento testo in rilievo/incisione" - -msgid "Gizmo measure" -msgstr "Gizmo misura" - -msgid "Gizmo assemble" -msgstr "Gizmo assemblaggio" - -msgid "Gizmo brim ears" -msgstr "Gizmo tese ad orecchio" - -msgid "Zoom in" -msgstr "Ingrandisci" - -msgid "Zoom out" -msgstr "Rimpicciolisci" - -msgid "Toggle printable for object/part" -msgstr "Attiva/disattiva stampa per oggetto/parte" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Tab" -msgstr "Tab" - -msgid "Switch between Prepare/Preview" -msgstr "Passa tra Prepara e Anteprima" - -msgid "Plater" -msgstr "Piatto" +msgid "Available while a painting gizmo is open: supports, seam, fuzzy skin or color painting." +msgstr "" msgid "Move: press to snap by 1mm" msgstr "Sposta: premi per muovere di 1 mm" @@ -12392,14 +12303,19 @@ msgstr "Supporto/Pittura a colori: regola il raggio della penna" msgid "Support/Color Painting: adjust section position" msgstr "Supporto/Pittura a colori: regola la posizione della sezione" -msgid "Gizmo" -msgstr "Strumento" +msgid "Objects list" +msgstr "Elenco oggetti" + +msgid "Available while the object list has focus." +msgstr "" msgid "Set extruder number for the objects and parts" msgstr "Imposta il numero dell'estrusore per gli oggetti e le parti" -msgid "Delete objects, parts, modifiers" -msgstr "Elimina oggetti, parti, modificatori" +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Space" +msgstr "Spazio" msgid "Select the object/part and press space to change the name" msgstr "Seleziona l'oggetto/la parte e premi la barra spaziatrice per modificare il nome" @@ -12410,45 +12326,48 @@ msgstr "Clic del mouse" msgid "Select the object/part and mouse click to change the name" msgstr "Seleziona l'oggetto/la parte e fai clic con il mouse per modificare il nome" -msgid "Objects List" -msgstr "Elenco oggetti" - -msgid "Vertical slider - Move active thumb Up" -msgstr "Cursore di scorrimento verticale - Solleva cursore attivo" - -msgid "Vertical slider - Move active thumb Down" -msgstr "Cursore di scorrimento verticale - Abbassa cursore attivo" - -msgid "Horizontal slider - Move active thumb Left" -msgstr "Cursore di scorrimento orizzontale - Sposta a sinistra il cursore attivo" - -msgid "Horizontal slider - Move active thumb Right" -msgstr "Cursore di scorrimento orizzontale - Sposta a destra il cursore attivo" - -msgid "On/Off one layer mode of the vertical slider" -msgstr "Attiva/Disattiva modalità singolo strato del cursore di scorrimento verticale" - -msgid "On/Off G-code window" -msgstr "Attiva/Disattiva finestra G-code" +msgid "Available while the 3D view on the Preview tab has focus." +msgstr "" msgid "Move slider 5x faster" msgstr "Sposta il cursore 5 volte più velocemente" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Home" -msgstr "Home" +msgid "Scroll slider 5x faster" +msgstr "" -msgid "Horizontal slider - Move to start position" -msgstr "Cursore di scorrimento orizzontale - Sposta alla posizione iniziale" +msgid "Not customizable" +msgstr "" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "End" -msgstr "Fine" +#, c-format, boost-format +msgid "%s is assigned to %s. Reassign it to %s?" +msgstr "" -msgid "Horizontal slider - Move to last position" -msgstr "Cursore di scorrimento orizzontale - Sposta alla posizione finale" +#, c-format, boost-format +msgid "The default %s is assigned to %s. Reassign it to %s?" +msgstr "" + +msgid "Global shortcuts also apply while typing." +msgstr "" + +msgid "A key that types a character cannot be a global shortcut." +msgstr "" + +msgid "Esc cancels, Enter confirms." +msgstr "" + +#, c-format, boost-format +msgid "" +"Press the new shortcut for\n" +"\"%s\"" +msgstr "" + +#, c-format, boost-format +msgid "Already used as a step of %s." +msgstr "" + +#, c-format, boost-format +msgid "Already assigned to %s. Press OK to reassign it." +msgstr "" msgid "Release Note" msgstr "Note di rilascio" @@ -17372,8 +17291,8 @@ msgstr "Fasi preriscaldamento" msgid "Insert multiple preheat commands (e.g. M104.1). Only useful for Prusa XL. For other printers, please set it to 1." msgstr "Inserisci più comandi di preriscaldamento (ad esempio M104.1). Utile solo per Prusa XL. Per altre stampanti, impostalo su 1." -msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." -msgstr "G-code scritto all'inizio del file di output, prima di qualsiasi altro contenuto. Utile per aggiungere metadati che il firmware della stampante legge dalle prime righe del file (ad es. tempo di stampa stimato, utilizzo filamento). Supporta segnaposto come {print_time_sec} e {used_filament_length}." +msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_total_sec}, {print_time_day}, {print_time_hour}, {print_time_minute}, {print_time_sec} and {used_filament_length}." +msgstr "" msgid "Start G-code" msgstr "G-code iniziale" @@ -18911,12 +18830,36 @@ msgstr "Filamento usato" msgid "Total length of filament used in the print." msgstr "Lunghezza totale di filamento utilizzato nella stampa." -msgid "Print time (seconds)" -msgstr "Tempo di stampa (secondi)" +msgid "Print time (total seconds)" +msgstr "" msgid "Total estimated print time in seconds. Replaced with actual value during post-processing." msgstr "Tempo di stampa stimato totale in secondi. Sostituito con il valore effettivo durante la post-elaborazione." +msgid "Print time (days component)" +msgstr "" + +msgid "Estimated print time day component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (hours component)" +msgstr "" + +msgid "Estimated print time hour component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (minutes component)" +msgstr "" + +msgid "Estimated print time minute component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (seconds component)" +msgstr "" + +msgid "Estimated print time second component (normal mode). Replaced with actual value during post-processing." +msgstr "" + msgid "Filament length (meters)" msgstr "Lunghezza filamento (metri)" @@ -20779,6 +20722,9 @@ msgstr "Nessuna sessione valida rilevata. Procedere con l'accesso a 3DPrinterOS? msgid "Success!" msgstr "Successo!" +msgid "Generate API Key" +msgstr "" + msgid "Are you sure to log out?" msgstr "Sei sicuro di volerti disconnettere?" @@ -21834,13 +21780,6 @@ msgstr "Il modulo di rete Bambu è necessario per le funzionalità cloud, il ril msgid "Error: %s" msgstr "Errore: %s" -msgid "Show details" -msgstr "Mostra dettagli" - -# AI Translated -msgid "Hide details" -msgstr "Nascondi dettagli" - msgid "Version to install:" msgstr "Versione da installare:" @@ -24497,6 +24436,12 @@ msgstr "" msgid "No binding for that field" msgstr "" +msgid "Enter a number" +msgstr "" + +msgid "Not a number" +msgstr "" + msgid "Primitive" msgstr "" @@ -24509,6 +24454,216 @@ msgstr "" msgid "Clear All" msgstr "" +msgctxt "Keyboard Shortcut" +msgid "Ins" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Home" +msgstr "Home" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "End" +msgstr "Fine" + +msgctxt "Keyboard Shortcut" +msgid "PgUp" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "PgDn" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Left" +msgstr "Freccia sinistra" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Right" +msgstr "Freccia destra" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Up" +msgstr "Freccia su" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Down" +msgstr "Freccia giù" + +msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" +msgstr "Importa geometrie da file STL/STEP/3MF/OBJ/AMF" + +msgid "Select all objects" +msgstr "Seleziona tutti gli oggetti" + +msgid "Paste from clipboard" +msgstr "Incolla dagli appunti" + +msgid "Toggle printable for object/part" +msgstr "Attiva/disattiva stampa per oggetto/parte" + +msgid "Move selection 10mm in negative X direction" +msgstr "Sposta selezione di 10 mm in direzione X negativa" + +msgid "Move selection 10mm in positive X direction" +msgstr "Sposta selezione di 10 mm in direzione X positiva" + +msgid "Move selection 10mm in positive Y direction" +msgstr "Sposta selezione di 10 mm in direzione Y positiva" + +msgid "Move selection 10mm in negative Y direction" +msgstr "Sposta selezione di 10 mm in direzione Y negativa" + +msgid "Rotate selection 45 degrees counterclockwise" +msgstr "" + +msgid "Rotate selection 45 degrees clockwise" +msgstr "" + +msgid "Gizmo move" +msgstr "Strumento Muovi" + +msgid "Gizmo rotate" +msgstr "Strumento Ruota" + +msgid "Gizmo scale" +msgstr "Strumento Scala" + +msgid "Gizmo place face on bed" +msgstr "Strumento posiziona faccia sul piatto" + +msgid "Gizmo cut" +msgstr "Strumento Taglia" + +msgid "Gizmo mesh boolean" +msgstr "Gizmo maglia booleana" + +msgid "Gizmo FDM paint-on supports" +msgstr "" + +msgid "Gizmo FDM paint-on seam" +msgstr "Strumento Dipingi cucitura FDM" + +msgid "Gizmo FDM paint-on fuzzy skin" +msgstr "Strumento FDM per superficie ruvida dipinta" + +msgid "Gizmo multi-material painting" +msgstr "" + +msgid "Gizmo text emboss/engrave" +msgstr "Strumento testo in rilievo/incisione" + +msgid "Gizmo measure" +msgstr "Gizmo misura" + +msgid "Gizmo assemble" +msgstr "Gizmo assemblaggio" + +msgid "Gizmo brim ears" +msgstr "Gizmo tese ad orecchio" + +msgid "Vertical slider - Move active thumb Up" +msgstr "Cursore di scorrimento verticale - Solleva cursore attivo" + +msgid "Vertical slider - Move active thumb Down" +msgstr "Cursore di scorrimento verticale - Abbassa cursore attivo" + +msgid "Horizontal slider - Move active thumb Left" +msgstr "Cursore di scorrimento orizzontale - Sposta a sinistra il cursore attivo" + +msgid "Horizontal slider - Move active thumb Right" +msgstr "Cursore di scorrimento orizzontale - Sposta a destra il cursore attivo" + +msgid "Horizontal slider - Move to start position" +msgstr "Cursore di scorrimento orizzontale - Sposta alla posizione iniziale" + +msgid "Horizontal slider - Move to last position" +msgstr "Cursore di scorrimento orizzontale - Sposta alla posizione finale" + +msgid "Camera view - Default" +msgstr "Vista telecamera - Predefinito" + +msgid "Camera view - Top" +msgstr "Vista telecamera - In Alto" + +msgid "Camera view - Bottom" +msgstr "Vista telecamera - In Basso" + +msgid "Camera view - Front" +msgstr "Vista telecamera - Anteriore" + +msgid "Camera view - Behind" +msgstr "Vista telecamera - Posteriore" + +msgid "Camera Angle - Left side" +msgstr "Angolo della camera - Lato sinistro" + +msgid "Camera Angle - Right side" +msgstr "Angolo della camera - Lato destro" + +msgid "Camera view - Current plate" +msgstr "" + +msgid "Zoom in" +msgstr "Ingrandisci" + +msgid "Zoom out" +msgstr "Rimpicciolisci" + +msgid "Show/Hide 3Dconnexion devices settings dialog" +msgstr "Mostra/nascondi la finestra di dialogo delle impostazioni dei dispositivi 3Dconnexion" + +msgid "Show/Hide wireframe" +msgstr "" + +msgid "On/Off G-code window" +msgstr "Attiva/Disattiva finestra G-code" + +msgid "On/Off one layer mode of the vertical slider" +msgstr "Attiva/Disattiva modalità singolo strato del cursore di scorrimento verticale" + +msgid "Switch between Prepare/Preview" +msgstr "Passa tra Prepara e Anteprima" + +msgid "Collapse/Expand the sidebar" +msgstr "Riduci/Espandi barra laterale" + +msgid "Open the speed dial" +msgstr "" + +msgid "Reload the device page" +msgstr "" + +msgid "Show keyboard shortcuts list" +msgstr "Mostra elenco scorciatoie da tastiera" + +msgid "Slicing and printing" +msgstr "" + +msgid "Editing" +msgstr "" + +msgid "Placement" +msgstr "" + +msgid "Gizmos" +msgstr "" + +msgid "Sliders" +msgstr "" + +msgid "Painting tools" +msgstr "" + +msgid "Application" +msgstr "" + #: resources/data/hints.ini: [hint:Precise wall] msgid "" "Precise wall\n" @@ -24810,6 +24965,65 @@ msgstr "" "Evita le deformazioni\n" "Sapevi che quando si stampano materiali soggetti a deformazioni come l'ABS, aumentare in modo appropriato la temperatura del piano riscaldato può ridurre la probabilità di deformazione?" +# AI Translated +#~ msgid "Tab" +#~ msgstr "Tab" + +# AI Translated +#~ msgid "Displays current viewport FPS in the top-right corner." +#~ msgstr "Mostra gli FPS correnti della vista nell'angolo in alto a destra." + +# AI Translated +#~ msgid "Publish 3MF Wiki" +#~ msgstr "Wiki di Pubblica 3MF" + +# AI Translated +#~ msgid "Publish 3MF Video Guide" +#~ msgstr "Guida video di Pubblica 3MF" + +#~ msgid "Toolbar" +#~ msgstr "Barra degli strumenti" + +#~ msgid "Switch table page" +#~ msgstr "Cambia pagina tabella" + +#~ msgid "Global shortcuts" +#~ msgstr "Scorciatoie globali" + +# AI Translated +#~ msgid "Middle mouse button" +#~ msgstr "Tasto centrale del mouse" + +#~ msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." +#~ msgstr "Questo orienta automaticamente gli oggetti selezionati o tutti gli oggetti. Se ci sono oggetti selezionati, orienta solo quelli selezionati. Altrimenti, orienterà tutti gli elementi nel progetto corrente." + +#~ msgid "Auto orients all objects on the active plate." +#~ msgstr "Questo orienta tutti gli oggetti nel piatto corrente." + +#~ msgid "Any arrow" +#~ msgstr "Qualsiasi freccia" + +#~ msgid "Gizmo SLA support points" +#~ msgstr "Strumento Punti di supporto SLA" + +#~ msgid "Plater" +#~ msgstr "Piatto" + +#~ msgid "Gizmo" +#~ msgstr "Strumento" + +#~ msgid "Delete objects, parts, modifiers" +#~ msgstr "Elimina oggetti, parti, modificatori" + +#~ msgid "Objects List" +#~ msgstr "Elenco oggetti" + +#~ msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." +#~ msgstr "G-code scritto all'inizio del file di output, prima di qualsiasi altro contenuto. Utile per aggiungere metadati che il firmware della stampante legge dalle prime righe del file (ad es. tempo di stampa stimato, utilizzo filamento). Supporta segnaposto come {print_time_sec} e {used_filament_length}." + +#~ msgid "Print time (seconds)" +#~ msgstr "Tempo di stampa (secondi)" + # AI Translated #~ msgid "Open actions speed dial" #~ msgstr "Apri la selezione rapida delle azioni" diff --git a/localization/i18n/ja/OrcaSlicer_ja.po b/localization/i18n/ja/OrcaSlicer_ja.po index 98f937fc6d..3601d3add0 100644 --- a/localization/i18n/ja/OrcaSlicer_ja.po +++ b/localization/i18n/ja/OrcaSlicer_ja.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-09-18 15:50+0800\n" +"POT-Creation-Date: 2026-09-22 17:02+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -5937,12 +5937,15 @@ msgctxt "Camera View" msgid "Right" msgstr "右" -msgid "Add" -msgstr "追加" - msgid "Add plate" msgstr "プレートを追加" +msgid "Split to objects" +msgstr "オブジェクトに分割" + +msgid "Add" +msgstr "追加" + msgid "Auto orient all/selected objects" msgstr "すべてのオブジェクト/選択したオブジェクトの方向を自動設定する" @@ -5955,9 +5958,6 @@ msgstr "全てをレイアウト" msgid "Arrange objects on selected plates" msgstr "選択したプレートをレイアウト" -msgid "Split to objects" -msgstr "オブジェクトに分割" - msgid "Assembly View" msgstr "組立て" @@ -6014,6 +6014,9 @@ msgstr "アウトライン" msgid "Wireframe" msgstr "ワイヤフレーム" +msgid "X-Ray" +msgstr "" + # AI Translated msgid "Realistic View" msgstr "リアルビュー" @@ -6550,9 +6553,6 @@ msgstr "3Dシーンで選択したオブジェクトの周りにアウトライ msgid "Preferences" msgstr "設定" -msgid "Open speed dial..." -msgstr "" - # AI Translated msgctxt "Menu" msgid "Edit" @@ -6561,6 +6561,9 @@ msgstr "編集" msgid "View" msgstr "表示" +msgid "Open Speed Dial" +msgstr "" + # AI Translated msgid "Preset Bundle" msgstr "プリセットバンドル" @@ -8373,10 +8376,6 @@ msgstr "サイドバーを展開" msgid "Collapse sidebar" msgstr "サイドバーを折りたたむ" -# AI Translated -msgid "Tab" -msgstr "Tab" - #, c-format, boost-format msgid "Loading file: %s" msgstr "ファイルを読込む: %s" @@ -9411,10 +9410,10 @@ msgstr "マルチデバイス管理" msgid "With this option enabled, you can send a task to multiple devices at the same time and manage multiple devices." msgstr "このオプションを有効にすると、複数のデバイスに同時にタスクを送信し、複数のデバイスを管理できます。" -msgid "Open the Speed Dial with the Space key" +msgid "Open the Speed Dial from the keyboard" msgstr "" -msgid "When enabled, pressing Space (with no other key held) opens the Speed Dial action search from any page." +msgid "When enabled, the Speed Dial keyboard shortcut (Space by default) opens the action search from any page." msgstr "" msgid "Recent actions" @@ -9553,6 +9552,15 @@ msgstr "マウス右ドラッグ" msgid "Set the action that dragging the right mouse button should perform." msgstr "マウス右ボタンのドラッグで実行する操作を設定します。" +msgid "Keyboard" +msgstr "" + +msgid "Keyboard shortcuts" +msgstr "" + +msgid "Choose the key for each action." +msgstr "" + msgid "Clear my choice on..." msgstr "選択をクリア..." @@ -9677,13 +9685,40 @@ msgstr "" "ビューポートのフレームレートを制限し、GPU負荷と消費電力を抑えます。\n" "0に設定するとフレームレートは無制限になります。" +msgid "Reuse the 3D scene while idle" +msgstr "" + +msgid "" +"Skips redrawing the 3D scene when only the mouse cursor moves over the viewport,\n" +"and reuses the previous frame's scene instead. Reduces GPU load.\n" +"Disable it if the viewport shows stale or missing contents.\n" +"\n" +"Takes effect immediately." +msgstr "" + +msgid "Skip unchanged frames" +msgstr "" + +msgid "" +"Skips drawing a frame altogether when it would be identical to the one already on screen.\n" +"Only applies to frames that reuse the 3D scene, so it needs Reuse the 3D scene while idle.\n" +"Disable it if a hover highlight, tooltip or animation stops updating.\n" +"\n" +"Takes effect immediately." +msgstr "" + # AI Translated msgid "Show FPS overlay" msgstr "FPSオーバーレイを表示" -# AI Translated -msgid "Displays current viewport FPS in the top-right corner." -msgstr "現在のビューポートのFPSを右上に表示します。" +msgid "Displays rendering counts in the top-right corner of the viewport." +msgstr "" + +msgid "FPS: frames presented to the screen per second." +msgstr "" + +msgid "3D: frames per second that redrew the 3D scene." +msgstr "" # AI Translated msgid "G-code Preview" @@ -10159,13 +10194,8 @@ msgstr "3MFを公開..." msgid "Select which settings to be published in the 3MF file" msgstr "3MFファイルで公開する設定を選択してください" -# AI Translated -msgid "Publish 3MF Wiki" -msgstr "3MF公開のWiki" - -# AI Translated -msgid "Publish 3MF Video Guide" -msgstr "3MF公開のビデオガイド" +msgid "Video Guide" +msgstr "" # AI Translated msgid "Mixed filament - published as a whole when \"Enable\" above is selected" @@ -10367,6 +10397,13 @@ msgstr "" msgid "No wiki page for this action" msgstr "" +msgid "Show details" +msgstr "詳細を表示" + +# AI Translated +msgid "Hide details" +msgstr "詳細を隠す" + #, c-format, boost-format msgid "\"%s\" is a Developer setting. Enable Developer mode to edit it?" msgstr "" @@ -12214,68 +12251,39 @@ msgstr "構成パッケージが前のコンフィグガイドに変更されま msgid "Configuration package changed" msgstr "構成パッケージが変更されました" -msgid "Toolbar" -msgstr "ツールバー" - -msgid "Objects list" -msgstr "オブジェクト一覧" - -msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" -msgstr "STL/STEP/3MF/OBJ/AMFファイルからジオメトリデータをインポート" - -msgid "Paste from clipboard" -msgstr "貼り付け" - -msgid "Show/Hide 3Dconnexion devices settings dialog" -msgstr "3Dconnexion設定を表示/非表示" - -msgid "Switch table page" -msgstr "テーブルページを切り替え" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Space" -msgstr "Space" - -msgid "Open speed dial" -msgstr "" - -msgid "Run a Speed Dial favourite (while the Speed Dial is open)" -msgstr "" - -msgid "Show keyboard shortcuts list" -msgstr "ショートカット一覧を表示" - -msgid "Global shortcuts" -msgstr "ショートカット" - msgid "Pan View" msgstr "移動" msgid "Rotate View" msgstr "回転" +#, c-format, boost-format +msgid "Use %s or %s, or a key that does not type a character." +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "Key" +msgstr "" + +msgid "Left mouse" +msgstr "" + +msgid "Available anywhere in the window, even while typing in a text field." +msgstr "" + +msgid "Run a speed dial favorite while the dial is open" +msgstr "" + # AI Translated -msgid "Middle mouse button" -msgstr "マウス中ボタン" +msgctxt "Keyboard Shortcut" +msgid "Tab" +msgstr "Tab" -msgid "Zoom View" -msgstr "ズーム" +msgid "Switch to the next main tab" +msgstr "" -msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." -msgstr "選択したオブジェクトまたはプロジェクト内のすべてのオブジェクトの方向を自動的に設定します。" - -msgid "Auto orients all objects on the active plate." -msgstr "現在のプレート上のすべてのオブジェクトの方向を自動的に設定します。" - -msgid "Collapse/Expand the sidebar" -msgstr "サイドバーを展開/隠す" - -msgid "Any arrow" -msgstr "任意の矢印キー" - -msgid "Movement in camera space" -msgstr "オブジェクト移動" +msgid "Available while the 3D view on the Prepare tab has focus." +msgstr "" msgid "Select a part" msgstr "パーツを選択" @@ -12286,127 +12294,29 @@ msgstr "複数のオブジェクトを選択" msgid "Select objects by rectangle" msgstr "矩形でオブジェクトを選択" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Up" -msgstr "↑" - -msgid "Move selection 10mm in positive Y direction" -msgstr "Y方向 10mm" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Down" -msgstr "↓" - -msgid "Move selection 10mm in negative Y direction" -msgstr "Y方向 -10mm" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Left" -msgstr "←" - -msgid "Move selection 10mm in negative X direction" -msgstr "X方向 -10mm" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Right" -msgstr "→" - -msgid "Move selection 10mm in positive X direction" -msgstr "X方向 10mm" +msgid "Keyboard 1-9: set filament for object/part" +msgstr "キー1-9: オブジェクト/パーツのフィラメントを設定" msgid "Movement step set to 1mm" msgstr "移動ステップを1mmに設定" -msgid "Keyboard 1-9: set filament for object/part" -msgstr "キー1-9: オブジェクト/パーツのフィラメントを設定" +msgid "Movement in camera space" +msgstr "オブジェクト移動" -msgid "Camera view - Default" -msgstr "デフォルト" +msgid "Middle mouse" +msgstr "" -msgid "Camera view - Top" -msgstr "トップ" +msgid "Right mouse" +msgstr "" -msgid "Camera view - Bottom" -msgstr "底面" +msgid "Zoom View" +msgstr "ズーム" -msgid "Camera view - Front" -msgstr "正面" +msgid "Painting" +msgstr "" -msgid "Camera view - Behind" -msgstr "背面" - -msgid "Camera Angle - Left side" -msgstr "左側" - -msgid "Camera Angle - Right side" -msgstr "右側" - -msgid "Select all objects" -msgstr "すべてのオブジェクトを選択" - -msgid "Gizmo move" -msgstr "移動" - -msgid "Gizmo rotate" -msgstr "回転" - -msgid "Gizmo scale" -msgstr "スケール" - -msgid "Gizmo place face on bed" -msgstr "底面選択" - -msgid "Gizmo cut" -msgstr "カット" - -msgid "Gizmo mesh boolean" -msgstr "メッシュブール" - -msgid "Gizmo FDM paint-on fuzzy skin" -msgstr "ギズモ FDMファジースキンペイント" - -msgid "Gizmo SLA support points" -msgstr "SLAサポートポイント" - -msgid "Gizmo FDM paint-on seam" -msgstr "継ぎ目ペイント" - -msgid "Gizmo text emboss/engrave" -msgstr "ギズモ・テキストのエンボス/エングレーブ" - -msgid "Gizmo measure" -msgstr "測る" - -msgid "Gizmo assemble" -msgstr "組立てる" - -msgid "Gizmo brim ears" -msgstr "ブリム" - -msgid "Zoom in" -msgstr "ズームイン" - -msgid "Zoom out" -msgstr "縮小" - -# AI Translated -msgid "Toggle printable for object/part" -msgstr "オブジェクト/パーツの印刷可否を切り替え" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Tab" -msgstr "Tab" - -msgid "Switch between Prepare/Preview" -msgstr "準備/プレビュー間の切り替え" - -msgid "Plater" -msgstr "準備" +msgid "Available while a painting gizmo is open: supports, seam, fuzzy skin or color painting." +msgstr "" msgid "Move: press to snap by 1mm" msgstr "1mm単位で移動" @@ -12417,15 +12327,19 @@ msgstr "サポート/色塗り: 半径のサイズ" msgid "Support/Color Painting: adjust section position" msgstr "サポート/色塗り: 断面の位置" -# AI Translated -msgid "Gizmo" -msgstr "ギズモ" +msgid "Objects list" +msgstr "オブジェクト一覧" + +msgid "Available while the object list has focus." +msgstr "" msgid "Set extruder number for the objects and parts" msgstr "オブジェクトとパーツ造形用の押出機番号を設定" -msgid "Delete objects, parts, modifiers" -msgstr "オブジェクト、パーツ、モディファイヤを削除" +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Space" +msgstr "Space" msgid "Select the object/part and press space to change the name" msgstr "オブジェクト/パーツを選択し、名前を変更します" @@ -12436,45 +12350,48 @@ msgstr "マウスクリック" msgid "Select the object/part and mouse click to change the name" msgstr "オブジェクト/パーツを選択し、名前を変更します" -msgid "Objects List" -msgstr "オブジェクト一覧" - -msgid "Vertical slider - Move active thumb Up" -msgstr "垂直スライダー" - -msgid "Vertical slider - Move active thumb Down" -msgstr "垂直スライダー" - -msgid "Horizontal slider - Move active thumb Left" -msgstr "水平スライダー (左)" - -msgid "Horizontal slider - Move active thumb Right" -msgstr "水平スライダー (右)" - -msgid "On/Off one layer mode of the vertical slider" -msgstr "垂直スライダーの1レイヤーモードのオン/オフ" - -msgid "On/Off G-code window" -msgstr "G-codeウィンドウのオン/オフ" +msgid "Available while the 3D view on the Preview tab has focus." +msgstr "" msgid "Move slider 5x faster" msgstr "5x" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Home" -msgstr "Home" +msgid "Scroll slider 5x faster" +msgstr "" -msgid "Horizontal slider - Move to start position" -msgstr "水平スライダー - 開始位置に移動" +msgid "Not customizable" +msgstr "" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "End" -msgstr "End" +#, c-format, boost-format +msgid "%s is assigned to %s. Reassign it to %s?" +msgstr "" -msgid "Horizontal slider - Move to last position" -msgstr "水平スライダー - 最後の位置に移動" +#, c-format, boost-format +msgid "The default %s is assigned to %s. Reassign it to %s?" +msgstr "" + +msgid "Global shortcuts also apply while typing." +msgstr "" + +msgid "A key that types a character cannot be a global shortcut." +msgstr "" + +msgid "Esc cancels, Enter confirms." +msgstr "" + +#, c-format, boost-format +msgid "" +"Press the new shortcut for\n" +"\"%s\"" +msgstr "" + +#, c-format, boost-format +msgid "Already used as a step of %s." +msgstr "" + +#, c-format, boost-format +msgid "Already assigned to %s. Press OK to reassign it." +msgstr "" msgid "Release Note" msgstr "リリースノート" @@ -17711,9 +17628,8 @@ msgstr "予熱ステップ数" msgid "Insert multiple preheat commands (e.g. M104.1). Only useful for Prusa XL. For other printers, please set it to 1." msgstr "複数の予熱コマンド (M104.1など) を挿入します。Prusa XLでのみ有効です。その他のプリンターでは1に設定してください。" -# AI Translated -msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." -msgstr "出力ファイルの先頭、他のどの内容よりも前に書き込まれるG-codeです。プリンターのファームウェアがファイル先頭の数行から読み取るメタデータ (推定印刷時間、フィラメント使用量など) を追加するのに便利です。{print_time_sec}や{used_filament_length}などのプレースホルダーに対応しています。" +msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_total_sec}, {print_time_day}, {print_time_hour}, {print_time_minute}, {print_time_sec} and {used_filament_length}." +msgstr "" msgid "Start G-code" msgstr "スタートG-code" @@ -19371,14 +19287,37 @@ msgstr "フィラメント使用量" msgid "Total length of filament used in the print." msgstr "プリントに使用されるフィラメントの全長。" -# AI Translated -msgid "Print time (seconds)" -msgstr "印刷時間 (秒)" +msgid "Print time (total seconds)" +msgstr "" # AI Translated msgid "Total estimated print time in seconds. Replaced with actual value during post-processing." msgstr "推定される総印刷時間 (秒) です。後処理時に実際の値に置き換えられます。" +msgid "Print time (days component)" +msgstr "" + +msgid "Estimated print time day component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (hours component)" +msgstr "" + +msgid "Estimated print time hour component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (minutes component)" +msgstr "" + +msgid "Estimated print time minute component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (seconds component)" +msgstr "" + +msgid "Estimated print time second component (normal mode). Replaced with actual value during post-processing." +msgstr "" + # AI Translated msgid "Filament length (meters)" msgstr "フィラメント長 (メートル)" @@ -21296,6 +21235,9 @@ msgstr "有効なセッションが検出されませんでした。3DPrinterOS msgid "Success!" msgstr "成功!" +msgid "Generate API Key" +msgstr "" + msgid "Are you sure to log out?" msgstr "本当にログアウトしますか？" @@ -22379,13 +22321,6 @@ msgstr "Bambuネットワークプラグインはクラウド機能、プリン msgid "Error: %s" msgstr "エラー: %s" -msgid "Show details" -msgstr "詳細を表示" - -# AI Translated -msgid "Hide details" -msgstr "詳細を隠す" - msgid "Version to install:" msgstr "インストールするバージョン:" @@ -25042,6 +24977,12 @@ msgstr "" msgid "No binding for that field" msgstr "" +msgid "Enter a number" +msgstr "" + +msgid "Not a number" +msgstr "" + msgid "Primitive" msgstr "" @@ -25054,6 +24995,217 @@ msgstr "" msgid "Clear All" msgstr "" +msgctxt "Keyboard Shortcut" +msgid "Ins" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Home" +msgstr "Home" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "End" +msgstr "End" + +msgctxt "Keyboard Shortcut" +msgid "PgUp" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "PgDn" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Left" +msgstr "←" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Right" +msgstr "→" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Up" +msgstr "↑" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Down" +msgstr "↓" + +msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" +msgstr "STL/STEP/3MF/OBJ/AMFファイルからジオメトリデータをインポート" + +msgid "Select all objects" +msgstr "すべてのオブジェクトを選択" + +msgid "Paste from clipboard" +msgstr "貼り付け" + +# AI Translated +msgid "Toggle printable for object/part" +msgstr "オブジェクト/パーツの印刷可否を切り替え" + +msgid "Move selection 10mm in negative X direction" +msgstr "X方向 -10mm" + +msgid "Move selection 10mm in positive X direction" +msgstr "X方向 10mm" + +msgid "Move selection 10mm in positive Y direction" +msgstr "Y方向 10mm" + +msgid "Move selection 10mm in negative Y direction" +msgstr "Y方向 -10mm" + +msgid "Rotate selection 45 degrees counterclockwise" +msgstr "" + +msgid "Rotate selection 45 degrees clockwise" +msgstr "" + +msgid "Gizmo move" +msgstr "移動" + +msgid "Gizmo rotate" +msgstr "回転" + +msgid "Gizmo scale" +msgstr "スケール" + +msgid "Gizmo place face on bed" +msgstr "底面選択" + +msgid "Gizmo cut" +msgstr "カット" + +msgid "Gizmo mesh boolean" +msgstr "メッシュブール" + +msgid "Gizmo FDM paint-on supports" +msgstr "" + +msgid "Gizmo FDM paint-on seam" +msgstr "継ぎ目ペイント" + +msgid "Gizmo FDM paint-on fuzzy skin" +msgstr "ギズモ FDMファジースキンペイント" + +msgid "Gizmo multi-material painting" +msgstr "" + +msgid "Gizmo text emboss/engrave" +msgstr "ギズモ・テキストのエンボス/エングレーブ" + +msgid "Gizmo measure" +msgstr "測る" + +msgid "Gizmo assemble" +msgstr "組立てる" + +msgid "Gizmo brim ears" +msgstr "ブリム" + +msgid "Vertical slider - Move active thumb Up" +msgstr "垂直スライダー" + +msgid "Vertical slider - Move active thumb Down" +msgstr "垂直スライダー" + +msgid "Horizontal slider - Move active thumb Left" +msgstr "水平スライダー (左)" + +msgid "Horizontal slider - Move active thumb Right" +msgstr "水平スライダー (右)" + +msgid "Horizontal slider - Move to start position" +msgstr "水平スライダー - 開始位置に移動" + +msgid "Horizontal slider - Move to last position" +msgstr "水平スライダー - 最後の位置に移動" + +msgid "Camera view - Default" +msgstr "デフォルト" + +msgid "Camera view - Top" +msgstr "トップ" + +msgid "Camera view - Bottom" +msgstr "底面" + +msgid "Camera view - Front" +msgstr "正面" + +msgid "Camera view - Behind" +msgstr "背面" + +msgid "Camera Angle - Left side" +msgstr "左側" + +msgid "Camera Angle - Right side" +msgstr "右側" + +msgid "Camera view - Current plate" +msgstr "" + +msgid "Zoom in" +msgstr "ズームイン" + +msgid "Zoom out" +msgstr "縮小" + +msgid "Show/Hide 3Dconnexion devices settings dialog" +msgstr "3Dconnexion設定を表示/非表示" + +msgid "Show/Hide wireframe" +msgstr "" + +msgid "On/Off G-code window" +msgstr "G-codeウィンドウのオン/オフ" + +msgid "On/Off one layer mode of the vertical slider" +msgstr "垂直スライダーの1レイヤーモードのオン/オフ" + +msgid "Switch between Prepare/Preview" +msgstr "準備/プレビュー間の切り替え" + +msgid "Collapse/Expand the sidebar" +msgstr "サイドバーを展開/隠す" + +msgid "Open the speed dial" +msgstr "" + +msgid "Reload the device page" +msgstr "" + +msgid "Show keyboard shortcuts list" +msgstr "ショートカット一覧を表示" + +msgid "Slicing and printing" +msgstr "" + +msgid "Editing" +msgstr "" + +msgid "Placement" +msgstr "" + +msgid "Gizmos" +msgstr "" + +msgid "Sliders" +msgstr "" + +msgid "Painting tools" +msgstr "" + +msgid "Application" +msgstr "" + # AI Translated #: resources/data/hints.ini: [hint:Precise wall] msgid "" @@ -25366,6 +25518,68 @@ msgstr "" "反りを避ける\n" "ABSのような反りやすい素材を印刷する場合、ヒートベッドの温度を適切に上げることで、反りが発生する確率を下げることができることをご存知ですか？" +# AI Translated +#~ msgid "Tab" +#~ msgstr "Tab" + +# AI Translated +#~ msgid "Displays current viewport FPS in the top-right corner." +#~ msgstr "現在のビューポートのFPSを右上に表示します。" + +# AI Translated +#~ msgid "Publish 3MF Wiki" +#~ msgstr "3MF公開のWiki" + +# AI Translated +#~ msgid "Publish 3MF Video Guide" +#~ msgstr "3MF公開のビデオガイド" + +#~ msgid "Toolbar" +#~ msgstr "ツールバー" + +#~ msgid "Switch table page" +#~ msgstr "テーブルページを切り替え" + +#~ msgid "Global shortcuts" +#~ msgstr "ショートカット" + +# AI Translated +#~ msgid "Middle mouse button" +#~ msgstr "マウス中ボタン" + +#~ msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." +#~ msgstr "選択したオブジェクトまたはプロジェクト内のすべてのオブジェクトの方向を自動的に設定します。" + +#~ msgid "Auto orients all objects on the active plate." +#~ msgstr "現在のプレート上のすべてのオブジェクトの方向を自動的に設定します。" + +#~ msgid "Any arrow" +#~ msgstr "任意の矢印キー" + +#~ msgid "Gizmo SLA support points" +#~ msgstr "SLAサポートポイント" + +#~ msgid "Plater" +#~ msgstr "準備" + +# AI Translated +#~ msgid "Gizmo" +#~ msgstr "ギズモ" + +#~ msgid "Delete objects, parts, modifiers" +#~ msgstr "オブジェクト、パーツ、モディファイヤを削除" + +#~ msgid "Objects List" +#~ msgstr "オブジェクト一覧" + +# AI Translated +#~ msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." +#~ msgstr "出力ファイルの先頭、他のどの内容よりも前に書き込まれるG-codeです。プリンターのファームウェアがファイル先頭の数行から読み取るメタデータ (推定印刷時間、フィラメント使用量など) を追加するのに便利です。{print_time_sec}や{used_filament_length}などのプレースホルダーに対応しています。" + +# AI Translated +#~ msgid "Print time (seconds)" +#~ msgstr "印刷時間 (秒)" + # AI Translated #~ msgid "Open actions speed dial" #~ msgstr "アクションスピードダイヤルを開く" diff --git a/localization/i18n/ko/OrcaSlicer_ko.po b/localization/i18n/ko/OrcaSlicer_ko.po index 1dda527e28..e05554dab8 100644 --- a/localization/i18n/ko/OrcaSlicer_ko.po +++ b/localization/i18n/ko/OrcaSlicer_ko.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-09-18 15:50+0800\n" +"POT-Creation-Date: 2026-09-22 17:02+0800\n" "PO-Revision-Date: 2025-06-02 17:12+0900\n" "Last-Translator: crwusiz \n" "Language-Team: \n" @@ -5949,12 +5949,15 @@ msgctxt "Camera View" msgid "Right" msgstr "오른쪽" -msgid "Add" -msgstr "추가" - msgid "Add plate" msgstr "플레이트 추가" +msgid "Split to objects" +msgstr "객체로 분할" + +msgid "Add" +msgstr "추가" + msgid "Auto orient all/selected objects" msgstr "모든/선택한 객체 자동 방향 지정" @@ -5967,9 +5970,6 @@ msgstr "모든 객체 정렬" msgid "Arrange objects on selected plates" msgstr "선택한 플레이트의 객체 정렬" -msgid "Split to objects" -msgstr "객체로 분할" - msgid "Assembly View" msgstr "조립 보기" @@ -6026,6 +6026,9 @@ msgstr "외곽선" msgid "Wireframe" msgstr "와이어프레임" +msgid "X-Ray" +msgstr "" + # AI Translated msgid "Realistic View" msgstr "사실적 보기" @@ -6563,9 +6566,6 @@ msgstr "3D 장면에서 선택한 객체 주변에 윤곽선 표시" msgid "Preferences" msgstr "기본 설정" -msgid "Open speed dial..." -msgstr "" - # AI Translated msgctxt "Menu" msgid "Edit" @@ -6574,6 +6574,9 @@ msgstr "편집" msgid "View" msgstr "시점" +msgid "Open Speed Dial" +msgstr "" + # AI Translated msgid "Preset Bundle" msgstr "사전 설정 번들" @@ -8387,10 +8390,6 @@ msgstr "사이드바 확장" msgid "Collapse sidebar" msgstr "사이드바 접기" -# AI Translated -msgid "Tab" -msgstr "탭" - #, c-format, boost-format msgid "Loading file: %s" msgstr "파일 로드 중: %s" @@ -9471,10 +9470,10 @@ msgstr "다중 장치 관리" msgid "With this option enabled, you can send a task to multiple devices at the same time and manage multiple devices." msgstr "활성화하면 여러 장치에 동시에 작업을 보내고 여러 장치를 관리할 수 있습니다." -msgid "Open the Speed Dial with the Space key" +msgid "Open the Speed Dial from the keyboard" msgstr "" -msgid "When enabled, pressing Space (with no other key held) opens the Speed Dial action search from any page." +msgid "When enabled, the Speed Dial keyboard shortcut (Space by default) opens the action search from any page." msgstr "" msgid "Recent actions" @@ -9622,6 +9621,15 @@ msgstr "마우스 오른쪽 버튼 드래그" msgid "Set the action that dragging the right mouse button should perform." msgstr "마우스 오른쪽 버튼을 드래그할 때 수행할 동작을 설정합니다." +msgid "Keyboard" +msgstr "" + +msgid "Keyboard shortcuts" +msgstr "" + +msgid "Choose the key for each action." +msgstr "" + # AI Translated msgid "Clear my choice on..." msgstr "다음 항목에 대한 선택 지우기..." @@ -9750,13 +9758,40 @@ msgstr "" "뷰포트의 프레임 속도를 제한하여 GPU 부하와 전력 사용량을 줄입니다.\n" "0으로 설정하면 프레임 속도가 무제한이 됩니다." +msgid "Reuse the 3D scene while idle" +msgstr "" + +msgid "" +"Skips redrawing the 3D scene when only the mouse cursor moves over the viewport,\n" +"and reuses the previous frame's scene instead. Reduces GPU load.\n" +"Disable it if the viewport shows stale or missing contents.\n" +"\n" +"Takes effect immediately." +msgstr "" + +msgid "Skip unchanged frames" +msgstr "" + +msgid "" +"Skips drawing a frame altogether when it would be identical to the one already on screen.\n" +"Only applies to frames that reuse the 3D scene, so it needs Reuse the 3D scene while idle.\n" +"Disable it if a hover highlight, tooltip or animation stops updating.\n" +"\n" +"Takes effect immediately." +msgstr "" + # AI Translated msgid "Show FPS overlay" msgstr "FPS 오버레이 표시" -# AI Translated -msgid "Displays current viewport FPS in the top-right corner." -msgstr "현재 뷰포트의 FPS를 오른쪽 위 모서리에 표시합니다." +msgid "Displays rendering counts in the top-right corner of the viewport." +msgstr "" + +msgid "FPS: frames presented to the screen per second." +msgstr "" + +msgid "3D: frames per second that redrew the 3D scene." +msgstr "" # AI Translated msgid "G-code Preview" @@ -10247,13 +10282,8 @@ msgstr "3MF 게시..." msgid "Select which settings to be published in the 3MF file" msgstr "3MF 파일에 게시할 설정을 선택하세요" -# AI Translated -msgid "Publish 3MF Wiki" -msgstr "3MF 게시 위키" - -# AI Translated -msgid "Publish 3MF Video Guide" -msgstr "3MF 게시 비디오 가이드" +msgid "Video Guide" +msgstr "" # AI Translated msgid "Mixed filament - published as a whole when \"Enable\" above is selected" @@ -10456,6 +10486,14 @@ msgstr "" msgid "No wiki page for this action" msgstr "" +# AI Translated +msgid "Show details" +msgstr "세부 정보 표시" + +# AI Translated +msgid "Hide details" +msgstr "세부 정보 숨기기" + #, c-format, boost-format msgid "\"%s\" is a Developer setting. Enable Developer mode to edit it?" msgstr "" @@ -12345,68 +12383,39 @@ msgstr "이전 구성 가이드에서 구성 패키지가 변경되었습니다" msgid "Configuration package changed" msgstr "구성 패키지가 변경됨" -msgid "Toolbar" -msgstr "도구 모음" - -msgid "Objects list" -msgstr "객체 목록" - -msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" -msgstr "STL/STEP/3MF/OBJ/AMF 파일에서 형상 데이터 가져오기" - -msgid "Paste from clipboard" -msgstr "클립보드에서 붙여넣기" - -msgid "Show/Hide 3Dconnexion devices settings dialog" -msgstr "3D 연결 장치 설정 표시/숨기기 대화상자" - -msgid "Switch table page" -msgstr "테이블 페이지 전환" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Space" -msgstr "Space" - -msgid "Open speed dial" -msgstr "" - -msgid "Run a Speed Dial favourite (while the Speed Dial is open)" -msgstr "" - -msgid "Show keyboard shortcuts list" -msgstr "키보드 단축키 목록 보기" - -msgid "Global shortcuts" -msgstr "전역 단축키" - msgid "Pan View" msgstr "보기 이동" msgid "Rotate View" msgstr "보기 회전" +#, c-format, boost-format +msgid "Use %s or %s, or a key that does not type a character." +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "Key" +msgstr "" + +msgid "Left mouse" +msgstr "" + +msgid "Available anywhere in the window, even while typing in a text field." +msgstr "" + +msgid "Run a speed dial favorite while the dial is open" +msgstr "" + # AI Translated -msgid "Middle mouse button" -msgstr "마우스 가운데 버튼" +msgctxt "Keyboard Shortcut" +msgid "Tab" +msgstr "Tab" -msgid "Zoom View" -msgstr "줌 뷰" +msgid "Switch to the next main tab" +msgstr "" -msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." -msgstr "선택한 객체 또는 모든 객체의 방향을 자동으로 조정합니다. 선택한 객체가 있는 경우 선택한 객체만 조정되고, 그렇지 않은 경우 프로젝트의 모든 객체가 조정됩니다." - -msgid "Auto orients all objects on the active plate." -msgstr "현재 플레이트에 있는 모든 객체의 방향을 자동으로 지정합니다." - -msgid "Collapse/Expand the sidebar" -msgstr "사이드바 접기/펼치기" - -msgid "Any arrow" -msgstr "모든 화살표" - -msgid "Movement in camera space" -msgstr "카메라 공간에서 이동" +msgid "Available while the 3D view on the Prepare tab has focus." +msgstr "" msgid "Select a part" msgstr "부품 선택" @@ -12417,129 +12426,30 @@ msgstr "여러 객체 선택" msgid "Select objects by rectangle" msgstr "사각형으로 객체 선택" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Up" -msgstr "↑" - -msgid "Move selection 10mm in positive Y direction" -msgstr "선택 항목을 +Y 방향으로 10mm 이동" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Down" -msgstr "↓" - -msgid "Move selection 10mm in negative Y direction" -msgstr "선택 항목을 -Y 방향으로 10mm 이동" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Left" -msgstr "←" - -msgid "Move selection 10mm in negative X direction" -msgstr "선택 항목을 -X 방향으로 10mm 이동" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Right" -msgstr "→" - -msgid "Move selection 10mm in positive X direction" -msgstr "선택 항목을 +X 방향으로 10mm 이동" +msgid "Keyboard 1-9: set filament for object/part" +msgstr "키보드 1-9: 객체/부품에 필라멘트 할당" # AI Translated msgid "Movement step set to 1mm" msgstr "이동 단위를 1mm로 설정" -msgid "Keyboard 1-9: set filament for object/part" -msgstr "키보드 1-9: 객체/부품에 필라멘트 할당" +msgid "Movement in camera space" +msgstr "카메라 공간에서 이동" -msgid "Camera view - Default" -msgstr "카메라 시점 - 기본" +msgid "Middle mouse" +msgstr "" -msgid "Camera view - Top" -msgstr "카메라 시점 - 위" +msgid "Right mouse" +msgstr "" -msgid "Camera view - Bottom" -msgstr "카메라 시점 - 아래" +msgid "Zoom View" +msgstr "줌 뷰" -msgid "Camera view - Front" -msgstr "카메라 시점 - 앞" +msgid "Painting" +msgstr "" -msgid "Camera view - Behind" -msgstr "카메라 시점 - 뒤" - -msgid "Camera Angle - Left side" -msgstr "카메라 각도 - 좌측" - -msgid "Camera Angle - Right side" -msgstr "카메라 각도 - 우측" - -msgid "Select all objects" -msgstr "모든 객체 선택" - -msgid "Gizmo move" -msgstr "변형도구 이동" - -msgid "Gizmo rotate" -msgstr "변형도구 회전" - -msgid "Gizmo scale" -msgstr "변형도구 배율" - -msgid "Gizmo place face on bed" -msgstr "변형도구 바닥면 선택" - -msgid "Gizmo cut" -msgstr "변형도구 잘라내기" - -msgid "Gizmo mesh boolean" -msgstr "변형도구 합집합/차집합/교집합" - -# AI Translated -msgid "Gizmo FDM paint-on fuzzy skin" -msgstr "변형도구 FDM 퍼지 스킨 칠하기" - -msgid "Gizmo SLA support points" -msgstr "변형도구 서포트 칠하기" - -msgid "Gizmo FDM paint-on seam" -msgstr "변형도구 재봉선 칠하기" - -msgid "Gizmo text emboss/engrave" -msgstr "변형도구 - 텍스트 엠보싱/인그레이빙" - -msgid "Gizmo measure" -msgstr "변형도구 측정" - -msgid "Gizmo assemble" -msgstr "변형도구 병합" - -msgid "Gizmo brim ears" -msgstr "변형도구 브림 귀" - -msgid "Zoom in" -msgstr "확대" - -msgid "Zoom out" -msgstr "축소" - -# AI Translated -msgid "Toggle printable for object/part" -msgstr "객체/부품의 출력 가능 여부 전환" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Tab" -msgstr "Tab" - -msgid "Switch between Prepare/Preview" -msgstr "준비 하기/미리 보기 전환" - -msgid "Plater" -msgstr "출력판" +msgid "Available while a painting gizmo is open: supports, seam, fuzzy skin or color painting." +msgstr "" msgid "Move: press to snap by 1mm" msgstr "이동: 눌러서 1mm씩 이동" @@ -12550,14 +12460,19 @@ msgstr "서포트/색상 칠하기: 펜 반경 조정" msgid "Support/Color Painting: adjust section position" msgstr "서포트/색상 칠하기: 단면 위치 조정" -msgid "Gizmo" -msgstr "변형도구" +msgid "Objects list" +msgstr "객체 목록" + +msgid "Available while the object list has focus." +msgstr "" msgid "Set extruder number for the objects and parts" msgstr "객체 및 부품에 대한 압출기 번호 설정" -msgid "Delete objects, parts, modifiers" -msgstr "객체, 부품, 수정자 삭제" +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Space" +msgstr "Space" msgid "Select the object/part and press space to change the name" msgstr "객체/부품을 선택하고 스페이스바를 눌러 이름을 변경합니다" @@ -12568,45 +12483,48 @@ msgstr "마우스 클릭" msgid "Select the object/part and mouse click to change the name" msgstr "객체/부품을 선택하고 마우스를 클릭하여 이름을 변경합니다" -msgid "Objects List" -msgstr "객체 목록" - -msgid "Vertical slider - Move active thumb Up" -msgstr "수직 슬라이더 - 활성 레이어 위로 이동" - -msgid "Vertical slider - Move active thumb Down" -msgstr "수직 슬라이더 - 활성 레이어 아래로 이동" - -msgid "Horizontal slider - Move active thumb Left" -msgstr "수평 슬라이더 - 활성 라인 왼쪽으로 이동" - -msgid "Horizontal slider - Move active thumb Right" -msgstr "수평 슬라이더 - 활성 라인 오른쪽으로 이동" - -msgid "On/Off one layer mode of the vertical slider" -msgstr "수직 슬라이더의 한 레이어 모드 켜기/끄기" - -msgid "On/Off G-code window" -msgstr "Gcode 창 켜기/끄기" +msgid "Available while the 3D view on the Preview tab has focus." +msgstr "" msgid "Move slider 5x faster" msgstr "슬라이더를 5배 빠르게 이동" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Home" -msgstr "Home" +msgid "Scroll slider 5x faster" +msgstr "" -msgid "Horizontal slider - Move to start position" -msgstr "수평 슬라이더 - 시작 위치로 이동" +msgid "Not customizable" +msgstr "" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "End" -msgstr "End" +#, c-format, boost-format +msgid "%s is assigned to %s. Reassign it to %s?" +msgstr "" -msgid "Horizontal slider - Move to last position" -msgstr "수평 슬라이더 - 마지막 위치로 이동" +#, c-format, boost-format +msgid "The default %s is assigned to %s. Reassign it to %s?" +msgstr "" + +msgid "Global shortcuts also apply while typing." +msgstr "" + +msgid "A key that types a character cannot be a global shortcut." +msgstr "" + +msgid "Esc cancels, Enter confirms." +msgstr "" + +#, c-format, boost-format +msgid "" +"Press the new shortcut for\n" +"\"%s\"" +msgstr "" + +#, c-format, boost-format +msgid "Already used as a step of %s." +msgstr "" + +#, c-format, boost-format +msgid "Already assigned to %s. Press OK to reassign it." +msgstr "" msgid "Release Note" msgstr "릴리스 노트" @@ -17678,9 +17596,8 @@ msgstr "예열 단계" msgid "Insert multiple preheat commands (e.g. M104.1). Only useful for Prusa XL. For other printers, please set it to 1." msgstr "여러 예열 명령(예: M104.1)을 삽입하세요. Prusa XL에만 유용합니다. 다른 프린터의 경우 1로 설정하세요." -# AI Translated -msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." -msgstr "출력 파일의 가장 앞부분, 다른 모든 내용보다 먼저 기록되는 G-code입니다. 프린터 펌웨어가 파일의 첫 줄에서 읽는 메타데이터(예: 예상 출력 시간, 필라멘트 사용량)를 추가하는 데 유용합니다. {print_time_sec}, {used_filament_length}와 같은 자리 표시자를 지원합니다." +msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_total_sec}, {print_time_day}, {print_time_hour}, {print_time_minute}, {print_time_sec} and {used_filament_length}." +msgstr "" msgid "Start G-code" msgstr "시작 Gcode" @@ -19257,14 +19174,37 @@ msgstr "사용된 필라멘트" msgid "Total length of filament used in the print." msgstr "출력에 사용된 필라멘트의 총 길이입니다." -# AI Translated -msgid "Print time (seconds)" -msgstr "출력 시간(초)" +msgid "Print time (total seconds)" +msgstr "" # AI Translated msgid "Total estimated print time in seconds. Replaced with actual value during post-processing." msgstr "초 단위의 총 예상 출력 시간입니다. 후처리 중에 실제 값으로 대체됩니다." +msgid "Print time (days component)" +msgstr "" + +msgid "Estimated print time day component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (hours component)" +msgstr "" + +msgid "Estimated print time hour component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (minutes component)" +msgstr "" + +msgid "Estimated print time minute component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (seconds component)" +msgstr "" + +msgid "Estimated print time second component (normal mode). Replaced with actual value during post-processing." +msgstr "" + # AI Translated msgid "Filament length (meters)" msgstr "필라멘트 길이(미터)" @@ -21172,6 +21112,9 @@ msgstr "유효한 세션이 감지되지 않았습니다. 3DPrinterOS에 로그 msgid "Success!" msgstr "성공!" +msgid "Generate API Key" +msgstr "" + msgid "Are you sure to log out?" msgstr "정말 로그아웃하시겠습니까?" @@ -22241,14 +22184,6 @@ msgstr "클라우드 기능, 프린터 검색, 원격 출력에는 Bambu 네트 msgid "Error: %s" msgstr "오류: %s" -# AI Translated -msgid "Show details" -msgstr "세부 정보 표시" - -# AI Translated -msgid "Hide details" -msgstr "세부 정보 숨기기" - # AI Translated msgid "Version to install:" msgstr "설치할 버전:" @@ -24918,6 +24853,12 @@ msgstr "" msgid "No binding for that field" msgstr "" +msgid "Enter a number" +msgstr "" + +msgid "Not a number" +msgstr "" + msgid "Primitive" msgstr "" @@ -24930,6 +24871,218 @@ msgstr "" msgid "Clear All" msgstr "" +msgctxt "Keyboard Shortcut" +msgid "Ins" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Home" +msgstr "Home" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "End" +msgstr "End" + +msgctxt "Keyboard Shortcut" +msgid "PgUp" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "PgDn" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Left" +msgstr "←" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Right" +msgstr "→" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Up" +msgstr "↑" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Down" +msgstr "↓" + +msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" +msgstr "STL/STEP/3MF/OBJ/AMF 파일에서 형상 데이터 가져오기" + +msgid "Select all objects" +msgstr "모든 객체 선택" + +msgid "Paste from clipboard" +msgstr "클립보드에서 붙여넣기" + +# AI Translated +msgid "Toggle printable for object/part" +msgstr "객체/부품의 출력 가능 여부 전환" + +msgid "Move selection 10mm in negative X direction" +msgstr "선택 항목을 -X 방향으로 10mm 이동" + +msgid "Move selection 10mm in positive X direction" +msgstr "선택 항목을 +X 방향으로 10mm 이동" + +msgid "Move selection 10mm in positive Y direction" +msgstr "선택 항목을 +Y 방향으로 10mm 이동" + +msgid "Move selection 10mm in negative Y direction" +msgstr "선택 항목을 -Y 방향으로 10mm 이동" + +msgid "Rotate selection 45 degrees counterclockwise" +msgstr "" + +msgid "Rotate selection 45 degrees clockwise" +msgstr "" + +msgid "Gizmo move" +msgstr "변형도구 이동" + +msgid "Gizmo rotate" +msgstr "변형도구 회전" + +msgid "Gizmo scale" +msgstr "변형도구 배율" + +msgid "Gizmo place face on bed" +msgstr "변형도구 바닥면 선택" + +msgid "Gizmo cut" +msgstr "변형도구 잘라내기" + +msgid "Gizmo mesh boolean" +msgstr "변형도구 합집합/차집합/교집합" + +msgid "Gizmo FDM paint-on supports" +msgstr "" + +msgid "Gizmo FDM paint-on seam" +msgstr "변형도구 재봉선 칠하기" + +# AI Translated +msgid "Gizmo FDM paint-on fuzzy skin" +msgstr "변형도구 FDM 퍼지 스킨 칠하기" + +msgid "Gizmo multi-material painting" +msgstr "" + +msgid "Gizmo text emboss/engrave" +msgstr "변형도구 - 텍스트 엠보싱/인그레이빙" + +msgid "Gizmo measure" +msgstr "변형도구 측정" + +msgid "Gizmo assemble" +msgstr "변형도구 병합" + +msgid "Gizmo brim ears" +msgstr "변형도구 브림 귀" + +msgid "Vertical slider - Move active thumb Up" +msgstr "수직 슬라이더 - 활성 레이어 위로 이동" + +msgid "Vertical slider - Move active thumb Down" +msgstr "수직 슬라이더 - 활성 레이어 아래로 이동" + +msgid "Horizontal slider - Move active thumb Left" +msgstr "수평 슬라이더 - 활성 라인 왼쪽으로 이동" + +msgid "Horizontal slider - Move active thumb Right" +msgstr "수평 슬라이더 - 활성 라인 오른쪽으로 이동" + +msgid "Horizontal slider - Move to start position" +msgstr "수평 슬라이더 - 시작 위치로 이동" + +msgid "Horizontal slider - Move to last position" +msgstr "수평 슬라이더 - 마지막 위치로 이동" + +msgid "Camera view - Default" +msgstr "카메라 시점 - 기본" + +msgid "Camera view - Top" +msgstr "카메라 시점 - 위" + +msgid "Camera view - Bottom" +msgstr "카메라 시점 - 아래" + +msgid "Camera view - Front" +msgstr "카메라 시점 - 앞" + +msgid "Camera view - Behind" +msgstr "카메라 시점 - 뒤" + +msgid "Camera Angle - Left side" +msgstr "카메라 각도 - 좌측" + +msgid "Camera Angle - Right side" +msgstr "카메라 각도 - 우측" + +msgid "Camera view - Current plate" +msgstr "" + +msgid "Zoom in" +msgstr "확대" + +msgid "Zoom out" +msgstr "축소" + +msgid "Show/Hide 3Dconnexion devices settings dialog" +msgstr "3D 연결 장치 설정 표시/숨기기 대화상자" + +msgid "Show/Hide wireframe" +msgstr "" + +msgid "On/Off G-code window" +msgstr "Gcode 창 켜기/끄기" + +msgid "On/Off one layer mode of the vertical slider" +msgstr "수직 슬라이더의 한 레이어 모드 켜기/끄기" + +msgid "Switch between Prepare/Preview" +msgstr "준비 하기/미리 보기 전환" + +msgid "Collapse/Expand the sidebar" +msgstr "사이드바 접기/펼치기" + +msgid "Open the speed dial" +msgstr "" + +msgid "Reload the device page" +msgstr "" + +msgid "Show keyboard shortcuts list" +msgstr "키보드 단축키 목록 보기" + +msgid "Slicing and printing" +msgstr "" + +msgid "Editing" +msgstr "" + +msgid "Placement" +msgstr "" + +msgid "Gizmos" +msgstr "" + +msgid "Sliders" +msgstr "" + +msgid "Painting tools" +msgstr "" + +msgid "Application" +msgstr "" + #: resources/data/hints.ini: [hint:Precise wall] msgid "" "Precise wall\n" @@ -25232,6 +25385,67 @@ msgstr "" "뒤틀림 방지\n" "ABS와 같이 뒤틀림이 발생하기 쉬운 소재를 출력할 때, 히트베드 온도를 적절하게 높이면 뒤틀림 가능성을 줄일 수 있다는 사실을 알고 계셨나요?" +# AI Translated +#~ msgid "Tab" +#~ msgstr "탭" + +# AI Translated +#~ msgid "Displays current viewport FPS in the top-right corner." +#~ msgstr "현재 뷰포트의 FPS를 오른쪽 위 모서리에 표시합니다." + +# AI Translated +#~ msgid "Publish 3MF Wiki" +#~ msgstr "3MF 게시 위키" + +# AI Translated +#~ msgid "Publish 3MF Video Guide" +#~ msgstr "3MF 게시 비디오 가이드" + +#~ msgid "Toolbar" +#~ msgstr "도구 모음" + +#~ msgid "Switch table page" +#~ msgstr "테이블 페이지 전환" + +#~ msgid "Global shortcuts" +#~ msgstr "전역 단축키" + +# AI Translated +#~ msgid "Middle mouse button" +#~ msgstr "마우스 가운데 버튼" + +#~ msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." +#~ msgstr "선택한 객체 또는 모든 객체의 방향을 자동으로 조정합니다. 선택한 객체가 있는 경우 선택한 객체만 조정되고, 그렇지 않은 경우 프로젝트의 모든 객체가 조정됩니다." + +#~ msgid "Auto orients all objects on the active plate." +#~ msgstr "현재 플레이트에 있는 모든 객체의 방향을 자동으로 지정합니다." + +#~ msgid "Any arrow" +#~ msgstr "모든 화살표" + +#~ msgid "Gizmo SLA support points" +#~ msgstr "변형도구 서포트 칠하기" + +#~ msgid "Plater" +#~ msgstr "출력판" + +#~ msgid "Gizmo" +#~ msgstr "변형도구" + +#~ msgid "Delete objects, parts, modifiers" +#~ msgstr "객체, 부품, 수정자 삭제" + +#~ msgid "Objects List" +#~ msgstr "객체 목록" + +# AI Translated +#~ msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." +#~ msgstr "출력 파일의 가장 앞부분, 다른 모든 내용보다 먼저 기록되는 G-code입니다. 프린터 펌웨어가 파일의 첫 줄에서 읽는 메타데이터(예: 예상 출력 시간, 필라멘트 사용량)를 추가하는 데 유용합니다. {print_time_sec}, {used_filament_length}와 같은 자리 표시자를 지원합니다." + +# AI Translated +#~ msgid "Print time (seconds)" +#~ msgstr "출력 시간(초)" + # AI Translated #~ msgid "Open actions speed dial" #~ msgstr "작업 스피드 다이얼 열기" diff --git a/localization/i18n/list.txt b/localization/i18n/list.txt index efe77a68fc..07072aaca9 100644 --- a/localization/i18n/list.txt +++ b/localization/i18n/list.txt @@ -302,3 +302,5 @@ src/slic3r/GUI/CAD/DesignPanel.cpp src/slic3r/GUI/CAD/SketchInlineEditor.cpp src/slic3r/GUI/Gizmos/GLGizmoPrimitive.cpp src/slic3r/GUI/Gizmos/GLGizmoSketch.cpp +src/slic3r/GUI/KeyChord.cpp +src/slic3r/GUI/Shortcuts.cpp diff --git a/localization/i18n/lt/OrcaSlicer_lt.po b/localization/i18n/lt/OrcaSlicer_lt.po index 6fe2933981..1765ad1cc1 100644 --- a/localization/i18n/lt/OrcaSlicer_lt.po +++ b/localization/i18n/lt/OrcaSlicer_lt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-09-18 15:50+0800\n" +"POT-Creation-Date: 2026-09-22 17:02+0800\n" "PO-Revision-Date: 2026-07-02 14:13+0300\n" "Last-Translator: Gintaras Kučinskas \n" "Language-Team: \n" @@ -5911,12 +5911,15 @@ msgctxt "Camera View" msgid "Right" msgstr "Dešinė" -msgid "Add" -msgstr "Įtraukti" - msgid "Add plate" msgstr "Įtraukti plokštę" +msgid "Split to objects" +msgstr "Padalinti į objektus" + +msgid "Add" +msgstr "Įtraukti" + msgid "Auto orient all/selected objects" msgstr "Automatiškai orientuoti visus / pasirinktus objektus" @@ -5929,9 +5932,6 @@ msgstr "Išdėstyti visus objektus" msgid "Arrange objects on selected plates" msgstr "Išdėstyti objektus pasirinktose plokštėse" -msgid "Split to objects" -msgstr "Padalinti į objektus" - msgid "Assembly View" msgstr "Surinkimo vaizdas" @@ -5986,6 +5986,9 @@ msgstr "Kontūras" msgid "Wireframe" msgstr "Rodyti karkasinį vaizdą" +msgid "X-Ray" +msgstr "" + msgid "Realistic View" msgstr "Realistiškas vaizdas" @@ -6525,9 +6528,6 @@ msgstr "Rodyti kontūrą aplink pasirinktą objektą 3D scenoje." msgid "Preferences" msgstr "Parinktys" -msgid "Open speed dial..." -msgstr "" - # AI Translated msgctxt "Menu" msgid "Edit" @@ -6536,6 +6536,9 @@ msgstr "Redaguoti" msgid "View" msgstr "Vaizdas" +msgid "Open Speed Dial" +msgstr "" + msgid "Preset Bundle" msgstr "Profilių rinkinys" @@ -8353,9 +8356,6 @@ msgstr "Išskleisti šoninę juostą" msgid "Collapse sidebar" msgstr "Sutraukti šoninę juostą" -msgid "Tab" -msgstr "Tab" - #, c-format, boost-format msgid "Loading file: %s" msgstr "Įkeliamas failas: %s" @@ -9369,10 +9369,10 @@ msgstr "Kelių įrenginių valdymas" msgid "With this option enabled, you can send a task to multiple devices at the same time and manage multiple devices." msgstr "Kai įjungta ši funkcija, jūs galite siųsti užduotį keliems įrenginiams vienu metu, taip apt kontroliuoti keletą įrenginių." -msgid "Open the Speed Dial with the Space key" +msgid "Open the Speed Dial from the keyboard" msgstr "" -msgid "When enabled, pressing Space (with no other key held) opens the Speed Dial action search from any page." +msgid "When enabled, the Speed Dial keyboard shortcut (Space by default) opens the action search from any page." msgstr "" msgid "Recent actions" @@ -9504,6 +9504,15 @@ msgstr "Vilkti dešiniuoju pelės mygtuku" msgid "Set the action that dragging the right mouse button should perform." msgstr "Nustatykite veiksmą, kuris turi būti atliktas, velkant dešinįjį pelės mygtuką." +msgid "Keyboard" +msgstr "" + +msgid "Keyboard shortcuts" +msgstr "" + +msgid "Choose the key for each action." +msgstr "" + msgid "Clear my choice on..." msgstr "Išvalyti mano pasirinkimą..." @@ -9612,11 +9621,39 @@ msgid "" "Set to 0 for unlimited frame rate." msgstr "Riboja vaizdo srities kadrų dažnį, kad sumažintų vaizdo plokštės (GPU) apkrovą ir energijos sąnaudas. Įveskite 0, jei kadrų dažnis neribojamas." +msgid "Reuse the 3D scene while idle" +msgstr "" + +msgid "" +"Skips redrawing the 3D scene when only the mouse cursor moves over the viewport,\n" +"and reuses the previous frame's scene instead. Reduces GPU load.\n" +"Disable it if the viewport shows stale or missing contents.\n" +"\n" +"Takes effect immediately." +msgstr "" + +msgid "Skip unchanged frames" +msgstr "" + +msgid "" +"Skips drawing a frame altogether when it would be identical to the one already on screen.\n" +"Only applies to frames that reuse the 3D scene, so it needs Reuse the 3D scene while idle.\n" +"Disable it if a hover highlight, tooltip or animation stops updating.\n" +"\n" +"Takes effect immediately." +msgstr "" + msgid "Show FPS overlay" msgstr "Rodyti KPS (FPS) indikatorių" -msgid "Displays current viewport FPS in the top-right corner." -msgstr "Viršutiniame dešiniajame kampe rodo esamą vaizdo srities kadrų dažnį." +msgid "Displays rendering counts in the top-right corner of the viewport." +msgstr "" + +msgid "FPS: frames presented to the screen per second." +msgstr "" + +msgid "3D: frames per second that redrew the 3D scene." +msgstr "" # AI Translated msgid "G-code Preview" @@ -10073,13 +10110,8 @@ msgstr "Talpinti 3MF..." msgid "Select which settings to be published in the 3MF file" msgstr "Pasirinkite, kuriuos parametrus talpinti 3MF faile" -# AI Translated -msgid "Publish 3MF Wiki" -msgstr "3MF talpinimo wiki" - -# AI Translated -msgid "Publish 3MF Video Guide" -msgstr "3MF talpinimo vaizdo vadovas" +msgid "Video Guide" +msgstr "" # AI Translated msgid "Mixed filament - published as a whole when \"Enable\" above is selected" @@ -10281,6 +10313,13 @@ msgstr "" msgid "No wiki page for this action" msgstr "" +msgid "Show details" +msgstr "Rodyti išsamiau" + +# AI Translated +msgid "Hide details" +msgstr "Slėpti išsamią informaciją" + #, c-format, boost-format msgid "\"%s\" is a Developer setting. Enable Developer mode to edit it?" msgstr "" @@ -12117,67 +12156,39 @@ msgstr "Konfigūracijos paketas buvo pakeistas ankstesniame konfigūravimo vadov msgid "Configuration package changed" msgstr "Pakeistas konfigūracijos paketas" -msgid "Toolbar" -msgstr "Įrankių juosta" - -msgid "Objects list" -msgstr "Objektų sąrašas" - -msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" -msgstr "Importuoti geometrijos duomenis iš STL/STEP/3MF/OBJ/AMF failų" - -msgid "Paste from clipboard" -msgstr "Įklijuoti iš mainų srities" - -msgid "Show/Hide 3Dconnexion devices settings dialog" -msgstr "Rodyti/slėpti 3DConnexion įrenginių nustatymų dialogo langą" - -msgid "Switch table page" -msgstr "Perjungti lentelės puslapį" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Space" -msgstr "Tarpas" - -msgid "Open speed dial" -msgstr "" - -msgid "Run a Speed Dial favourite (while the Speed Dial is open)" -msgstr "" - -msgid "Show keyboard shortcuts list" -msgstr "Rodyti sparčiųjų klavišų sąrašą" - -msgid "Global shortcuts" -msgstr "Bendrieji spartieji klavišai" - msgid "Pan View" msgstr "Vaizdo stūmimas (panoraminis vaizdas)" msgid "Rotate View" msgstr "Vaizdo pasukimas" -msgid "Middle mouse button" -msgstr "Vidurinis pelės mygtukas" +#, c-format, boost-format +msgid "Use %s or %s, or a key that does not type a character." +msgstr "" -msgid "Zoom View" -msgstr "Vaizdo mastelio keitimas (zoom)" +msgctxt "Keyboard Shortcut" +msgid "Key" +msgstr "" -msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." -msgstr "Automatiškai orientuoja pasirinktus objektus arba visus objektus. Jei yra pasirinkti objektai, orientuoja tik pasirinktus. Kitais atvejais orientuoja visus esamo projekto objektus." +msgid "Left mouse" +msgstr "" -msgid "Auto orients all objects on the active plate." -msgstr "Automatiškai orientuoja visus objektus aktyvioje plokštėje." +msgid "Available anywhere in the window, even while typing in a text field." +msgstr "" -msgid "Collapse/Expand the sidebar" -msgstr "Sutraukti / išskleisti šoninę juostą" +msgid "Run a speed dial favorite while the dial is open" +msgstr "" -msgid "Any arrow" -msgstr "Bet kuri rodyklė" +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Tab" +msgstr "Tab" -msgid "Movement in camera space" -msgstr "Judėjimas kameros erdvėje" +msgid "Switch to the next main tab" +msgstr "" + +msgid "Available while the 3D view on the Prepare tab has focus." +msgstr "" msgid "Select a part" msgstr "Pasirinkti dalį" @@ -12188,126 +12199,29 @@ msgstr "Pasirinkite kelis objektus" msgid "Select objects by rectangle" msgstr "Pasirinkti objektus stačiakampio rėmeliu" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Up" -msgstr "Rodyklė aukštyn" - -msgid "Move selection 10mm in positive Y direction" -msgstr "Perkelti pasirinkimą 10 mm teigiama Y kryptimi" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Down" -msgstr "Rodyklė žemyn" - -msgid "Move selection 10mm in negative Y direction" -msgstr "Perkelti pasirinkimą 10 mm neigiama Y kryptimi" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Left" -msgstr "Rodyklė kairėn" - -msgid "Move selection 10mm in negative X direction" -msgstr "Perkelti pasirinkimą 10 mm neigiama X kryptimi" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Right" -msgstr "Rodyklė dešinėn" - -msgid "Move selection 10mm in positive X direction" -msgstr "Perkelti pasirinkimą 10 mm teigiama X kryptimi" +msgid "Keyboard 1-9: set filament for object/part" +msgstr "Klaviatūra 1-9: nustatyti objekto/dalies giją" msgid "Movement step set to 1mm" msgstr "Judėjimo žingsnis nustatytas į 1 mm" -msgid "Keyboard 1-9: set filament for object/part" -msgstr "Klaviatūra 1-9: nustatyti objekto/dalies giją" +msgid "Movement in camera space" +msgstr "Judėjimas kameros erdvėje" -msgid "Camera view - Default" -msgstr "Kameros vaizdas - Numatytasis" +msgid "Middle mouse" +msgstr "" -msgid "Camera view - Top" -msgstr "Kameros vaizdas - Viršus" +msgid "Right mouse" +msgstr "" -msgid "Camera view - Bottom" -msgstr "Kameros vaizdas - Apačia" +msgid "Zoom View" +msgstr "Vaizdo mastelio keitimas (zoom)" -msgid "Camera view - Front" -msgstr "Kameros vaizdas - Priekis" +msgid "Painting" +msgstr "" -msgid "Camera view - Behind" -msgstr "Kameros vaizdas – iš galo" - -msgid "Camera Angle - Left side" -msgstr "Kameros kampas – iš kairės" - -msgid "Camera Angle - Right side" -msgstr "Kameros kampas – iš dešinės" - -msgid "Select all objects" -msgstr "Pasirinkti visus objektus" - -msgid "Gizmo move" -msgstr "Perkėlimo manipuliatorius" - -msgid "Gizmo rotate" -msgstr "Pasukimo manipuliatorius" - -msgid "Gizmo scale" -msgstr "Mastelio keitimo manipuliatorius" - -msgid "Gizmo place face on bed" -msgstr "Paviršiaus dėjimo ant pagrindo manipuliatorius" - -msgid "Gizmo cut" -msgstr "Pjovimo manipuliatorius" - -msgid "Gizmo mesh boolean" -msgstr "Loginių tinklelio veiksmų (Boolean) manipuliatorius" - -msgid "Gizmo FDM paint-on fuzzy skin" -msgstr "FDM užtepamo grublėto paviršiaus (fuzzy skin) manipuliatorius" - -msgid "Gizmo SLA support points" -msgstr "SLA atramų taškų manipuliatorius" - -msgid "Gizmo FDM paint-on seam" -msgstr "FDM užtepamos siūlės (seam) manipuliatorius" - -msgid "Gizmo text emboss/engrave" -msgstr "Teksto iškėlimo ir įspaudimo (emboss/engrave) manipuliatorius" - -msgid "Gizmo measure" -msgstr "Matavimo manipuliatorius" - -msgid "Gizmo assemble" -msgstr "Surinkimo manipuliatorius" - -msgid "Gizmo brim ears" -msgstr "Krašto „auselių“ (brim ears) manipuliatorius" - -msgid "Zoom in" -msgstr "Padidinti" - -msgid "Zoom out" -msgstr "Nutolinti" - -msgid "Toggle printable for object/part" -msgstr "Perjungti objekto / dalies spausdinimą" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Tab" -msgstr "Tab" - -msgid "Switch between Prepare/Preview" -msgstr "Perjungimas tarp Paruošti / Peržiūrėti" - -msgid "Plater" -msgstr "Plokštė" +msgid "Available while a painting gizmo is open: supports, seam, fuzzy skin or color painting." +msgstr "" msgid "Move: press to snap by 1mm" msgstr "Perkėlimas: paspauskite, kad pritrauktumėte kas 1 mm" @@ -12318,14 +12232,19 @@ msgstr "Atramų ir spalvų užtepimas: keisti teptuko spindulį" msgid "Support/Color Painting: adjust section position" msgstr "Atramų ir spalvų užtepimas: keisti pjūvio padėtį" -msgid "Gizmo" -msgstr "Manipuliatorius" +msgid "Objects list" +msgstr "Objektų sąrašas" + +msgid "Available while the object list has focus." +msgstr "" msgid "Set extruder number for the objects and parts" msgstr "Nustatykite ekstruderio numerį objektams ir dalims" -msgid "Delete objects, parts, modifiers" -msgstr "Ištrinti objektus, dalis, modifikatorius" +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Space" +msgstr "Tarpas" msgid "Select the object/part and press space to change the name" msgstr "Pasirinkite objektą ir (arba) dalį ir paspauskite tarpo klavišą, kad pakeistumėte pavadinimą" @@ -12336,45 +12255,48 @@ msgstr "Pelės paspaudimas" msgid "Select the object/part and mouse click to change the name" msgstr "Pasirinkite objektą/dalį ir spustelėkite pele, kad pakeistumėte pavadinimą" -msgid "Objects List" -msgstr "Objektų sąrašas" - -msgid "Vertical slider - Move active thumb Up" -msgstr "Vertikalus slankiklis – kelti aktyvų žymeklį aukštyn" - -msgid "Vertical slider - Move active thumb Down" -msgstr "Vertikalus slankiklis – nuleisti aktyvų žymeklį žemyn" - -msgid "Horizontal slider - Move active thumb Left" -msgstr "Horizontalus slankiklis – stumti aktyvų žymeklį kairėn" - -msgid "Horizontal slider - Move active thumb Right" -msgstr "Horizontalus slankiklis – stumti aktyvų žymeklį dešinėn" - -msgid "On/Off one layer mode of the vertical slider" -msgstr "Vertikalaus slankiklio vieno sluoksnio režimas įjungimas / išjungimas" - -msgid "On/Off G-code window" -msgstr "G-kodo lango įjungimas / išjungimas" +msgid "Available while the 3D view on the Preview tab has focus." +msgstr "" msgid "Move slider 5x faster" msgstr "Judinkite slankiklį 5 kartus greičiau" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Home" -msgstr "Home" +msgid "Scroll slider 5x faster" +msgstr "" -msgid "Horizontal slider - Move to start position" -msgstr "Horizontalus slankiklis – perkelti į pradinę padėtį" +msgid "Not customizable" +msgstr "" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "End" -msgstr "End" +#, c-format, boost-format +msgid "%s is assigned to %s. Reassign it to %s?" +msgstr "" -msgid "Horizontal slider - Move to last position" -msgstr "Horizontalus slankiklis – perkelti į paskutinę padėtį" +#, c-format, boost-format +msgid "The default %s is assigned to %s. Reassign it to %s?" +msgstr "" + +msgid "Global shortcuts also apply while typing." +msgstr "" + +msgid "A key that types a character cannot be a global shortcut." +msgstr "" + +msgid "Esc cancels, Enter confirms." +msgstr "" + +#, c-format, boost-format +msgid "" +"Press the new shortcut for\n" +"\"%s\"" +msgstr "" + +#, c-format, boost-format +msgid "Already used as a step of %s." +msgstr "" + +#, c-format, boost-format +msgid "Already assigned to %s. Press OK to reassign it." +msgstr "" msgid "Release Note" msgstr "Versijos pastabos (Release notes)" @@ -17222,8 +17144,8 @@ msgstr "Įkaitinimo etapai" msgid "Insert multiple preheat commands (e.g. M104.1). Only useful for Prusa XL. For other printers, please set it to 1." msgstr "Įterpkite kelias įkaitinimo komandas (pvz., M104.1). Naudinga tik „Prusa XL“. Kitiems spausdintuvams nustatykite 1." -msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." -msgstr "G-kodas, įrašomas pačiame išvesties failo viršuje, prieš bet kokį kitą turinį. Naudingas įterpti metaduomenims, kuriuos spausdintuvo aparatinė programinė įranga nuskaito iš pirmųjų failo eilučių (pvz., numatomą spausdinimo laiką, gijos sąnaudas). Palaiko kintamuosius (placeholders), tokius kaip {print_time_sec} ir {used_filament_length}." +msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_total_sec}, {print_time_day}, {print_time_hour}, {print_time_minute}, {print_time_sec} and {used_filament_length}." +msgstr "" msgid "Start G-code" msgstr "Pradžios G-kodas" @@ -18765,12 +18687,36 @@ msgstr "Naudota gija" msgid "Total length of filament used in the print." msgstr "Bendras viso spausdinimo metu sunaudotos gijos ilgis." -msgid "Print time (seconds)" -msgstr "Spausdinimo laikas (sekundėmis)" +msgid "Print time (total seconds)" +msgstr "" msgid "Total estimated print time in seconds. Replaced with actual value during post-processing." msgstr "Bendras numatomas spausdinimo laikas sekundėmis. Papildomo apdorojimo (post-processing) metu pakeičiama faktine reikšme." +msgid "Print time (days component)" +msgstr "" + +msgid "Estimated print time day component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (hours component)" +msgstr "" + +msgid "Estimated print time hour component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (minutes component)" +msgstr "" + +msgid "Estimated print time minute component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (seconds component)" +msgstr "" + +msgid "Estimated print time second component (normal mode). Replaced with actual value during post-processing." +msgstr "" + msgid "Filament length (meters)" msgstr "Gijos ilgis (metrais)" @@ -20612,6 +20558,9 @@ msgstr "Nerasta galiojančios sesijos. Prisijungti prie „3DPrinterOS“?" msgid "Success!" msgstr "Pavyko!" +msgid "Generate API Key" +msgstr "" + msgid "Are you sure to log out?" msgstr "Ar tikrai norite atsijungti?" @@ -21567,13 +21516,6 @@ msgstr "„Bambu“ tinklo papildinys yra būtinas, kad veiktų debesijos funkci msgid "Error: %s" msgstr "Klaida: %s" -msgid "Show details" -msgstr "Rodyti išsamiau" - -# AI Translated -msgid "Hide details" -msgstr "Slėpti išsamią informaciją" - msgid "Version to install:" msgstr "Diegiama versija:" @@ -24202,6 +24144,12 @@ msgstr "" msgid "No binding for that field" msgstr "" +msgid "Enter a number" +msgstr "" + +msgid "Not a number" +msgstr "" + msgid "Primitive" msgstr "" @@ -24214,6 +24162,216 @@ msgstr "" msgid "Clear All" msgstr "" +msgctxt "Keyboard Shortcut" +msgid "Ins" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Home" +msgstr "Home" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "End" +msgstr "End" + +msgctxt "Keyboard Shortcut" +msgid "PgUp" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "PgDn" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Left" +msgstr "Rodyklė kairėn" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Right" +msgstr "Rodyklė dešinėn" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Up" +msgstr "Rodyklė aukštyn" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Down" +msgstr "Rodyklė žemyn" + +msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" +msgstr "Importuoti geometrijos duomenis iš STL/STEP/3MF/OBJ/AMF failų" + +msgid "Select all objects" +msgstr "Pasirinkti visus objektus" + +msgid "Paste from clipboard" +msgstr "Įklijuoti iš mainų srities" + +msgid "Toggle printable for object/part" +msgstr "Perjungti objekto / dalies spausdinimą" + +msgid "Move selection 10mm in negative X direction" +msgstr "Perkelti pasirinkimą 10 mm neigiama X kryptimi" + +msgid "Move selection 10mm in positive X direction" +msgstr "Perkelti pasirinkimą 10 mm teigiama X kryptimi" + +msgid "Move selection 10mm in positive Y direction" +msgstr "Perkelti pasirinkimą 10 mm teigiama Y kryptimi" + +msgid "Move selection 10mm in negative Y direction" +msgstr "Perkelti pasirinkimą 10 mm neigiama Y kryptimi" + +msgid "Rotate selection 45 degrees counterclockwise" +msgstr "" + +msgid "Rotate selection 45 degrees clockwise" +msgstr "" + +msgid "Gizmo move" +msgstr "Perkėlimo manipuliatorius" + +msgid "Gizmo rotate" +msgstr "Pasukimo manipuliatorius" + +msgid "Gizmo scale" +msgstr "Mastelio keitimo manipuliatorius" + +msgid "Gizmo place face on bed" +msgstr "Paviršiaus dėjimo ant pagrindo manipuliatorius" + +msgid "Gizmo cut" +msgstr "Pjovimo manipuliatorius" + +msgid "Gizmo mesh boolean" +msgstr "Loginių tinklelio veiksmų (Boolean) manipuliatorius" + +msgid "Gizmo FDM paint-on supports" +msgstr "" + +msgid "Gizmo FDM paint-on seam" +msgstr "FDM užtepamos siūlės (seam) manipuliatorius" + +msgid "Gizmo FDM paint-on fuzzy skin" +msgstr "FDM užtepamo grublėto paviršiaus (fuzzy skin) manipuliatorius" + +msgid "Gizmo multi-material painting" +msgstr "" + +msgid "Gizmo text emboss/engrave" +msgstr "Teksto iškėlimo ir įspaudimo (emboss/engrave) manipuliatorius" + +msgid "Gizmo measure" +msgstr "Matavimo manipuliatorius" + +msgid "Gizmo assemble" +msgstr "Surinkimo manipuliatorius" + +msgid "Gizmo brim ears" +msgstr "Krašto „auselių“ (brim ears) manipuliatorius" + +msgid "Vertical slider - Move active thumb Up" +msgstr "Vertikalus slankiklis – kelti aktyvų žymeklį aukštyn" + +msgid "Vertical slider - Move active thumb Down" +msgstr "Vertikalus slankiklis – nuleisti aktyvų žymeklį žemyn" + +msgid "Horizontal slider - Move active thumb Left" +msgstr "Horizontalus slankiklis – stumti aktyvų žymeklį kairėn" + +msgid "Horizontal slider - Move active thumb Right" +msgstr "Horizontalus slankiklis – stumti aktyvų žymeklį dešinėn" + +msgid "Horizontal slider - Move to start position" +msgstr "Horizontalus slankiklis – perkelti į pradinę padėtį" + +msgid "Horizontal slider - Move to last position" +msgstr "Horizontalus slankiklis – perkelti į paskutinę padėtį" + +msgid "Camera view - Default" +msgstr "Kameros vaizdas - Numatytasis" + +msgid "Camera view - Top" +msgstr "Kameros vaizdas - Viršus" + +msgid "Camera view - Bottom" +msgstr "Kameros vaizdas - Apačia" + +msgid "Camera view - Front" +msgstr "Kameros vaizdas - Priekis" + +msgid "Camera view - Behind" +msgstr "Kameros vaizdas – iš galo" + +msgid "Camera Angle - Left side" +msgstr "Kameros kampas – iš kairės" + +msgid "Camera Angle - Right side" +msgstr "Kameros kampas – iš dešinės" + +msgid "Camera view - Current plate" +msgstr "" + +msgid "Zoom in" +msgstr "Padidinti" + +msgid "Zoom out" +msgstr "Nutolinti" + +msgid "Show/Hide 3Dconnexion devices settings dialog" +msgstr "Rodyti/slėpti 3DConnexion įrenginių nustatymų dialogo langą" + +msgid "Show/Hide wireframe" +msgstr "" + +msgid "On/Off G-code window" +msgstr "G-kodo lango įjungimas / išjungimas" + +msgid "On/Off one layer mode of the vertical slider" +msgstr "Vertikalaus slankiklio vieno sluoksnio režimas įjungimas / išjungimas" + +msgid "Switch between Prepare/Preview" +msgstr "Perjungimas tarp Paruošti / Peržiūrėti" + +msgid "Collapse/Expand the sidebar" +msgstr "Sutraukti / išskleisti šoninę juostą" + +msgid "Open the speed dial" +msgstr "" + +msgid "Reload the device page" +msgstr "" + +msgid "Show keyboard shortcuts list" +msgstr "Rodyti sparčiųjų klavišų sąrašą" + +msgid "Slicing and printing" +msgstr "" + +msgid "Editing" +msgstr "" + +msgid "Placement" +msgstr "" + +msgid "Gizmos" +msgstr "" + +msgid "Sliders" +msgstr "" + +msgid "Painting tools" +msgstr "" + +msgid "Application" +msgstr "" + #: resources/data/hints.ini: [hint:Precise wall] msgid "" "Precise wall\n" @@ -24514,6 +24672,62 @@ msgstr "" "Venkite deformacijų (warping)\n" "Ar žinojote, kad spausdinant medžiagas, kurios yra linkusios trauktis ir riestis (pvz., ABS), tinkamas kaitinamojo pagrindo temperatūros padidinimas gali sumažinti deformacijų (warping) tikimybę?" +#~ msgid "Tab" +#~ msgstr "Tab" + +#~ msgid "Displays current viewport FPS in the top-right corner." +#~ msgstr "Viršutiniame dešiniajame kampe rodo esamą vaizdo srities kadrų dažnį." + +# AI Translated +#~ msgid "Publish 3MF Wiki" +#~ msgstr "3MF talpinimo wiki" + +# AI Translated +#~ msgid "Publish 3MF Video Guide" +#~ msgstr "3MF talpinimo vaizdo vadovas" + +#~ msgid "Toolbar" +#~ msgstr "Įrankių juosta" + +#~ msgid "Switch table page" +#~ msgstr "Perjungti lentelės puslapį" + +#~ msgid "Global shortcuts" +#~ msgstr "Bendrieji spartieji klavišai" + +#~ msgid "Middle mouse button" +#~ msgstr "Vidurinis pelės mygtukas" + +#~ msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." +#~ msgstr "Automatiškai orientuoja pasirinktus objektus arba visus objektus. Jei yra pasirinkti objektai, orientuoja tik pasirinktus. Kitais atvejais orientuoja visus esamo projekto objektus." + +#~ msgid "Auto orients all objects on the active plate." +#~ msgstr "Automatiškai orientuoja visus objektus aktyvioje plokštėje." + +#~ msgid "Any arrow" +#~ msgstr "Bet kuri rodyklė" + +#~ msgid "Gizmo SLA support points" +#~ msgstr "SLA atramų taškų manipuliatorius" + +#~ msgid "Plater" +#~ msgstr "Plokštė" + +#~ msgid "Gizmo" +#~ msgstr "Manipuliatorius" + +#~ msgid "Delete objects, parts, modifiers" +#~ msgstr "Ištrinti objektus, dalis, modifikatorius" + +#~ msgid "Objects List" +#~ msgstr "Objektų sąrašas" + +#~ msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." +#~ msgstr "G-kodas, įrašomas pačiame išvesties failo viršuje, prieš bet kokį kitą turinį. Naudingas įterpti metaduomenims, kuriuos spausdintuvo aparatinė programinė įranga nuskaito iš pirmųjų failo eilučių (pvz., numatomą spausdinimo laiką, gijos sąnaudas). Palaiko kintamuosius (placeholders), tokius kaip {print_time_sec} ir {used_filament_length}." + +#~ msgid "Print time (seconds)" +#~ msgstr "Spausdinimo laikas (sekundėmis)" + # AI Translated #~ msgid "Open actions speed dial" #~ msgstr "Atidaryti veiksmų greitosios prieigos meniu" diff --git a/localization/i18n/nl/OrcaSlicer_nl.po b/localization/i18n/nl/OrcaSlicer_nl.po index 685be64863..82486003ef 100644 --- a/localization/i18n/nl/OrcaSlicer_nl.po +++ b/localization/i18n/nl/OrcaSlicer_nl.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-09-18 15:50+0800\n" +"POT-Creation-Date: 2026-09-22 17:02+0800\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -6454,12 +6454,15 @@ msgctxt "Camera View" msgid "Right" msgstr "Rechts" -msgid "Add" -msgstr "Toevoegen" - msgid "Add plate" msgstr "Printbed toevoegen" +msgid "Split to objects" +msgstr "Opsplitsen in objecten" + +msgid "Add" +msgstr "Toevoegen" + msgid "Auto orient all/selected objects" msgstr "Automatisch oriënteren alle/geselecteerde objecten" @@ -6472,9 +6475,6 @@ msgstr "Alle objecten rangschikken" msgid "Arrange objects on selected plates" msgstr "Rangschikt de objecten op de gelecteerde printbedden" -msgid "Split to objects" -msgstr "Opsplitsen in objecten" - msgid "Assembly View" msgstr "Montageweergave" @@ -6533,6 +6533,9 @@ msgstr "Omtrek" msgid "Wireframe" msgstr "Draadmodel" +msgid "X-Ray" +msgstr "" + # AI Translated msgid "Realistic View" msgstr "Realistische weergave" @@ -7119,9 +7122,6 @@ msgstr "Toon een omtrek rond het geselecteerde object in de 3D-scène." msgid "Preferences" msgstr "Voorkeuren" -msgid "Open speed dial..." -msgstr "" - # AI Translated msgctxt "Menu" msgid "Edit" @@ -7130,6 +7130,9 @@ msgstr "Bewerken" msgid "View" msgstr "Weergave" +msgid "Open Speed Dial" +msgstr "" + # AI Translated msgid "Preset Bundle" msgstr "Voorinstellingenbundel" @@ -9088,10 +9091,6 @@ msgstr "Zijbalk uitklappen" msgid "Collapse sidebar" msgstr "Zijbalk inklappen" -# AI Translated -msgid "Tab" -msgstr "Tab" - #, c-format, boost-format msgid "Loading file: %s" msgstr "Bestand laden: %s" @@ -10218,10 +10217,10 @@ msgstr "Beheer van meerdere apparaten" msgid "With this option enabled, you can send a task to multiple devices at the same time and manage multiple devices." msgstr "Met deze optie ingeschakeld kunt u een taak tegelijkertijd naar meerdere apparaten sturen en meerdere apparaten beheren." -msgid "Open the Speed Dial with the Space key" +msgid "Open the Speed Dial from the keyboard" msgstr "" -msgid "When enabled, pressing Space (with no other key held) opens the Speed Dial action search from any page." +msgid "When enabled, the Speed Dial keyboard shortcut (Space by default) opens the action search from any page." msgstr "" msgid "Recent actions" @@ -10371,6 +10370,15 @@ msgstr "Slepen met rechtermuisknop" msgid "Set the action that dragging the right mouse button should perform." msgstr "Stel de actie in die het slepen met de rechtermuisknop moet uitvoeren." +msgid "Keyboard" +msgstr "" + +msgid "Keyboard shortcuts" +msgstr "" + +msgid "Choose the key for each action." +msgstr "" + # AI Translated msgid "Clear my choice on..." msgstr "Mijn keuze wissen voor..." @@ -10500,13 +10508,40 @@ msgstr "" "Beperkt de framesnelheid van de viewport om de GPU-belasting en het stroomverbruik te verlagen.\n" "Stel in op 0 voor een onbeperkte framesnelheid." +msgid "Reuse the 3D scene while idle" +msgstr "" + +msgid "" +"Skips redrawing the 3D scene when only the mouse cursor moves over the viewport,\n" +"and reuses the previous frame's scene instead. Reduces GPU load.\n" +"Disable it if the viewport shows stale or missing contents.\n" +"\n" +"Takes effect immediately." +msgstr "" + +msgid "Skip unchanged frames" +msgstr "" + +msgid "" +"Skips drawing a frame altogether when it would be identical to the one already on screen.\n" +"Only applies to frames that reuse the 3D scene, so it needs Reuse the 3D scene while idle.\n" +"Disable it if a hover highlight, tooltip or animation stops updating.\n" +"\n" +"Takes effect immediately." +msgstr "" + # AI Translated msgid "Show FPS overlay" msgstr "FPS-overlay tonen" -# AI Translated -msgid "Displays current viewport FPS in the top-right corner." -msgstr "Toont de huidige FPS van de viewport in de rechterbovenhoek." +msgid "Displays rendering counts in the top-right corner of the viewport." +msgstr "" + +msgid "FPS: frames presented to the screen per second." +msgstr "" + +msgid "3D: frames per second that redrew the 3D scene." +msgstr "" # AI Translated msgid "G-code Preview" @@ -11006,13 +11041,8 @@ msgstr "3MF publiceren..." msgid "Select which settings to be published in the 3MF file" msgstr "Selecteer welke instellingen in het 3MF-bestand worden gepubliceerd" -# AI Translated -msgid "Publish 3MF Wiki" -msgstr "Wiki over 3MF publiceren" - -# AI Translated -msgid "Publish 3MF Video Guide" -msgstr "Videohandleiding over 3MF publiceren" +msgid "Video Guide" +msgstr "" # AI Translated msgid "Mixed filament - published as a whole when \"Enable\" above is selected" @@ -11215,6 +11245,14 @@ msgstr "" msgid "No wiki page for this action" msgstr "" +# AI Translated +msgid "Show details" +msgstr "Details tonen" + +# AI Translated +msgid "Hide details" +msgstr "Details verbergen" + #, c-format, boost-format msgid "\"%s\" is a Developer setting. Enable Developer mode to edit it?" msgstr "" @@ -13238,71 +13276,39 @@ msgstr "Het configuratiebestand is aangepast in de vorige Config Guide" msgid "Configuration package changed" msgstr "Het configuratiepakket is gewijzigd" -msgid "Toolbar" -msgstr "Gereedschapsbalk" - -msgid "Objects list" -msgstr "Object lijst" - -# AI Translated -msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" -msgstr "Importeer geometriegegevens uit STL-/STEP-/3MF-/OBJ-/AMF-bestanden" - -msgid "Paste from clipboard" -msgstr "Plakken vanuit klembord" - -msgid "Show/Hide 3Dconnexion devices settings dialog" -msgstr "Dialoogvenster met instellingen voor 3Dconnexion-apparaten weergeven/verbergen" - -msgid "Switch table page" -msgstr "Schakeltabel pagina" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Space" -msgstr "Spatie" - -msgid "Open speed dial" -msgstr "" - -msgid "Run a Speed Dial favourite (while the Speed Dial is open)" -msgstr "" - -msgid "Show keyboard shortcuts list" -msgstr "Toon lijst met sneltoetsen" - -msgid "Global shortcuts" -msgstr "Globale snelkoppelingen" - msgid "Pan View" msgstr "Panweergave" msgid "Rotate View" msgstr "Weergave roteren" -# AI Translated -msgid "Middle mouse button" -msgstr "Middelste muisknop" +#, c-format, boost-format +msgid "Use %s or %s, or a key that does not type a character." +msgstr "" -msgid "Zoom View" -msgstr "Zoom weergave" +msgctxt "Keyboard Shortcut" +msgid "Key" +msgstr "" -msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." -msgstr "Oriënteert automatisch geselecteerde objecten of alle objecten. Als er geselecteerde objecten zijn, oriënteert het alleen de geselecteerde objecten. Anders worden alle objecten van het project georiënteerd." +msgid "Left mouse" +msgstr "" + +msgid "Available anywhere in the window, even while typing in a text field." +msgstr "" + +msgid "Run a speed dial favorite while the dial is open" +msgstr "" # AI Translated -msgid "Auto orients all objects on the active plate." -msgstr "Oriënteert alle objecten op het actieve printbed automatisch." +msgctxt "Keyboard Shortcut" +msgid "Tab" +msgstr "Tab" -msgid "Collapse/Expand the sidebar" -msgstr "De menubalk in-/uitschuiven" +msgid "Switch to the next main tab" +msgstr "" -# AI Translated -msgid "Any arrow" -msgstr "Willekeurige pijltoets" - -msgid "Movement in camera space" -msgstr "Beweging in cameragebied" +msgid "Available while the 3D view on the Prepare tab has focus." +msgstr "" msgid "Select a part" msgstr "Selecteer een onderdeel" @@ -13313,130 +13319,29 @@ msgstr "Selecteer meerdere objecten" msgid "Select objects by rectangle" msgstr "Objecten selecteren door rechthoek" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Up" -msgstr "Pijl omhoog" - -msgid "Move selection 10mm in positive Y direction" -msgstr "Verplaats de selectie 10mm in een positieve Y richting" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Down" -msgstr "Pijl omlaag" - -msgid "Move selection 10mm in negative Y direction" -msgstr "Verplaats de selectie 10mm in een negatieve Y richting" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Left" -msgstr "Pijl links" - -msgid "Move selection 10mm in negative X direction" -msgstr "Verplaats de selectie 10mm in een negatieve X richting" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Right" -msgstr "Pijl rechts" - -msgid "Move selection 10mm in positive X direction" -msgstr "Verplaats de selectie 10mm in een positieve X richting" +msgid "Keyboard 1-9: set filament for object/part" +msgstr "Toets 1-9: kies filament voor het object/onderdeel" msgid "Movement step set to 1mm" msgstr "Bewegingsinterval ingesteld op 1mm" -msgid "Keyboard 1-9: set filament for object/part" -msgstr "Toets 1-9: kies filament voor het object/onderdeel" +msgid "Movement in camera space" +msgstr "Beweging in cameragebied" -msgid "Camera view - Default" -msgstr "Camera hoek - Standaard" +msgid "Middle mouse" +msgstr "" -msgid "Camera view - Top" -msgstr "Camera hoek - Bovenkant" +msgid "Right mouse" +msgstr "" -msgid "Camera view - Bottom" -msgstr "Camera hoek - Onderkant" +msgid "Zoom View" +msgstr "Zoom weergave" -msgid "Camera view - Front" -msgstr "Camera hoek - Voorkant" +msgid "Painting" +msgstr "" -msgid "Camera view - Behind" -msgstr "Camera hoek - Achter" - -msgid "Camera Angle - Left side" -msgstr "Camera hoek - Linker zijde" - -msgid "Camera Angle - Right side" -msgstr "Camera hoek - Rechter zijde" - -msgid "Select all objects" -msgstr "Selecteer alle objecten" - -msgid "Gizmo move" -msgstr "Gizmo bewegen" - -msgid "Gizmo rotate" -msgstr "Gizmo roteren" - -msgid "Gizmo scale" -msgstr "Gizmo schalen" - -msgid "Gizmo place face on bed" -msgstr "Gizmo plaats gebied op het bed" - -msgid "Gizmo cut" -msgstr "Gizmo snijden" - -msgid "Gizmo mesh boolean" -msgstr "Gizmo mesh booleaan" - -# AI Translated -msgid "Gizmo FDM paint-on fuzzy skin" -msgstr "Gizmo FDM vage buitenkant schilderen" - -msgid "Gizmo SLA support points" -msgstr "Gizmo SLA-ondersteuningspunten" - -msgid "Gizmo FDM paint-on seam" -msgstr "Gizmo FDM seam schilderen" - -msgid "Gizmo text emboss/engrave" -msgstr "Gizmo tekst reliëf/graveren" - -msgid "Gizmo measure" -msgstr "Gizmo maatregel" - -msgid "Gizmo assemble" -msgstr "Gizmo monteren" - -msgid "Gizmo brim ears" -msgstr "Gizmo rand oren" - -# AI Translated -msgid "Zoom in" -msgstr "Inzoomen" - -msgid "Zoom out" -msgstr "Zoom uit" - -# AI Translated -msgid "Toggle printable for object/part" -msgstr "Printbaar in-/uitschakelen voor object/onderdeel" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Tab" -msgstr "Tab" - -# AI Translated -msgid "Switch between Prepare/Preview" -msgstr "Wisselen tussen Voorbereiden/Voorvertoning" - -msgid "Plater" -msgstr "Plaat" +msgid "Available while a painting gizmo is open: supports, seam, fuzzy skin or color painting." +msgstr "" msgid "Move: press to snap by 1mm" msgstr "Verplaatsen: druk om 1 mm te verplaatsen" @@ -13447,15 +13352,19 @@ msgstr "Support/kleur intekenen: pas de pen diameter aan" msgid "Support/Color Painting: adjust section position" msgstr "Support/kleur intekenen: pas de sectie positie aan" -# AI Translated -msgid "Gizmo" -msgstr "Gizmo" +msgid "Objects list" +msgstr "Object lijst" + +msgid "Available while the object list has focus." +msgstr "" msgid "Set extruder number for the objects and parts" msgstr "Stel het extrudernnumer in voor de objecten en onderdelen" -msgid "Delete objects, parts, modifiers" -msgstr "Verwijder objecten, onderdelen, aanpassingen" +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Space" +msgstr "Spatie" msgid "Select the object/part and press space to change the name" msgstr "Selecteer het object/onderdeel en druk op de spatiebalk om de naam aan te passen" @@ -13466,48 +13375,48 @@ msgstr "Muisklik" msgid "Select the object/part and mouse click to change the name" msgstr "Selecteer het object/onderdeel en rechtermuisklik om de naam aan te passen" -msgid "Objects List" -msgstr "Objecten lijst" - -msgid "Vertical slider - Move active thumb Up" -msgstr "Verticale schuifregelaar - Actieve thumb omhoog bewegen" - -msgid "Vertical slider - Move active thumb Down" -msgstr "Verticale schuifregelaar - Actieve thumb omlaag bewegen" - -msgid "Horizontal slider - Move active thumb Left" -msgstr "Horizontale schuifbalk - Beweeg actieve duim naar links" - -msgid "Horizontal slider - Move active thumb Right" -msgstr "Horizontale schuifbalk - Beweeg actieve duim naar rechts" - -msgid "On/Off one layer mode of the vertical slider" -msgstr "Aan/uit één laagmodus van de verticale schuifregelaar" - -# AI Translated -msgid "On/Off G-code window" -msgstr "G-code-venster aan/uit" +msgid "Available while the 3D view on the Preview tab has focus." +msgstr "" msgid "Move slider 5x faster" msgstr "Schuifregelaar 5x sneller verplaatsen" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Home" -msgstr "Home" +msgid "Scroll slider 5x faster" +msgstr "" -# AI Translated -msgid "Horizontal slider - Move to start position" -msgstr "Horizontale schuifregelaar - Naar de startpositie" +msgid "Not customizable" +msgstr "" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "End" -msgstr "End" +#, c-format, boost-format +msgid "%s is assigned to %s. Reassign it to %s?" +msgstr "" -# AI Translated -msgid "Horizontal slider - Move to last position" -msgstr "Horizontale schuifregelaar - Naar de laatste positie" +#, c-format, boost-format +msgid "The default %s is assigned to %s. Reassign it to %s?" +msgstr "" + +msgid "Global shortcuts also apply while typing." +msgstr "" + +msgid "A key that types a character cannot be a global shortcut." +msgstr "" + +msgid "Esc cancels, Enter confirms." +msgstr "" + +#, c-format, boost-format +msgid "" +"Press the new shortcut for\n" +"\"%s\"" +msgstr "" + +#, c-format, boost-format +msgid "Already used as a step of %s." +msgstr "" + +#, c-format, boost-format +msgid "Already assigned to %s. Press OK to reassign it." +msgstr "" msgid "Release Note" msgstr "Release-opmerkingen" @@ -18992,9 +18901,8 @@ msgstr "Voorverwarmstappen" msgid "Insert multiple preheat commands (e.g. M104.1). Only useful for Prusa XL. For other printers, please set it to 1." msgstr "Voeg meerdere voorverwarmopdrachten in (bijv. M104.1). Alleen nuttig voor de Prusa XL. Stel dit voor andere printers in op 1." -# AI Translated -msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." -msgstr "G-code die helemaal bovenaan het uitvoerbestand wordt geschreven, vóór alle andere inhoud. Nuttig voor het toevoegen van metagegevens die de printerfirmware uit de eerste regels van het bestand leest (bijv. geschatte printtijd, filamentverbruik). Ondersteunt plaatshouders zoals {print_time_sec} en {used_filament_length}." +msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_total_sec}, {print_time_day}, {print_time_hour}, {print_time_minute}, {print_time_sec} and {used_filament_length}." +msgstr "" # AI Translated msgid "Start G-code" @@ -20730,14 +20638,37 @@ msgstr "Verbruikt filament" msgid "Total length of filament used in the print." msgstr "Totale lengte filament die in de print is gebruikt." -# AI Translated -msgid "Print time (seconds)" -msgstr "Printtijd (seconden)" +msgid "Print time (total seconds)" +msgstr "" # AI Translated msgid "Total estimated print time in seconds. Replaced with actual value during post-processing." msgstr "Totale geschatte printtijd in seconden. Wordt tijdens de nabewerking vervangen door de werkelijke waarde." +msgid "Print time (days component)" +msgstr "" + +msgid "Estimated print time day component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (hours component)" +msgstr "" + +msgid "Estimated print time hour component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (minutes component)" +msgstr "" + +msgid "Estimated print time minute component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (seconds component)" +msgstr "" + +msgid "Estimated print time second component (normal mode). Replaced with actual value during post-processing." +msgstr "" + # AI Translated msgid "Filament length (meters)" msgstr "Filamentlengte (meters)" @@ -22761,6 +22692,9 @@ msgstr "Er is geen geldige sessie gedetecteerd. Doorgaan met inloggen op 3DPrint msgid "Success!" msgstr "Succes!" +msgid "Generate API Key" +msgstr "" + msgid "Are you sure to log out?" msgstr "Weet u zeker dat u wilt uitloggen?" @@ -23943,14 +23877,6 @@ msgstr "De Bambu-netwerkplug-in is vereist voor cloudfuncties, het vinden van pr msgid "Error: %s" msgstr "Fout: %s" -# AI Translated -msgid "Show details" -msgstr "Details tonen" - -# AI Translated -msgid "Hide details" -msgstr "Details verbergen" - # AI Translated msgid "Version to install:" msgstr "Te installeren versie:" @@ -26633,6 +26559,12 @@ msgstr "" msgid "No binding for that field" msgstr "" +msgid "Enter a number" +msgstr "" + +msgid "Not a number" +msgstr "" + msgid "Primitive" msgstr "" @@ -26645,6 +26577,224 @@ msgstr "" msgid "Clear All" msgstr "" +msgctxt "Keyboard Shortcut" +msgid "Ins" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Home" +msgstr "Home" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "End" +msgstr "End" + +msgctxt "Keyboard Shortcut" +msgid "PgUp" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "PgDn" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Left" +msgstr "Pijl links" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Right" +msgstr "Pijl rechts" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Up" +msgstr "Pijl omhoog" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Down" +msgstr "Pijl omlaag" + +# AI Translated +msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" +msgstr "Importeer geometriegegevens uit STL-/STEP-/3MF-/OBJ-/AMF-bestanden" + +msgid "Select all objects" +msgstr "Selecteer alle objecten" + +msgid "Paste from clipboard" +msgstr "Plakken vanuit klembord" + +# AI Translated +msgid "Toggle printable for object/part" +msgstr "Printbaar in-/uitschakelen voor object/onderdeel" + +msgid "Move selection 10mm in negative X direction" +msgstr "Verplaats de selectie 10mm in een negatieve X richting" + +msgid "Move selection 10mm in positive X direction" +msgstr "Verplaats de selectie 10mm in een positieve X richting" + +msgid "Move selection 10mm in positive Y direction" +msgstr "Verplaats de selectie 10mm in een positieve Y richting" + +msgid "Move selection 10mm in negative Y direction" +msgstr "Verplaats de selectie 10mm in een negatieve Y richting" + +msgid "Rotate selection 45 degrees counterclockwise" +msgstr "" + +msgid "Rotate selection 45 degrees clockwise" +msgstr "" + +msgid "Gizmo move" +msgstr "Gizmo bewegen" + +msgid "Gizmo rotate" +msgstr "Gizmo roteren" + +msgid "Gizmo scale" +msgstr "Gizmo schalen" + +msgid "Gizmo place face on bed" +msgstr "Gizmo plaats gebied op het bed" + +msgid "Gizmo cut" +msgstr "Gizmo snijden" + +msgid "Gizmo mesh boolean" +msgstr "Gizmo mesh booleaan" + +msgid "Gizmo FDM paint-on supports" +msgstr "" + +msgid "Gizmo FDM paint-on seam" +msgstr "Gizmo FDM seam schilderen" + +# AI Translated +msgid "Gizmo FDM paint-on fuzzy skin" +msgstr "Gizmo FDM vage buitenkant schilderen" + +msgid "Gizmo multi-material painting" +msgstr "" + +msgid "Gizmo text emboss/engrave" +msgstr "Gizmo tekst reliëf/graveren" + +msgid "Gizmo measure" +msgstr "Gizmo maatregel" + +msgid "Gizmo assemble" +msgstr "Gizmo monteren" + +msgid "Gizmo brim ears" +msgstr "Gizmo rand oren" + +msgid "Vertical slider - Move active thumb Up" +msgstr "Verticale schuifregelaar - Actieve thumb omhoog bewegen" + +msgid "Vertical slider - Move active thumb Down" +msgstr "Verticale schuifregelaar - Actieve thumb omlaag bewegen" + +msgid "Horizontal slider - Move active thumb Left" +msgstr "Horizontale schuifbalk - Beweeg actieve duim naar links" + +msgid "Horizontal slider - Move active thumb Right" +msgstr "Horizontale schuifbalk - Beweeg actieve duim naar rechts" + +# AI Translated +msgid "Horizontal slider - Move to start position" +msgstr "Horizontale schuifregelaar - Naar de startpositie" + +# AI Translated +msgid "Horizontal slider - Move to last position" +msgstr "Horizontale schuifregelaar - Naar de laatste positie" + +msgid "Camera view - Default" +msgstr "Camera hoek - Standaard" + +msgid "Camera view - Top" +msgstr "Camera hoek - Bovenkant" + +msgid "Camera view - Bottom" +msgstr "Camera hoek - Onderkant" + +msgid "Camera view - Front" +msgstr "Camera hoek - Voorkant" + +msgid "Camera view - Behind" +msgstr "Camera hoek - Achter" + +msgid "Camera Angle - Left side" +msgstr "Camera hoek - Linker zijde" + +msgid "Camera Angle - Right side" +msgstr "Camera hoek - Rechter zijde" + +msgid "Camera view - Current plate" +msgstr "" + +# AI Translated +msgid "Zoom in" +msgstr "Inzoomen" + +msgid "Zoom out" +msgstr "Zoom uit" + +msgid "Show/Hide 3Dconnexion devices settings dialog" +msgstr "Dialoogvenster met instellingen voor 3Dconnexion-apparaten weergeven/verbergen" + +msgid "Show/Hide wireframe" +msgstr "" + +# AI Translated +msgid "On/Off G-code window" +msgstr "G-code-venster aan/uit" + +msgid "On/Off one layer mode of the vertical slider" +msgstr "Aan/uit één laagmodus van de verticale schuifregelaar" + +# AI Translated +msgid "Switch between Prepare/Preview" +msgstr "Wisselen tussen Voorbereiden/Voorvertoning" + +msgid "Collapse/Expand the sidebar" +msgstr "De menubalk in-/uitschuiven" + +msgid "Open the speed dial" +msgstr "" + +msgid "Reload the device page" +msgstr "" + +msgid "Show keyboard shortcuts list" +msgstr "Toon lijst met sneltoetsen" + +msgid "Slicing and printing" +msgstr "" + +msgid "Editing" +msgstr "" + +msgid "Placement" +msgstr "" + +msgid "Gizmos" +msgstr "" + +msgid "Sliders" +msgstr "" + +msgid "Painting tools" +msgstr "" + +msgid "Application" +msgstr "" + #: resources/data/hints.ini: [hint:Precise wall] msgid "" "Precise wall\n" @@ -26946,6 +27096,70 @@ msgstr "" "Kromtrekken voorkomen\n" "Wist je dat bij het printen van materialen die gevoelig zijn voor kromtrekken, zoals ABS, een juiste verhoging van de temperatuur van het warmtebed de kans op kromtrekken kan verkleinen?" +# AI Translated +#~ msgid "Tab" +#~ msgstr "Tab" + +# AI Translated +#~ msgid "Displays current viewport FPS in the top-right corner." +#~ msgstr "Toont de huidige FPS van de viewport in de rechterbovenhoek." + +# AI Translated +#~ msgid "Publish 3MF Wiki" +#~ msgstr "Wiki over 3MF publiceren" + +# AI Translated +#~ msgid "Publish 3MF Video Guide" +#~ msgstr "Videohandleiding over 3MF publiceren" + +#~ msgid "Toolbar" +#~ msgstr "Gereedschapsbalk" + +#~ msgid "Switch table page" +#~ msgstr "Schakeltabel pagina" + +#~ msgid "Global shortcuts" +#~ msgstr "Globale snelkoppelingen" + +# AI Translated +#~ msgid "Middle mouse button" +#~ msgstr "Middelste muisknop" + +#~ msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." +#~ msgstr "Oriënteert automatisch geselecteerde objecten of alle objecten. Als er geselecteerde objecten zijn, oriënteert het alleen de geselecteerde objecten. Anders worden alle objecten van het project georiënteerd." + +# AI Translated +#~ msgid "Auto orients all objects on the active plate." +#~ msgstr "Oriënteert alle objecten op het actieve printbed automatisch." + +# AI Translated +#~ msgid "Any arrow" +#~ msgstr "Willekeurige pijltoets" + +#~ msgid "Gizmo SLA support points" +#~ msgstr "Gizmo SLA-ondersteuningspunten" + +#~ msgid "Plater" +#~ msgstr "Plaat" + +# AI Translated +#~ msgid "Gizmo" +#~ msgstr "Gizmo" + +#~ msgid "Delete objects, parts, modifiers" +#~ msgstr "Verwijder objecten, onderdelen, aanpassingen" + +#~ msgid "Objects List" +#~ msgstr "Objecten lijst" + +# AI Translated +#~ msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." +#~ msgstr "G-code die helemaal bovenaan het uitvoerbestand wordt geschreven, vóór alle andere inhoud. Nuttig voor het toevoegen van metagegevens die de printerfirmware uit de eerste regels van het bestand leest (bijv. geschatte printtijd, filamentverbruik). Ondersteunt plaatshouders zoals {print_time_sec} en {used_filament_length}." + +# AI Translated +#~ msgid "Print time (seconds)" +#~ msgstr "Printtijd (seconden)" + # AI Translated #~ msgid "Open actions speed dial" #~ msgstr "Snelmenu met acties openen" diff --git a/localization/i18n/pl/OrcaSlicer_pl.po b/localization/i18n/pl/OrcaSlicer_pl.po index 25b5b664cf..f5097f1ef5 100644 --- a/localization/i18n/pl/OrcaSlicer_pl.po +++ b/localization/i18n/pl/OrcaSlicer_pl.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: OrcaSlicer 2.3.0-rc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-09-18 15:50+0800\n" +"POT-Creation-Date: 2026-09-22 17:02+0800\n" "PO-Revision-Date: \n" "Last-Translator: Krzysztof Morga <>\n" "Language-Team: \n" @@ -6047,12 +6047,15 @@ msgctxt "Camera View" msgid "Right" msgstr "Prawy" -msgid "Add" -msgstr "Dodaj" - msgid "Add plate" msgstr "Dodaj płytę" +msgid "Split to objects" +msgstr "Podziel na obiekty" + +msgid "Add" +msgstr "Dodaj" + msgid "Auto orient all/selected objects" msgstr "Automatyczna orientacja wszystkie/wybrane obiekty" @@ -6065,9 +6068,6 @@ msgstr "Rozmieść wszystkie obiekty" msgid "Arrange objects on selected plates" msgstr "Rozmieść obiekty na wybranych płytach" -msgid "Split to objects" -msgstr "Podziel na obiekty" - msgid "Assembly View" msgstr "Widok montażu" @@ -6130,6 +6130,9 @@ msgstr "kontur" msgid "Wireframe" msgstr "Siatka" +msgid "X-Ray" +msgstr "" + # AI Translated msgid "Realistic View" msgstr "Widok realistyczny" @@ -6686,9 +6689,6 @@ msgstr "Przełącza wyświetlanie konturu wokół zaznaczonego obiektu w scenie msgid "Preferences" msgstr "Preferencje" -msgid "Open speed dial..." -msgstr "" - # AI Translated msgctxt "Menu" msgid "Edit" @@ -6697,6 +6697,9 @@ msgstr "Edycja" msgid "View" msgstr "Widok" +msgid "Open Speed Dial" +msgstr "" + # AI Translated msgid "Preset Bundle" msgstr "Pakiet profili" @@ -8546,9 +8549,6 @@ msgstr "Rozwiń pasek boczny" msgid "Collapse sidebar" msgstr "Zwiń pasek boczny" -msgid "Tab" -msgstr "Karty" - #, c-format, boost-format msgid "Loading file: %s" msgstr "Wczytywanie pliku: %s" @@ -9626,10 +9626,10 @@ msgstr "Obsługiwanie wielu urządzeń" msgid "With this option enabled, you can send a task to multiple devices at the same time and manage multiple devices." msgstr "Umożliwia wysyłanie zadania do wielu urządzeń jednocześnie i zarządzanie nimi." -msgid "Open the Speed Dial with the Space key" +msgid "Open the Speed Dial from the keyboard" msgstr "" -msgid "When enabled, pressing Space (with no other key held) opens the Speed Dial action search from any page." +msgid "When enabled, the Speed Dial keyboard shortcut (Space by default) opens the action search from any page." msgstr "" msgid "Recent actions" @@ -9777,6 +9777,15 @@ msgstr "Przeciąganie prawym przyciskiem myszy" msgid "Set the action that dragging the right mouse button should perform." msgstr "Ustaw akcję wykonywaną przy przeciąganiu prawym przyciskiem myszy." +msgid "Keyboard" +msgstr "" + +msgid "Keyboard shortcuts" +msgstr "" + +msgid "Choose the key for each action." +msgstr "" + # AI Translated msgid "Clear my choice on..." msgstr "Wyczyść mój wybór dla..." @@ -9905,13 +9914,40 @@ msgstr "" "Ogranicza liczbę klatek w widoku, aby zmniejszyć obciążenie GPU i zużycie energii.\n" "Ustaw 0, aby nie ograniczać liczby klatek." +msgid "Reuse the 3D scene while idle" +msgstr "" + +msgid "" +"Skips redrawing the 3D scene when only the mouse cursor moves over the viewport,\n" +"and reuses the previous frame's scene instead. Reduces GPU load.\n" +"Disable it if the viewport shows stale or missing contents.\n" +"\n" +"Takes effect immediately." +msgstr "" + +msgid "Skip unchanged frames" +msgstr "" + +msgid "" +"Skips drawing a frame altogether when it would be identical to the one already on screen.\n" +"Only applies to frames that reuse the 3D scene, so it needs Reuse the 3D scene while idle.\n" +"Disable it if a hover highlight, tooltip or animation stops updating.\n" +"\n" +"Takes effect immediately." +msgstr "" + # AI Translated msgid "Show FPS overlay" msgstr "Pokaż nakładkę FPS" -# AI Translated -msgid "Displays current viewport FPS in the top-right corner." -msgstr "Wyświetla bieżącą wartość FPS widoku w prawym górnym rogu." +msgid "Displays rendering counts in the top-right corner of the viewport." +msgstr "" + +msgid "FPS: frames presented to the screen per second." +msgstr "" + +msgid "3D: frames per second that redrew the 3D scene." +msgstr "" # AI Translated msgid "G-code Preview" @@ -10403,13 +10439,8 @@ msgstr "Opublikuj 3MF..." msgid "Select which settings to be published in the 3MF file" msgstr "Wybierz, które ustawienia zostaną opublikowane w pliku 3MF" -# AI Translated -msgid "Publish 3MF Wiki" -msgstr "Wiki publikowania 3MF" - -# AI Translated -msgid "Publish 3MF Video Guide" -msgstr "Poradnik wideo publikowania 3MF" +msgid "Video Guide" +msgstr "" # AI Translated msgid "Mixed filament - published as a whole when \"Enable\" above is selected" @@ -10612,6 +10643,14 @@ msgstr "" msgid "No wiki page for this action" msgstr "" +# AI Translated +msgid "Show details" +msgstr "Pokaż szczegóły" + +# AI Translated +msgid "Hide details" +msgstr "Ukryj szczegóły" + #, c-format, boost-format msgid "\"%s\" is a Developer setting. Enable Developer mode to edit it?" msgstr "" @@ -12518,68 +12557,39 @@ msgstr "Pakiet konfiguracyjny został zmieniony w poprzednim Przewodniku konfigu msgid "Configuration package changed" msgstr "Zmieniono pakiet konfiguracyjny" -msgid "Toolbar" -msgstr "Pasek narzędzi" - -msgid "Objects list" -msgstr "Lista obiektów" - -msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" -msgstr "Import danych geometrycznych z plików STL/STEP/3MF/OBJ/AMF" - -msgid "Paste from clipboard" -msgstr "Wklej z schowka" - -msgid "Show/Hide 3Dconnexion devices settings dialog" -msgstr "Pokaż/ukryj okno dialogowe ustawień urządzeń 3Dconnexion" - -msgid "Switch table page" -msgstr "Przełącz stronę tabeli" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Space" -msgstr "Spacja" - -msgid "Open speed dial" -msgstr "" - -msgid "Run a Speed Dial favourite (while the Speed Dial is open)" -msgstr "" - -msgid "Show keyboard shortcuts list" -msgstr "Pokaż listę skrótów klawiszowych" - -msgid "Global shortcuts" -msgstr "Globalne skróty" - msgid "Pan View" msgstr "Przesuń widok" msgid "Rotate View" msgstr "Obróć widok" +#, c-format, boost-format +msgid "Use %s or %s, or a key that does not type a character." +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "Key" +msgstr "" + +msgid "Left mouse" +msgstr "" + +msgid "Available anywhere in the window, even while typing in a text field." +msgstr "" + +msgid "Run a speed dial favorite while the dial is open" +msgstr "" + # AI Translated -msgid "Middle mouse button" -msgstr "Środkowy przycisk myszy" +msgctxt "Keyboard Shortcut" +msgid "Tab" +msgstr "Tab" -msgid "Zoom View" -msgstr "Powiększ widok" +msgid "Switch to the next main tab" +msgstr "" -msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." -msgstr "Ta funkcja automatycznie ustawia orientację zaznaczonych lub wszystkich obiektów. Jeśli są wybrane obiekty, ustawi tylko te wybrane. W przeciwnym razie ustawi wszystkie obiekty bieżącego projektu." - -msgid "Auto orients all objects on the active plate." -msgstr "Ta funkcja automatycznie ustawia orientację wszystkie obiekty na aktualnej płycie roboczej." - -msgid "Collapse/Expand the sidebar" -msgstr "Zwiń/Rozwiń pasek boczny" - -msgid "Any arrow" -msgstr "Dowolna strzałka" - -msgid "Movement in camera space" -msgstr "Ruch w przestrzeni kamery" +msgid "Available while the 3D view on the Prepare tab has focus." +msgstr "" msgid "Select a part" msgstr "Wybierz część" @@ -12590,127 +12600,29 @@ msgstr "Wybierz wiele obiektów" msgid "Select objects by rectangle" msgstr "Wybierz obiekty prostokątem" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Up" -msgstr "Strzałka w górę" - -msgid "Move selection 10mm in positive Y direction" -msgstr "Przesuń wybrane o 10 mm w kierunku dodatnim osi Y" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Down" -msgstr "Strzałka w dół" - -msgid "Move selection 10mm in negative Y direction" -msgstr "Przesuń wybrane o 10 mm w kierunku ujemnym osi Y" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Left" -msgstr "Strzałka w lewo" - -msgid "Move selection 10mm in negative X direction" -msgstr "Przesuń wybrane o 10 mm w kierunku ujemnym osi X" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Right" -msgstr "Strzałka w prawo" - -msgid "Move selection 10mm in positive X direction" -msgstr "Przesuń wybrane o 10 mm w kierunku dodatnim osi X" +msgid "Keyboard 1-9: set filament for object/part" +msgstr "klawiatura 1-9: ustaw filament dla obiektu/części" msgid "Movement step set to 1mm" msgstr "Ustaw krok ruchu na 1 mm" -msgid "Keyboard 1-9: set filament for object/part" -msgstr "klawiatura 1-9: ustaw filament dla obiektu/części" +msgid "Movement in camera space" +msgstr "Ruch w przestrzeni kamery" -msgid "Camera view - Default" -msgstr "Widok kamery - Domyślny" +msgid "Middle mouse" +msgstr "" -msgid "Camera view - Top" -msgstr "Widok kamery - Z góry" +msgid "Right mouse" +msgstr "" -msgid "Camera view - Bottom" -msgstr "Widok kamery - Z dołu" +msgid "Zoom View" +msgstr "Powiększ widok" -msgid "Camera view - Front" -msgstr "Widok kamery - Z przodu" +msgid "Painting" +msgstr "" -msgid "Camera view - Behind" -msgstr "Widok kamery - Z tyłu" - -msgid "Camera Angle - Left side" -msgstr "Kąt kamery - Lewa strona" - -msgid "Camera Angle - Right side" -msgstr "Kąt kamery - Prawa strona" - -msgid "Select all objects" -msgstr "Wybierz wszystkie obiekty" - -msgid "Gizmo move" -msgstr "Przenoszenie za pomocą „uchwytów”" - -msgid "Gizmo rotate" -msgstr "Obracanie za pomocą „uchwytów”" - -msgid "Gizmo scale" -msgstr "Skalowanie za pomocą „uchwytów”" - -msgid "Gizmo place face on bed" -msgstr "Położenie na płaszczyźnie za pomocą „uchwytów”" - -msgid "Gizmo cut" -msgstr "Cięcie za pomocą „uchwytów”" - -msgid "Gizmo mesh boolean" -msgstr "Gizmo operacje boolowskie na siatce" - -msgid "Gizmo FDM paint-on fuzzy skin" -msgstr "Uchwyt malowania Fuzzy Skin FDM" - -msgid "Gizmo SLA support points" -msgstr "Punkty podpór SLA za pomocą „uchwytów”" - -msgid "Gizmo FDM paint-on seam" -msgstr "Uchwyt malowania szwu FDM" - -msgid "Gizmo text emboss/engrave" -msgstr "Uchwyt wytłaczania/grawerowania tekstu" - -msgid "Gizmo measure" -msgstr "Gizmo mierzyć" - -msgid "Gizmo assemble" -msgstr "Gizmo montować" - -msgid "Gizmo brim ears" -msgstr "Gizmo uszy brim" - -msgid "Zoom in" -msgstr "Przybliżenie" - -msgid "Zoom out" -msgstr "Oddalenie" - -# AI Translated -msgid "Toggle printable for object/part" -msgstr "Przełącz drukowalność obiektu/części" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Tab" -msgstr "Tab" - -msgid "Switch between Prepare/Preview" -msgstr "Przełączanie między przygotowaniem/podglądem" - -msgid "Plater" -msgstr "Płyta" +msgid "Available while a painting gizmo is open: supports, seam, fuzzy skin or color painting." +msgstr "" msgid "Move: press to snap by 1mm" msgstr "Przesuń: naciśnij, aby przyciągnąć co 1 mm" @@ -12721,14 +12633,19 @@ msgstr "Podpory/Kolorowanie: dostosuj promień pędzla" msgid "Support/Color Painting: adjust section position" msgstr "Podpory/Kolorowanie: dostosuj pozycję sekcji" -msgid "Gizmo" -msgstr "Uchwyt" +msgid "Objects list" +msgstr "Lista obiektów" + +msgid "Available while the object list has focus." +msgstr "" msgid "Set extruder number for the objects and parts" msgstr "Ustaw numer extrudera dla obiektów i części" -msgid "Delete objects, parts, modifiers" -msgstr "Usuń obiekty, części, modyfikatory" +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Space" +msgstr "Spacja" msgid "Select the object/part and press space to change the name" msgstr "Wybierz obiekt/część i naciśnij spację, aby zmienić nazwę" @@ -12739,45 +12656,48 @@ msgstr "Kliknięcie myszą" msgid "Select the object/part and mouse click to change the name" msgstr "Wybierz obiekt/część i kliknij myszą, aby zmienić nazwę" -msgid "Objects List" -msgstr "Lista obiektów" - -msgid "Vertical slider - Move active thumb Up" -msgstr "Pionowy suwak - Przesuń aktywny punkt w górę" - -msgid "Vertical slider - Move active thumb Down" -msgstr "Pionowy suwak - Przesuń aktywny punkt w dół" - -msgid "Horizontal slider - Move active thumb Left" -msgstr "Poziomy suwak - Przesuń aktywny punkt w lewo" - -msgid "Horizontal slider - Move active thumb Right" -msgstr "Poziomy suwak - Przesuń aktywny punkt w prawo" - -msgid "On/Off one layer mode of the vertical slider" -msgstr "Włącz/wyłącz wyświetlanie jednej warstwy suwaka pionowego" - -msgid "On/Off G-code window" -msgstr "Włącz/Wyłącz okno G-code" +msgid "Available while the 3D view on the Preview tab has focus." +msgstr "" msgid "Move slider 5x faster" msgstr "Przesuń suwak 5x szybciej" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Home" -msgstr "Home" +msgid "Scroll slider 5x faster" +msgstr "" -msgid "Horizontal slider - Move to start position" -msgstr "Suwak poziomy - Przesuń do pozycji początkowej" +msgid "Not customizable" +msgstr "" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "End" -msgstr "End" +#, c-format, boost-format +msgid "%s is assigned to %s. Reassign it to %s?" +msgstr "" -msgid "Horizontal slider - Move to last position" -msgstr "Suwak poziomy - Przesuń do ostatniej pozycji" +#, c-format, boost-format +msgid "The default %s is assigned to %s. Reassign it to %s?" +msgstr "" + +msgid "Global shortcuts also apply while typing." +msgstr "" + +msgid "A key that types a character cannot be a global shortcut." +msgstr "" + +msgid "Esc cancels, Enter confirms." +msgstr "" + +#, c-format, boost-format +msgid "" +"Press the new shortcut for\n" +"\"%s\"" +msgstr "" + +#, c-format, boost-format +msgid "Already used as a step of %s." +msgstr "" + +#, c-format, boost-format +msgid "Already assigned to %s. Press OK to reassign it." +msgstr "" msgid "Release Note" msgstr "Informacje o wydaniu" @@ -17852,9 +17772,8 @@ msgstr "Kroki wstępnego podgrzewania" msgid "Insert multiple preheat commands (e.g. M104.1). Only useful for Prusa XL. For other printers, please set it to 1." msgstr "Wprowadź wiele poleceń dotyczących podgrzewania (np. M104.1). Funkcja ta działa tylko w drukarce Prusa XL. Dla pozostałych drukarek ustaw wartość na 1." -# AI Translated -msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." -msgstr "G-code zapisywany na samej górze pliku wyjściowego, przed jakąkolwiek inną treścią. Przydatny do dodawania metadanych, które oprogramowanie sprzętowe drukarki odczytuje z pierwszych wierszy pliku (np. szacowany czas druku, zużycie filamentu). Obsługuje symbole zastępcze, takie jak {print_time_sec} i {used_filament_length}." +msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_total_sec}, {print_time_day}, {print_time_hour}, {print_time_minute}, {print_time_sec} and {used_filament_length}." +msgstr "" msgid "Start G-code" msgstr "Początkowy G-code" @@ -19433,14 +19352,37 @@ msgstr "Użyty filament" msgid "Total length of filament used in the print." msgstr "Całkowita długość filamentu użytego w wydruku." -# AI Translated -msgid "Print time (seconds)" -msgstr "Czas druku (sekundy)" +msgid "Print time (total seconds)" +msgstr "" # AI Translated msgid "Total estimated print time in seconds. Replaced with actual value during post-processing." msgstr "Całkowity szacowany czas druku w sekundach. Zastępowany rzeczywistą wartością podczas postprocessingu." +msgid "Print time (days component)" +msgstr "" + +msgid "Estimated print time day component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (hours component)" +msgstr "" + +msgid "Estimated print time hour component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (minutes component)" +msgstr "" + +msgid "Estimated print time minute component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (seconds component)" +msgstr "" + +msgid "Estimated print time second component (normal mode). Replaced with actual value during post-processing." +msgstr "" + # AI Translated msgid "Filament length (meters)" msgstr "Długość filamentu (metry)" @@ -21356,6 +21298,9 @@ msgstr "Nie wykryto prawidłowej sesji. Kontynuować logowaniem do 3DPrinterOS?" msgid "Success!" msgstr "Powodzenie!" +msgid "Generate API Key" +msgstr "" + msgid "Are you sure to log out?" msgstr "Czy na pewno wylogować?" @@ -22427,14 +22372,6 @@ msgstr "Wtyczka Bambu Network jest wymagana do funkcji chmurowych, wykrywania dr msgid "Error: %s" msgstr "Błąd: %s" -# AI Translated -msgid "Show details" -msgstr "Pokaż szczegóły" - -# AI Translated -msgid "Hide details" -msgstr "Ukryj szczegóły" - # AI Translated msgid "Version to install:" msgstr "Wersja do zainstalowania:" @@ -25096,6 +25033,12 @@ msgstr "" msgid "No binding for that field" msgstr "" +msgid "Enter a number" +msgstr "" + +msgid "Not a number" +msgstr "" + msgid "Primitive" msgstr "" @@ -25108,6 +25051,217 @@ msgstr "" msgid "Clear All" msgstr "" +msgctxt "Keyboard Shortcut" +msgid "Ins" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Home" +msgstr "Home" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "End" +msgstr "End" + +msgctxt "Keyboard Shortcut" +msgid "PgUp" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "PgDn" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Left" +msgstr "Strzałka w lewo" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Right" +msgstr "Strzałka w prawo" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Up" +msgstr "Strzałka w górę" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Down" +msgstr "Strzałka w dół" + +msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" +msgstr "Import danych geometrycznych z plików STL/STEP/3MF/OBJ/AMF" + +msgid "Select all objects" +msgstr "Wybierz wszystkie obiekty" + +msgid "Paste from clipboard" +msgstr "Wklej z schowka" + +# AI Translated +msgid "Toggle printable for object/part" +msgstr "Przełącz drukowalność obiektu/części" + +msgid "Move selection 10mm in negative X direction" +msgstr "Przesuń wybrane o 10 mm w kierunku ujemnym osi X" + +msgid "Move selection 10mm in positive X direction" +msgstr "Przesuń wybrane o 10 mm w kierunku dodatnim osi X" + +msgid "Move selection 10mm in positive Y direction" +msgstr "Przesuń wybrane o 10 mm w kierunku dodatnim osi Y" + +msgid "Move selection 10mm in negative Y direction" +msgstr "Przesuń wybrane o 10 mm w kierunku ujemnym osi Y" + +msgid "Rotate selection 45 degrees counterclockwise" +msgstr "" + +msgid "Rotate selection 45 degrees clockwise" +msgstr "" + +msgid "Gizmo move" +msgstr "Przenoszenie za pomocą „uchwytów”" + +msgid "Gizmo rotate" +msgstr "Obracanie za pomocą „uchwytów”" + +msgid "Gizmo scale" +msgstr "Skalowanie za pomocą „uchwytów”" + +msgid "Gizmo place face on bed" +msgstr "Położenie na płaszczyźnie za pomocą „uchwytów”" + +msgid "Gizmo cut" +msgstr "Cięcie za pomocą „uchwytów”" + +msgid "Gizmo mesh boolean" +msgstr "Gizmo operacje boolowskie na siatce" + +msgid "Gizmo FDM paint-on supports" +msgstr "" + +msgid "Gizmo FDM paint-on seam" +msgstr "Uchwyt malowania szwu FDM" + +msgid "Gizmo FDM paint-on fuzzy skin" +msgstr "Uchwyt malowania Fuzzy Skin FDM" + +msgid "Gizmo multi-material painting" +msgstr "" + +msgid "Gizmo text emboss/engrave" +msgstr "Uchwyt wytłaczania/grawerowania tekstu" + +msgid "Gizmo measure" +msgstr "Gizmo mierzyć" + +msgid "Gizmo assemble" +msgstr "Gizmo montować" + +msgid "Gizmo brim ears" +msgstr "Gizmo uszy brim" + +msgid "Vertical slider - Move active thumb Up" +msgstr "Pionowy suwak - Przesuń aktywny punkt w górę" + +msgid "Vertical slider - Move active thumb Down" +msgstr "Pionowy suwak - Przesuń aktywny punkt w dół" + +msgid "Horizontal slider - Move active thumb Left" +msgstr "Poziomy suwak - Przesuń aktywny punkt w lewo" + +msgid "Horizontal slider - Move active thumb Right" +msgstr "Poziomy suwak - Przesuń aktywny punkt w prawo" + +msgid "Horizontal slider - Move to start position" +msgstr "Suwak poziomy - Przesuń do pozycji początkowej" + +msgid "Horizontal slider - Move to last position" +msgstr "Suwak poziomy - Przesuń do ostatniej pozycji" + +msgid "Camera view - Default" +msgstr "Widok kamery - Domyślny" + +msgid "Camera view - Top" +msgstr "Widok kamery - Z góry" + +msgid "Camera view - Bottom" +msgstr "Widok kamery - Z dołu" + +msgid "Camera view - Front" +msgstr "Widok kamery - Z przodu" + +msgid "Camera view - Behind" +msgstr "Widok kamery - Z tyłu" + +msgid "Camera Angle - Left side" +msgstr "Kąt kamery - Lewa strona" + +msgid "Camera Angle - Right side" +msgstr "Kąt kamery - Prawa strona" + +msgid "Camera view - Current plate" +msgstr "" + +msgid "Zoom in" +msgstr "Przybliżenie" + +msgid "Zoom out" +msgstr "Oddalenie" + +msgid "Show/Hide 3Dconnexion devices settings dialog" +msgstr "Pokaż/ukryj okno dialogowe ustawień urządzeń 3Dconnexion" + +msgid "Show/Hide wireframe" +msgstr "" + +msgid "On/Off G-code window" +msgstr "Włącz/Wyłącz okno G-code" + +msgid "On/Off one layer mode of the vertical slider" +msgstr "Włącz/wyłącz wyświetlanie jednej warstwy suwaka pionowego" + +msgid "Switch between Prepare/Preview" +msgstr "Przełączanie między przygotowaniem/podglądem" + +msgid "Collapse/Expand the sidebar" +msgstr "Zwiń/Rozwiń pasek boczny" + +msgid "Open the speed dial" +msgstr "" + +msgid "Reload the device page" +msgstr "" + +msgid "Show keyboard shortcuts list" +msgstr "Pokaż listę skrótów klawiszowych" + +msgid "Slicing and printing" +msgstr "" + +msgid "Editing" +msgstr "" + +msgid "Placement" +msgstr "" + +msgid "Gizmos" +msgstr "" + +msgid "Sliders" +msgstr "" + +msgid "Painting tools" +msgstr "" + +msgid "Application" +msgstr "" + #: resources/data/hints.ini: [hint:Precise wall] msgid "" "Precise wall\n" @@ -25409,6 +25563,66 @@ msgstr "" "Unikaj odkształceń\n" "Czy wiesz, że podczas drukowania filamentami podatnymi na odkształcenia, takimi jak ABS, odpowiednie zwiększenie temperatury podgrzewanej płyty może zmniejszyć prawdopodobieństwo odkształceń?" +#~ msgid "Tab" +#~ msgstr "Karty" + +# AI Translated +#~ msgid "Displays current viewport FPS in the top-right corner." +#~ msgstr "Wyświetla bieżącą wartość FPS widoku w prawym górnym rogu." + +# AI Translated +#~ msgid "Publish 3MF Wiki" +#~ msgstr "Wiki publikowania 3MF" + +# AI Translated +#~ msgid "Publish 3MF Video Guide" +#~ msgstr "Poradnik wideo publikowania 3MF" + +#~ msgid "Toolbar" +#~ msgstr "Pasek narzędzi" + +#~ msgid "Switch table page" +#~ msgstr "Przełącz stronę tabeli" + +#~ msgid "Global shortcuts" +#~ msgstr "Globalne skróty" + +# AI Translated +#~ msgid "Middle mouse button" +#~ msgstr "Środkowy przycisk myszy" + +#~ msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." +#~ msgstr "Ta funkcja automatycznie ustawia orientację zaznaczonych lub wszystkich obiektów. Jeśli są wybrane obiekty, ustawi tylko te wybrane. W przeciwnym razie ustawi wszystkie obiekty bieżącego projektu." + +#~ msgid "Auto orients all objects on the active plate." +#~ msgstr "Ta funkcja automatycznie ustawia orientację wszystkie obiekty na aktualnej płycie roboczej." + +#~ msgid "Any arrow" +#~ msgstr "Dowolna strzałka" + +#~ msgid "Gizmo SLA support points" +#~ msgstr "Punkty podpór SLA za pomocą „uchwytów”" + +#~ msgid "Plater" +#~ msgstr "Płyta" + +#~ msgid "Gizmo" +#~ msgstr "Uchwyt" + +#~ msgid "Delete objects, parts, modifiers" +#~ msgstr "Usuń obiekty, części, modyfikatory" + +#~ msgid "Objects List" +#~ msgstr "Lista obiektów" + +# AI Translated +#~ msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." +#~ msgstr "G-code zapisywany na samej górze pliku wyjściowego, przed jakąkolwiek inną treścią. Przydatny do dodawania metadanych, które oprogramowanie sprzętowe drukarki odczytuje z pierwszych wierszy pliku (np. szacowany czas druku, zużycie filamentu). Obsługuje symbole zastępcze, takie jak {print_time_sec} i {used_filament_length}." + +# AI Translated +#~ msgid "Print time (seconds)" +#~ msgstr "Czas druku (sekundy)" + # AI Translated #~ msgid "Open actions speed dial" #~ msgstr "Otwórz szybkie menu akcji" diff --git a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po index db28922786..67758b8b9d 100644 --- a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po +++ b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-09-18 15:50+0800\n" +"POT-Creation-Date: 2026-09-22 17:02+0800\n" "PO-Revision-Date: 2026-07-26 11:14-0300\n" "Last-Translator: Alexandre Folle de Menezes\n" "Language-Team: Portuguese, Brazilian\n" @@ -5745,12 +5745,15 @@ msgctxt "Camera View" msgid "Right" msgstr "Direita" -msgid "Add" -msgstr "Adicionar" - msgid "Add plate" msgstr "Adicionar placa" +msgid "Split to objects" +msgstr "Dividir em objetos" + +msgid "Add" +msgstr "Adicionar" + msgid "Auto orient all/selected objects" msgstr "Orientação automática todos/selecionados objetos" @@ -5763,9 +5766,6 @@ msgstr "Organizar todos os objetos" msgid "Arrange objects on selected plates" msgstr "Organizar objetos nas placas selecionadas" -msgid "Split to objects" -msgstr "Dividir em objetos" - msgid "Assembly View" msgstr "Vista de Montagem" @@ -5821,6 +5821,9 @@ msgstr "Contorno" msgid "Wireframe" msgstr "Malha" +msgid "X-Ray" +msgstr "" + msgid "Realistic View" msgstr "Visualização Realista" @@ -6360,9 +6363,6 @@ msgstr "Mostrar contorno ao redor do objeto selecionado na cena 3D." msgid "Preferences" msgstr "Preferências" -msgid "Open speed dial..." -msgstr "" - msgctxt "Menu" msgid "Edit" msgstr "Editar" @@ -6370,6 +6370,9 @@ msgstr "Editar" msgid "View" msgstr "Visualizar" +msgid "Open Speed Dial" +msgstr "" + msgid "Preset Bundle" msgstr "Pacote de Predefinições" @@ -8142,9 +8145,6 @@ msgstr "Expandir barra lateral" msgid "Collapse sidebar" msgstr "Recolher barra lateral" -msgid "Tab" -msgstr "Tab" - #, c-format, boost-format msgid "Loading file: %s" msgstr "Carregando arquivo: %s" @@ -9154,10 +9154,10 @@ msgstr "Gerenciamento de multi dispositivos" msgid "With this option enabled, you can send a task to multiple devices at the same time and manage multiple devices." msgstr "Com esta opção habilitada, você pode enviar uma tarefa para vários dispositivos ao mesmo tempo e gerenciar vários dispositivos." -msgid "Open the Speed Dial with the Space key" +msgid "Open the Speed Dial from the keyboard" msgstr "" -msgid "When enabled, pressing Space (with no other key held) opens the Speed Dial action search from any page." +msgid "When enabled, the Speed Dial keyboard shortcut (Space by default) opens the action search from any page." msgstr "" msgid "Recent actions" @@ -9289,6 +9289,15 @@ msgstr "Arrastar com Mouse Direito" msgid "Set the action that dragging the right mouse button should perform." msgstr "Defina a ação que arrastar com o botão direito do mouse deve executar." +msgid "Keyboard" +msgstr "" + +msgid "Keyboard shortcuts" +msgstr "" + +msgid "Choose the key for each action." +msgstr "" + msgid "Clear my choice on..." msgstr "Limpar minha escolha em…" @@ -9399,11 +9408,39 @@ msgstr "" "Limita a taxa de quadros da janela de visualização para reduzir a carga da GPU e o consumo de energia.\n" "Defina como 0 para taxa de quadros ilimitada." +msgid "Reuse the 3D scene while idle" +msgstr "" + +msgid "" +"Skips redrawing the 3D scene when only the mouse cursor moves over the viewport,\n" +"and reuses the previous frame's scene instead. Reduces GPU load.\n" +"Disable it if the viewport shows stale or missing contents.\n" +"\n" +"Takes effect immediately." +msgstr "" + +msgid "Skip unchanged frames" +msgstr "" + +msgid "" +"Skips drawing a frame altogether when it would be identical to the one already on screen.\n" +"Only applies to frames that reuse the 3D scene, so it needs Reuse the 3D scene while idle.\n" +"Disable it if a hover highlight, tooltip or animation stops updating.\n" +"\n" +"Takes effect immediately." +msgstr "" + msgid "Show FPS overlay" msgstr "Mostrar painel de FPS" -msgid "Displays current viewport FPS in the top-right corner." -msgstr "Exibe o FPS atual da janela de visualização no canto superior direito." +msgid "Displays rendering counts in the top-right corner of the viewport." +msgstr "" + +msgid "FPS: frames presented to the screen per second." +msgstr "" + +msgid "3D: frames per second that redrew the 3D scene." +msgstr "" msgid "G-code Preview" msgstr "Pré-visualização de G-code" @@ -9859,13 +9896,8 @@ msgstr "Publicar 3MF..." msgid "Select which settings to be published in the 3MF file" msgstr "Selecione quais configurações serão publicadas no arquivo 3MF" -# AI Translated -msgid "Publish 3MF Wiki" -msgstr "Documentação de Publicar 3MF" - -# AI Translated -msgid "Publish 3MF Video Guide" -msgstr "Guia em vídeo de Publicar 3MF" +msgid "Video Guide" +msgstr "" # AI Translated msgid "Mixed filament - published as a whole when \"Enable\" above is selected" @@ -10067,6 +10099,12 @@ msgstr "" msgid "No wiki page for this action" msgstr "" +msgid "Show details" +msgstr "Mostrar detalhes" + +msgid "Hide details" +msgstr "Esconder detalhes" + #, c-format, boost-format msgid "\"%s\" is a Developer setting. Enable Developer mode to edit it?" msgstr "" @@ -11853,66 +11891,38 @@ msgstr "O pacote de configuração é alterado no Guia de Configuração anterio msgid "Configuration package changed" msgstr "Pacote de configuração alterado" -msgid "Toolbar" -msgstr "Barra de Ferramentas" - -msgid "Objects list" -msgstr "Lista de objetos" - -msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" -msgstr "Importar dados de geometria de arquivos STL/STEP/3MF/OBJ/AMF" - -msgid "Paste from clipboard" -msgstr "Colar da área de transferência" - -msgid "Show/Hide 3Dconnexion devices settings dialog" -msgstr "Mostrar/Ocultar diálogo de configurações de dispositivos 3Dconnexion" - -msgid "Switch table page" -msgstr "Trocar página da tabela" - -msgctxt "Keyboard Shortcut" -msgid "Space" -msgstr "Espaço" - -msgid "Open speed dial" -msgstr "" - -msgid "Run a Speed Dial favourite (while the Speed Dial is open)" -msgstr "" - -msgid "Show keyboard shortcuts list" -msgstr "Mostrar lista de atalhos de teclado" - -msgid "Global shortcuts" -msgstr "Atalhos globais" - msgid "Pan View" msgstr "Mover Vista" msgid "Rotate View" msgstr "Rotacionar Vista" -msgid "Middle mouse button" -msgstr "Botão do meio do mouse" +#, c-format, boost-format +msgid "Use %s or %s, or a key that does not type a character." +msgstr "" -msgid "Zoom View" -msgstr "Aproximar Vista" +msgctxt "Keyboard Shortcut" +msgid "Key" +msgstr "" -msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." -msgstr "Orienta automaticamente os objetos selecionados ou todos os objetos. Se houver objetos selecionados, ele apenas orientará os selecionados. Caso contrário, ele orientará todos os objetos do projeto atual." +msgid "Left mouse" +msgstr "" -msgid "Auto orients all objects on the active plate." -msgstr "Orienta automaticamente todos os objetos na placa atual." +msgid "Available anywhere in the window, even while typing in a text field." +msgstr "" -msgid "Collapse/Expand the sidebar" -msgstr "Recolher/Expandir a barra lateral" +msgid "Run a speed dial favorite while the dial is open" +msgstr "" -msgid "Any arrow" -msgstr "Qualquer seta" +msgctxt "Keyboard Shortcut" +msgid "Tab" +msgstr "Tab" -msgid "Movement in camera space" -msgstr "Movimento no espaço da câmera" +msgid "Switch to the next main tab" +msgstr "" + +msgid "Available while the 3D view on the Prepare tab has focus." +msgstr "" msgid "Select a part" msgstr "Selecionar uma peça" @@ -11923,121 +11933,29 @@ msgstr "Selecionar vários objetos" msgid "Select objects by rectangle" msgstr "Selecionar objetos por retângulo" -msgctxt "Keyboard Shortcut" -msgid "Arrow Up" -msgstr "Seta para Cima" - -msgid "Move selection 10mm in positive Y direction" -msgstr "Mover seleção 10mm na direção Y positiva" - -msgctxt "Keyboard Shortcut" -msgid "Arrow Down" -msgstr "Seta para Baixo" - -msgid "Move selection 10mm in negative Y direction" -msgstr "Mover seleção 10mm na direção Y negativa" - -msgctxt "Keyboard Shortcut" -msgid "Arrow Left" -msgstr "Seta para Esquerda" - -msgid "Move selection 10mm in negative X direction" -msgstr "Mover seleção 10mm na direção X negativa" - -msgctxt "Keyboard Shortcut" -msgid "Arrow Right" -msgstr "Seta para Direita" - -msgid "Move selection 10mm in positive X direction" -msgstr "Mover seleção 10mm na direção X positiva" +msgid "Keyboard 1-9: set filament for object/part" +msgstr "Teclado 1-9: ajustar filamento para objeto/peça" msgid "Movement step set to 1mm" msgstr "Passo de movimento definido para 1mm" -msgid "Keyboard 1-9: set filament for object/part" -msgstr "Teclado 1-9: ajustar filamento para objeto/peça" +msgid "Movement in camera space" +msgstr "Movimento no espaço da câmera" -msgid "Camera view - Default" -msgstr "Vista da câmera - Padrão" +msgid "Middle mouse" +msgstr "" -msgid "Camera view - Top" -msgstr "Vista da câmera - Superior" +msgid "Right mouse" +msgstr "" -msgid "Camera view - Bottom" -msgstr "Vista da câmera - Inferior" +msgid "Zoom View" +msgstr "Aproximar Vista" -msgid "Camera view - Front" -msgstr "Vista da câmera - Frontal" +msgid "Painting" +msgstr "" -msgid "Camera view - Behind" -msgstr "Vista da câmera - Posterior" - -msgid "Camera Angle - Left side" -msgstr "Ângulo da câmera - Lado esquerdo" - -msgid "Camera Angle - Right side" -msgstr "Ângulo da câmera - Lado direito" - -msgid "Select all objects" -msgstr "Selecionar todos os objetos" - -msgid "Gizmo move" -msgstr "Gizmo mover" - -msgid "Gizmo rotate" -msgstr "Gizmo rotacionar" - -msgid "Gizmo scale" -msgstr "Gizmo escala" - -msgid "Gizmo place face on bed" -msgstr "Gizmo posicionar face na mesa" - -msgid "Gizmo cut" -msgstr "Gizmo cortar" - -msgid "Gizmo mesh boolean" -msgstr "Gizmo malha booleana" - -msgid "Gizmo FDM paint-on fuzzy skin" -msgstr "Gizmo de pintura de textura difusa FDM" - -msgid "Gizmo SLA support points" -msgstr "Gizmo de pontos de suporte SLA" - -msgid "Gizmo FDM paint-on seam" -msgstr "Gizmo de pintura de costura FDM" - -msgid "Gizmo text emboss/engrave" -msgstr "Gizmo Texturizar/gravar texto" - -msgid "Gizmo measure" -msgstr "Gizmo medir" - -msgid "Gizmo assemble" -msgstr "Gizmo montar" - -msgid "Gizmo brim ears" -msgstr "Gizmo orelhas da borda" - -msgid "Zoom in" -msgstr "Aproximar zoom" - -msgid "Zoom out" -msgstr "Afastar zoom" - -msgid "Toggle printable for object/part" -msgstr "Alternar modo de impressão para objeto/peça" - -msgctxt "Keyboard Shortcut" -msgid "Tab" -msgstr "Tab" - -msgid "Switch between Prepare/Preview" -msgstr "Alternar entre Preparar/Pré-visualizar" - -msgid "Plater" -msgstr "Mesa" +msgid "Available while a painting gizmo is open: supports, seam, fuzzy skin or color painting." +msgstr "" msgid "Move: press to snap by 1mm" msgstr "Mover: pressione para ajustar em 1mm" @@ -12048,14 +11966,18 @@ msgstr "Suporte/Pintura em cores: ajustar o raio da caneta" msgid "Support/Color Painting: adjust section position" msgstr "Suporte/Pintura em cores: ajustar a posição da seção" -msgid "Gizmo" -msgstr "Gizmo" +msgid "Objects list" +msgstr "Lista de objetos" + +msgid "Available while the object list has focus." +msgstr "" msgid "Set extruder number for the objects and parts" msgstr "Definir o número da extrusora para os objetos e peças" -msgid "Delete objects, parts, modifiers" -msgstr "Excluir objetos, peças, modificadores" +msgctxt "Keyboard Shortcut" +msgid "Space" +msgstr "Espaço" msgid "Select the object/part and press space to change the name" msgstr "Selecione o objeto/peça e pressione espaço para mudar o nome" @@ -12066,43 +11988,48 @@ msgstr "Clique do mouse" msgid "Select the object/part and mouse click to change the name" msgstr "Selecione o objeto/peça e clique do mouse para mudar o nome" -msgid "Objects List" -msgstr "Lista de Objetos" - -msgid "Vertical slider - Move active thumb Up" -msgstr "Controle deslizante vertical - Mover o polegar ativo para cima" - -msgid "Vertical slider - Move active thumb Down" -msgstr "Controle deslizante vertical - Mover o polegar ativo para baixo" - -msgid "Horizontal slider - Move active thumb Left" -msgstr "Controle deslizante horizontal - Mover o polegar ativo para a esquerda" - -msgid "Horizontal slider - Move active thumb Right" -msgstr "Controle deslizante horizontal - Mover o polegar ativo para a direita" - -msgid "On/Off one layer mode of the vertical slider" -msgstr "Ativar/Desativar modo de uma camada do controle deslizante vertical" - -msgid "On/Off G-code window" -msgstr "Ativar/Desativar janela de G-code" +msgid "Available while the 3D view on the Preview tab has focus." +msgstr "" msgid "Move slider 5x faster" msgstr "Mover o controle deslizante 5 vezes mais rápido" -msgctxt "Keyboard Shortcut" -msgid "Home" -msgstr "Home" +msgid "Scroll slider 5x faster" +msgstr "" -msgid "Horizontal slider - Move to start position" -msgstr "Barra deslizante horizontal — Mover para a posição inicial" +msgid "Not customizable" +msgstr "" -msgctxt "Keyboard Shortcut" -msgid "End" -msgstr "End" +#, c-format, boost-format +msgid "%s is assigned to %s. Reassign it to %s?" +msgstr "" -msgid "Horizontal slider - Move to last position" -msgstr "Barra deslizante horizontal — Mover para a última posição" +#, c-format, boost-format +msgid "The default %s is assigned to %s. Reassign it to %s?" +msgstr "" + +msgid "Global shortcuts also apply while typing." +msgstr "" + +msgid "A key that types a character cannot be a global shortcut." +msgstr "" + +msgid "Esc cancels, Enter confirms." +msgstr "" + +#, c-format, boost-format +msgid "" +"Press the new shortcut for\n" +"\"%s\"" +msgstr "" + +#, c-format, boost-format +msgid "Already used as a step of %s." +msgstr "" + +#, c-format, boost-format +msgid "Already assigned to %s. Press OK to reassign it." +msgstr "" msgid "Release Note" msgstr "Nota de lançamento" @@ -16888,8 +16815,8 @@ msgstr "Passos de pré-aquecimento" msgid "Insert multiple preheat commands (e.g. M104.1). Only useful for Prusa XL. For other printers, please set it to 1." msgstr "Insire múltiplos comandos de pré-aquecimento (ex.: M104.1). Útil apenas para Prusa XL. Para outras impressoras, defina como 1." -msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." -msgstr "Código G escrito no início do arquivo de saída, antes de qualquer outro conteúdo. Útil para adicionar metadados que o firmware da impressora lê das primeiras linhas do arquivo (ex.: tempo estimado de impressão, consumo de filamento). Suporta marcadores como {print_time_sec} e {used_filament_length}." +msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_total_sec}, {print_time_day}, {print_time_hour}, {print_time_minute}, {print_time_sec} and {used_filament_length}." +msgstr "" msgid "Start G-code" msgstr "G-code Inicial" @@ -18389,12 +18316,36 @@ msgstr "Fil. usado" msgid "Total length of filament used in the print." msgstr "Comprimento total de filamento usado na impressão." -msgid "Print time (seconds)" -msgstr "Tempo de impressão (segundos)" +msgid "Print time (total seconds)" +msgstr "" msgid "Total estimated print time in seconds. Replaced with actual value during post-processing." msgstr "Tempo total estimado de impressão em segundos. Substituído pelo valor real durante o pós-processamento." +msgid "Print time (days component)" +msgstr "" + +msgid "Estimated print time day component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (hours component)" +msgstr "" + +msgid "Estimated print time hour component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (minutes component)" +msgstr "" + +msgid "Estimated print time minute component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (seconds component)" +msgstr "" + +msgid "Estimated print time second component (normal mode). Replaced with actual value during post-processing." +msgstr "" + msgid "Filament length (meters)" msgstr "Comprimento do filamento (metros)" @@ -20218,6 +20169,9 @@ msgstr "Sessão válida não detectada. Prosseguir com o login no 3DPrinterOS?" msgid "Success!" msgstr "Sucesso!" +msgid "Generate API Key" +msgstr "" + msgid "Are you sure to log out?" msgstr "Tem certeza de que deseja sair?" @@ -21167,12 +21121,6 @@ msgstr "O Plug-in de Rede Bambu é necessário para recursos de nuvem, detecçã msgid "Error: %s" msgstr "Erro: %s" -msgid "Show details" -msgstr "Mostrar detalhes" - -msgid "Hide details" -msgstr "Esconder detalhes" - msgid "Version to install:" msgstr "Versão para instalar:" @@ -23756,6 +23704,12 @@ msgstr "" msgid "No binding for that field" msgstr "" +msgid "Enter a number" +msgstr "" + +msgid "Not a number" +msgstr "" + msgid "Primitive" msgstr "" @@ -23768,6 +23722,210 @@ msgstr "" msgid "Clear All" msgstr "" +msgctxt "Keyboard Shortcut" +msgid "Ins" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "Home" +msgstr "Home" + +msgctxt "Keyboard Shortcut" +msgid "End" +msgstr "End" + +msgctxt "Keyboard Shortcut" +msgid "PgUp" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "PgDn" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "Arrow Left" +msgstr "Seta para Esquerda" + +msgctxt "Keyboard Shortcut" +msgid "Arrow Right" +msgstr "Seta para Direita" + +msgctxt "Keyboard Shortcut" +msgid "Arrow Up" +msgstr "Seta para Cima" + +msgctxt "Keyboard Shortcut" +msgid "Arrow Down" +msgstr "Seta para Baixo" + +msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" +msgstr "Importar dados de geometria de arquivos STL/STEP/3MF/OBJ/AMF" + +msgid "Select all objects" +msgstr "Selecionar todos os objetos" + +msgid "Paste from clipboard" +msgstr "Colar da área de transferência" + +msgid "Toggle printable for object/part" +msgstr "Alternar modo de impressão para objeto/peça" + +msgid "Move selection 10mm in negative X direction" +msgstr "Mover seleção 10mm na direção X negativa" + +msgid "Move selection 10mm in positive X direction" +msgstr "Mover seleção 10mm na direção X positiva" + +msgid "Move selection 10mm in positive Y direction" +msgstr "Mover seleção 10mm na direção Y positiva" + +msgid "Move selection 10mm in negative Y direction" +msgstr "Mover seleção 10mm na direção Y negativa" + +msgid "Rotate selection 45 degrees counterclockwise" +msgstr "" + +msgid "Rotate selection 45 degrees clockwise" +msgstr "" + +msgid "Gizmo move" +msgstr "Gizmo mover" + +msgid "Gizmo rotate" +msgstr "Gizmo rotacionar" + +msgid "Gizmo scale" +msgstr "Gizmo escala" + +msgid "Gizmo place face on bed" +msgstr "Gizmo posicionar face na mesa" + +msgid "Gizmo cut" +msgstr "Gizmo cortar" + +msgid "Gizmo mesh boolean" +msgstr "Gizmo malha booleana" + +msgid "Gizmo FDM paint-on supports" +msgstr "" + +msgid "Gizmo FDM paint-on seam" +msgstr "Gizmo de pintura de costura FDM" + +msgid "Gizmo FDM paint-on fuzzy skin" +msgstr "Gizmo de pintura de textura difusa FDM" + +msgid "Gizmo multi-material painting" +msgstr "" + +msgid "Gizmo text emboss/engrave" +msgstr "Gizmo Texturizar/gravar texto" + +msgid "Gizmo measure" +msgstr "Gizmo medir" + +msgid "Gizmo assemble" +msgstr "Gizmo montar" + +msgid "Gizmo brim ears" +msgstr "Gizmo orelhas da borda" + +msgid "Vertical slider - Move active thumb Up" +msgstr "Controle deslizante vertical - Mover o polegar ativo para cima" + +msgid "Vertical slider - Move active thumb Down" +msgstr "Controle deslizante vertical - Mover o polegar ativo para baixo" + +msgid "Horizontal slider - Move active thumb Left" +msgstr "Controle deslizante horizontal - Mover o polegar ativo para a esquerda" + +msgid "Horizontal slider - Move active thumb Right" +msgstr "Controle deslizante horizontal - Mover o polegar ativo para a direita" + +msgid "Horizontal slider - Move to start position" +msgstr "Barra deslizante horizontal — Mover para a posição inicial" + +msgid "Horizontal slider - Move to last position" +msgstr "Barra deslizante horizontal — Mover para a última posição" + +msgid "Camera view - Default" +msgstr "Vista da câmera - Padrão" + +msgid "Camera view - Top" +msgstr "Vista da câmera - Superior" + +msgid "Camera view - Bottom" +msgstr "Vista da câmera - Inferior" + +msgid "Camera view - Front" +msgstr "Vista da câmera - Frontal" + +msgid "Camera view - Behind" +msgstr "Vista da câmera - Posterior" + +msgid "Camera Angle - Left side" +msgstr "Ângulo da câmera - Lado esquerdo" + +msgid "Camera Angle - Right side" +msgstr "Ângulo da câmera - Lado direito" + +msgid "Camera view - Current plate" +msgstr "" + +msgid "Zoom in" +msgstr "Aproximar zoom" + +msgid "Zoom out" +msgstr "Afastar zoom" + +msgid "Show/Hide 3Dconnexion devices settings dialog" +msgstr "Mostrar/Ocultar diálogo de configurações de dispositivos 3Dconnexion" + +msgid "Show/Hide wireframe" +msgstr "" + +msgid "On/Off G-code window" +msgstr "Ativar/Desativar janela de G-code" + +msgid "On/Off one layer mode of the vertical slider" +msgstr "Ativar/Desativar modo de uma camada do controle deslizante vertical" + +msgid "Switch between Prepare/Preview" +msgstr "Alternar entre Preparar/Pré-visualizar" + +msgid "Collapse/Expand the sidebar" +msgstr "Recolher/Expandir a barra lateral" + +msgid "Open the speed dial" +msgstr "" + +msgid "Reload the device page" +msgstr "" + +msgid "Show keyboard shortcuts list" +msgstr "Mostrar lista de atalhos de teclado" + +msgid "Slicing and printing" +msgstr "" + +msgid "Editing" +msgstr "" + +msgid "Placement" +msgstr "" + +msgid "Gizmos" +msgstr "" + +msgid "Sliders" +msgstr "" + +msgid "Painting tools" +msgstr "" + +msgid "Application" +msgstr "" + #: resources/data/hints.ini: [hint:Precise wall] msgid "" "Precise wall\n" @@ -24068,6 +24226,62 @@ msgstr "" "Evitar empenamento\n" "Você sabia que ao imprimir materiais propensos ao empenamento como ABS, aumentar adequadamente a temperatura da mesa aquecida pode reduzir a probabilidade de empenamento?" +#~ msgid "Tab" +#~ msgstr "Tab" + +#~ msgid "Displays current viewport FPS in the top-right corner." +#~ msgstr "Exibe o FPS atual da janela de visualização no canto superior direito." + +# AI Translated +#~ msgid "Publish 3MF Wiki" +#~ msgstr "Documentação de Publicar 3MF" + +# AI Translated +#~ msgid "Publish 3MF Video Guide" +#~ msgstr "Guia em vídeo de Publicar 3MF" + +#~ msgid "Toolbar" +#~ msgstr "Barra de Ferramentas" + +#~ msgid "Switch table page" +#~ msgstr "Trocar página da tabela" + +#~ msgid "Global shortcuts" +#~ msgstr "Atalhos globais" + +#~ msgid "Middle mouse button" +#~ msgstr "Botão do meio do mouse" + +#~ msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." +#~ msgstr "Orienta automaticamente os objetos selecionados ou todos os objetos. Se houver objetos selecionados, ele apenas orientará os selecionados. Caso contrário, ele orientará todos os objetos do projeto atual." + +#~ msgid "Auto orients all objects on the active plate." +#~ msgstr "Orienta automaticamente todos os objetos na placa atual." + +#~ msgid "Any arrow" +#~ msgstr "Qualquer seta" + +#~ msgid "Gizmo SLA support points" +#~ msgstr "Gizmo de pontos de suporte SLA" + +#~ msgid "Plater" +#~ msgstr "Mesa" + +#~ msgid "Gizmo" +#~ msgstr "Gizmo" + +#~ msgid "Delete objects, parts, modifiers" +#~ msgstr "Excluir objetos, peças, modificadores" + +#~ msgid "Objects List" +#~ msgstr "Lista de Objetos" + +#~ msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." +#~ msgstr "Código G escrito no início do arquivo de saída, antes de qualquer outro conteúdo. Útil para adicionar metadados que o firmware da impressora lê das primeiras linhas do arquivo (ex.: tempo estimado de impressão, consumo de filamento). Suporta marcadores como {print_time_sec} e {used_filament_length}." + +#~ msgid "Print time (seconds)" +#~ msgstr "Tempo de impressão (segundos)" + #~ msgid "Open actions speed dial" #~ msgstr "Abrir menu rápido de ações" diff --git a/localization/i18n/ru/OrcaSlicer_ru.po b/localization/i18n/ru/OrcaSlicer_ru.po index 6b28f87f7e..2d35c31a26 100644 --- a/localization/i18n/ru/OrcaSlicer_ru.po +++ b/localization/i18n/ru/OrcaSlicer_ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: OrcaSlicer V2.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-09-18 15:50+0800\n" +"POT-Creation-Date: 2026-09-22 17:02+0800\n" "PO-Revision-Date: 2026-02-25 13:38+0300\n" "Last-Translator: Felix14_v2\n" "Language-Team: Felix14_v2 (ДС/ТГ: @felix14_v2, почта: aleks111001@list.ru), Andylg \n" @@ -5938,12 +5938,15 @@ msgctxt "Camera View" msgid "Right" msgstr "Справа" -msgid "Add" -msgstr "Добавить" - msgid "Add plate" msgstr "Добавить стол" +msgid "Split to objects" +msgstr "Разделить на модели" + +msgid "Add" +msgstr "Добавить" + msgid "Auto orient all/selected objects" msgstr "Положить все/выбранные модели" @@ -5956,9 +5959,6 @@ msgstr "Расставить все модели" msgid "Arrange objects on selected plates" msgstr "Расставить модели на активном столе" -msgid "Split to objects" -msgstr "Разделить на модели" - msgid "Assembly View" msgstr "Сборочный вид" @@ -6018,6 +6018,9 @@ msgstr "Обводка выбранного" msgid "Wireframe" msgstr "Сетка модели" +msgid "X-Ray" +msgstr "" + msgid "Realistic View" msgstr "Продвинутая графика" @@ -6594,9 +6597,6 @@ msgstr "Отображение контура вокруг выбранных м msgid "Preferences" msgstr "Настройки" -msgid "Open speed dial..." -msgstr "" - msgctxt "Menu" msgid "Edit" msgstr "Правка" @@ -6604,6 +6604,9 @@ msgstr "Правка" msgid "View" msgstr "Вид" +msgid "Open Speed Dial" +msgstr "" + msgid "Preset Bundle" msgstr "Пакет профилей" @@ -8405,11 +8408,6 @@ msgstr "Развернуть боковую панель" msgid "Collapse sidebar" msgstr "Свернуть боковую панель" -# Название кнопки на клавиатуре, на момент 2.3.2 используется в 5 местах в -# значении названия кнопки -msgid "Tab" -msgstr "Tab" - #, c-format, boost-format msgid "Loading file: %s" msgstr "Загрузка файла: %s" @@ -9433,10 +9431,10 @@ msgstr "Управление несколькими устройствами Bam msgid "With this option enabled, you can send a task to multiple devices at the same time and manage multiple devices." msgstr "Если включено, вы сможете управлять несколькими устройствами и отправлять задания на печать на несколько устройств одновременно." -msgid "Open the Speed Dial with the Space key" +msgid "Open the Speed Dial from the keyboard" msgstr "" -msgid "When enabled, pressing Space (with no other key held) opens the Speed Dial action search from any page." +msgid "When enabled, the Speed Dial keyboard shortcut (Space by default) opens the action search from any page." msgstr "" msgid "Recent actions" @@ -9571,6 +9569,15 @@ msgstr "Перетаскивание правой кнопкой мыши" msgid "Set the action that dragging the right mouse button should perform." msgstr "Действие при перемещении курсора с зажатой правой кнопкой мыши." +msgid "Keyboard" +msgstr "" + +msgid "Keyboard shortcuts" +msgstr "" + +msgid "Choose the key for each action." +msgstr "" + msgid "Clear my choice on..." msgstr "Сброс выбора по умолчанию" @@ -9685,11 +9692,39 @@ msgstr "" "Ограничить частоту отрисовки рабочего пространства для снижения энергопотребления и нагрузки на ГП.\n" "0 – не ограничивать частоту кадров." +msgid "Reuse the 3D scene while idle" +msgstr "" + +msgid "" +"Skips redrawing the 3D scene when only the mouse cursor moves over the viewport,\n" +"and reuses the previous frame's scene instead. Reduces GPU load.\n" +"Disable it if the viewport shows stale or missing contents.\n" +"\n" +"Takes effect immediately." +msgstr "" + +msgid "Skip unchanged frames" +msgstr "" + +msgid "" +"Skips drawing a frame altogether when it would be identical to the one already on screen.\n" +"Only applies to frames that reuse the 3D scene, so it needs Reuse the 3D scene while idle.\n" +"Disable it if a hover highlight, tooltip or animation stops updating.\n" +"\n" +"Takes effect immediately." +msgstr "" + msgid "Show FPS overlay" msgstr "Отображать частоту кадров" -msgid "Displays current viewport FPS in the top-right corner." -msgstr "Выводить частоту кадров рабочего пространства в правом верхнем углу." +msgid "Displays rendering counts in the top-right corner of the viewport." +msgstr "" + +msgid "FPS: frames presented to the screen per second." +msgstr "" + +msgid "3D: frames per second that redrew the 3D scene." +msgstr "" msgid "G-code Preview" msgstr "Просмотр нарезки" @@ -10151,13 +10186,8 @@ msgstr "Опубликовать 3MF..." msgid "Select which settings to be published in the 3MF file" msgstr "Выберите, какие настройки будут опубликованы в файле 3MF" -# AI Translated -msgid "Publish 3MF Wiki" -msgstr "Wiki по публикации 3MF" - -# AI Translated -msgid "Publish 3MF Video Guide" -msgstr "Видеоруководство по публикации 3MF" +msgid "Video Guide" +msgstr "" # AI Translated msgid "Mixed filament - published as a whole when \"Enable\" above is selected" @@ -10363,6 +10393,13 @@ msgstr "" msgid "No wiki page for this action" msgstr "" +msgid "Show details" +msgstr "Подробнее" + +# В информации о сетевом плагине +msgid "Hide details" +msgstr "Скрыть подробности" + #, c-format, boost-format msgid "\"%s\" is a Developer setting. Enable Developer mode to edit it?" msgstr "" @@ -12206,66 +12243,38 @@ msgstr "Пакет профилей был изменён при предыду msgid "Configuration package changed" msgstr "Пакет профилей изменён" -msgid "Toolbar" -msgstr "Панель инструментов" - -msgid "Objects list" -msgstr "Список моделей" - -msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" -msgstr "Импорт геометрических данных из STL/STEP/3MF/OBJ/AMF файлов" - -msgid "Paste from clipboard" -msgstr "Вставить из буфера обмена" - -msgid "Show/Hide 3Dconnexion devices settings dialog" -msgstr "Показать/скрыть диалоговое окно настроек и устройств 3Dconnexion" - -msgid "Switch table page" -msgstr "Переключение между вкладками" - -msgctxt "Keyboard Shortcut" -msgid "Space" -msgstr "Пробел" - -msgid "Open speed dial" -msgstr "" - -msgid "Run a Speed Dial favourite (while the Speed Dial is open)" -msgstr "" - -msgid "Show keyboard shortcuts list" -msgstr "Показать список сочетаний клавиш" - -msgid "Global shortcuts" -msgstr "Глобальные горячие клавиши" - msgid "Pan View" msgstr "Перемещение камеры" msgid "Rotate View" msgstr "Вращение камеры" -msgid "Middle mouse button" -msgstr "Средняя кнопка мыши" +#, c-format, boost-format +msgid "Use %s or %s, or a key that does not type a character." +msgstr "" -msgid "Zoom View" -msgstr "Масштабирование вида" +msgctxt "Keyboard Shortcut" +msgid "Key" +msgstr "" -msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." -msgstr "Попытаться положить модели на стол. При выборе отдельных моделей операция применяется только к ним." +msgid "Left mouse" +msgstr "" -msgid "Auto orients all objects on the active plate." -msgstr "Положить все модели только на активном столе" +msgid "Available anywhere in the window, even while typing in a text field." +msgstr "" -msgid "Collapse/Expand the sidebar" -msgstr "Свернуть/развернуть боковую панель" +msgid "Run a speed dial favorite while the dial is open" +msgstr "" -msgid "Any arrow" -msgstr "Любая стрелка" +msgctxt "Keyboard Shortcut" +msgid "Tab" +msgstr "Tab" -msgid "Movement in camera space" -msgstr "Перемещение выбранного по отношению к камере" +msgid "Switch to the next main tab" +msgstr "" + +msgid "Available while the 3D view on the Prepare tab has focus." +msgstr "" msgid "Select a part" msgstr "Выбор части модели" @@ -12276,123 +12285,29 @@ msgstr "Выбор нескольких моделей" msgid "Select objects by rectangle" msgstr "Выбор прямоугольником" -msgctxt "Keyboard Shortcut" -msgid "Arrow Up" -msgstr "Стрелка вверх" - -msgid "Move selection 10mm in positive Y direction" -msgstr "Перемещение выбранного на +10 мм по оси Y" - -msgctxt "Keyboard Shortcut" -msgid "Arrow Down" -msgstr "Стрелка вниз" - -msgid "Move selection 10mm in negative Y direction" -msgstr "Перемещение выбранного на -10 мм по оси Y" - -msgctxt "Keyboard Shortcut" -msgid "Arrow Left" -msgstr "Стрелка влево" - -msgid "Move selection 10mm in negative X direction" -msgstr "Перемещение выбранного на -10 мм по оси X" - -msgctxt "Keyboard Shortcut" -msgid "Arrow Right" -msgstr "Стрелка вправо" - -msgid "Move selection 10mm in positive X direction" -msgstr "Перемещение выбранного на +10 мм по оси X" +msgid "Keyboard 1-9: set filament for object/part" +msgstr "Клавиши 1-9: задать материал для модели/части модели" msgid "Movement step set to 1mm" msgstr "Зафиксировать шаг перемещения на 1 мм" -msgid "Keyboard 1-9: set filament for object/part" -msgstr "Клавиши 1-9: задать материал для модели/части модели" +msgid "Movement in camera space" +msgstr "Перемещение выбранного по отношению к камере" -msgid "Camera view - Default" -msgstr "Камера по умолчанию" +msgid "Middle mouse" +msgstr "" -msgid "Camera view - Top" -msgstr "Камера сверху" +msgid "Right mouse" +msgstr "" -msgid "Camera view - Bottom" -msgstr "Камера снизу" +msgid "Zoom View" +msgstr "Масштабирование вида" -msgid "Camera view - Front" -msgstr "Камера спереди" +msgid "Painting" +msgstr "" -msgid "Camera view - Behind" -msgstr "Камера сзади" - -msgid "Camera Angle - Left side" -msgstr "Камера слева" - -msgid "Camera Angle - Right side" -msgstr "Камера справа" - -msgid "Select all objects" -msgstr "Выбрать все модели" - -msgid "Gizmo move" -msgstr "Инструмент перемещения" - -msgid "Gizmo rotate" -msgstr "Инструмент вращения" - -msgid "Gizmo scale" -msgstr "Инструмент масштабирования" - -msgid "Gizmo place face on bed" -msgstr "Выбор контактной поверхности" - -msgid "Gizmo cut" -msgstr "Инструмент разрезания" - -msgid "Gizmo mesh boolean" -msgstr "Булевы операции" - -msgid "Gizmo FDM paint-on fuzzy skin" -msgstr "Рисование нечёткой оболочки" - -msgid "Gizmo SLA support points" -msgstr "Размещение поддержек (SLA)" - -msgid "Gizmo FDM paint-on seam" -msgstr "Рисование шва (FDM)" - -msgid "Gizmo text emboss/engrave" -msgstr "Инструмент размещения текста" - -msgid "Gizmo measure" -msgstr "Инструмент измерения" - -msgid "Gizmo assemble" -msgstr "Размещение частей сборки" - -msgid "Gizmo brim ears" -msgstr "Размещение «мышиных ушек»" - -msgid "Zoom in" -msgstr "Приблизить" - -msgid "Zoom out" -msgstr "Отдалить" - -# Ошибка в оригинале – переключить печать частей невозможно, функция работает только для всей сборки -msgid "Toggle printable for object/part" -msgstr "Переключить печать модели" - -msgctxt "Keyboard Shortcut" -msgid "Tab" -msgstr "Tab" - -msgid "Switch between Prepare/Preview" -msgstr "Переключение между подготовкой и просмотром нарезки" - -# Plater – это название библиотеки. Используется в меню горячих клавиш в качестве заголовка сочетаний клавиш, которые работают внутри пространства Plater. Как минимум на Windows не отображается. -msgid "Plater" -msgstr "Рабочая область" +msgid "Available while a painting gizmo is open: supports, seam, fuzzy skin or color painting." +msgstr "" msgid "Move: press to snap by 1mm" msgstr "Перемещение: Фиксация перемещения на 1 мм" @@ -12403,14 +12318,18 @@ msgstr "Рисование поддержек/Шва/Покраски: регу msgid "Support/Color Painting: adjust section position" msgstr "Рисование поддержек/Шва/Покраски: регулировка положения сечения" -msgid "Gizmo" -msgstr "Инструмент" +msgid "Objects list" +msgstr "Список моделей" + +msgid "Available while the object list has focus." +msgstr "" msgid "Set extruder number for the objects and parts" msgstr "Задать номер экструдера для моделей/частей" -msgid "Delete objects, parts, modifiers" -msgstr "Удаление моделей, частей, модификаторов" +msgctxt "Keyboard Shortcut" +msgid "Space" +msgstr "Пробел" msgid "Select the object/part and press space to change the name" msgstr "Выберите модель/часть и нажмите пробел, чтобы изменить имя" @@ -12421,43 +12340,48 @@ msgstr "Левая кнопка мыши" msgid "Select the object/part and mouse click to change the name" msgstr "Выберите модель/часть и нажмите левую клавишу мыши, чтобы изменить имя" -msgid "Objects List" -msgstr "Список моделей" - -msgid "Vertical slider - Move active thumb Up" -msgstr "Вертикальный ползунок - Сдвинуть активный ползунок вверх" - -msgid "Vertical slider - Move active thumb Down" -msgstr "Вертикальный ползунок - Сдвинуть активный ползунок вниз" - -msgid "Horizontal slider - Move active thumb Left" -msgstr "Горизонтальный ползунок - Сдвинуть активный ползунок влево" - -msgid "Horizontal slider - Move active thumb Right" -msgstr "Горизонтальный ползунок - Сдвинуть активный ползунок вправо" - -msgid "On/Off one layer mode of the vertical slider" -msgstr "Включение/отключение функции «Режим одного слоя» у вертикального ползунка" - -msgid "On/Off G-code window" -msgstr "Показать/скрыть окно отображения G-кода" +msgid "Available while the 3D view on the Preview tab has focus." +msgstr "" msgid "Move slider 5x faster" msgstr "Перемещение ползунка быстрее в 5 раз" -msgctxt "Keyboard Shortcut" -msgid "Home" -msgstr "Home" +msgid "Scroll slider 5x faster" +msgstr "" -msgid "Horizontal slider - Move to start position" -msgstr "Горизонтальный ползунок - перемещение в начальную позицию" +msgid "Not customizable" +msgstr "" -msgctxt "Keyboard Shortcut" -msgid "End" -msgstr "End" +#, c-format, boost-format +msgid "%s is assigned to %s. Reassign it to %s?" +msgstr "" -msgid "Horizontal slider - Move to last position" -msgstr "Горизонтальный ползунок - перемещение в конечную позицию" +#, c-format, boost-format +msgid "The default %s is assigned to %s. Reassign it to %s?" +msgstr "" + +msgid "Global shortcuts also apply while typing." +msgstr "" + +msgid "A key that types a character cannot be a global shortcut." +msgstr "" + +msgid "Esc cancels, Enter confirms." +msgstr "" + +#, c-format, boost-format +msgid "" +"Press the new shortcut for\n" +"\"%s\"" +msgstr "" + +#, c-format, boost-format +msgid "Already used as a step of %s." +msgstr "" + +#, c-format, boost-format +msgid "Already assigned to %s. Press OK to reassign it." +msgstr "" msgid "Release Note" msgstr "Информация о версии" @@ -17716,8 +17640,8 @@ msgstr "Шагов преднагрева" msgid "Insert multiple preheat commands (e.g. M104.1). Only useful for Prusa XL. For other printers, please set it to 1." msgstr "Задание нескольких команд преднагрева (например, M104.1). Полезно только для Prusa XL. Для других принтеров установите значение 1." -msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." -msgstr "Код для вставки в первые строки файла (перед началом всего остального содержимого). Полезно для добавления метаданных для считывания прошивкой принтера, таких как время печати или расход материала. Можно использовать вставку переменных (например, {print_time_sec} и {used_filament_length} соответственно)." +msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_total_sec}, {print_time_day}, {print_time_hour}, {print_time_minute}, {print_time_sec} and {used_filament_length}." +msgstr "" msgid "Start G-code" msgstr "Стартовый G-код" @@ -19394,8 +19318,8 @@ msgstr "Расход прутка" msgid "Total length of filament used in the print." msgstr "Общая длина прутка, затрачиваемая для печати." -msgid "Print time (seconds)" -msgstr "Время печати (в секундах)" +msgid "Print time (total seconds)" +msgstr "" # Пользователи даже не знают, что и как там слайсер у себя под капотом пост- # процессит после генерации кода до его парсинга и визуализации, не нужно этим @@ -19403,6 +19327,30 @@ msgstr "Время печати (в секундах)" msgid "Total estimated print time in seconds. Replaced with actual value during post-processing." msgstr "Оценка полного времени печати (в секундах). Заменяется числом при генерации G-кода." +msgid "Print time (days component)" +msgstr "" + +msgid "Estimated print time day component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (hours component)" +msgstr "" + +msgid "Estimated print time hour component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (minutes component)" +msgstr "" + +msgid "Estimated print time minute component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (seconds component)" +msgstr "" + +msgid "Estimated print time second component (normal mode). Replaced with actual value during post-processing." +msgstr "" + msgid "Filament length (meters)" msgstr "Длина материала (в метрах)" @@ -21277,6 +21225,9 @@ msgstr "Недействительная сессия. Выполнить вхо msgid "Success!" msgstr "Успешно!" +msgid "Generate API Key" +msgstr "" + # ??? Вы уверены, что хотите разлогиниться, Вы уверены, что хотите выйти из # аккаунта?" msgid "Are you sure to log out?" @@ -22243,13 +22194,6 @@ msgstr "Для удалённой печати, облачных функций msgid "Error: %s" msgstr "Ошибка: %s" -msgid "Show details" -msgstr "Подробнее" - -# В информации о сетевом плагине -msgid "Hide details" -msgstr "Скрыть подробности" - msgid "Version to install:" msgstr "Версия для установки:" @@ -24855,6 +24799,12 @@ msgstr "" msgid "No binding for that field" msgstr "" +msgid "Enter a number" +msgstr "" + +msgid "Not a number" +msgstr "" + msgid "Primitive" msgstr "" @@ -24867,6 +24817,211 @@ msgstr "" msgid "Clear All" msgstr "" +msgctxt "Keyboard Shortcut" +msgid "Ins" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "Home" +msgstr "Home" + +msgctxt "Keyboard Shortcut" +msgid "End" +msgstr "End" + +msgctxt "Keyboard Shortcut" +msgid "PgUp" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "PgDn" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "Arrow Left" +msgstr "Стрелка влево" + +msgctxt "Keyboard Shortcut" +msgid "Arrow Right" +msgstr "Стрелка вправо" + +msgctxt "Keyboard Shortcut" +msgid "Arrow Up" +msgstr "Стрелка вверх" + +msgctxt "Keyboard Shortcut" +msgid "Arrow Down" +msgstr "Стрелка вниз" + +msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" +msgstr "Импорт геометрических данных из STL/STEP/3MF/OBJ/AMF файлов" + +msgid "Select all objects" +msgstr "Выбрать все модели" + +msgid "Paste from clipboard" +msgstr "Вставить из буфера обмена" + +# Ошибка в оригинале – переключить печать частей невозможно, функция работает только для всей сборки +msgid "Toggle printable for object/part" +msgstr "Переключить печать модели" + +msgid "Move selection 10mm in negative X direction" +msgstr "Перемещение выбранного на -10 мм по оси X" + +msgid "Move selection 10mm in positive X direction" +msgstr "Перемещение выбранного на +10 мм по оси X" + +msgid "Move selection 10mm in positive Y direction" +msgstr "Перемещение выбранного на +10 мм по оси Y" + +msgid "Move selection 10mm in negative Y direction" +msgstr "Перемещение выбранного на -10 мм по оси Y" + +msgid "Rotate selection 45 degrees counterclockwise" +msgstr "" + +msgid "Rotate selection 45 degrees clockwise" +msgstr "" + +msgid "Gizmo move" +msgstr "Инструмент перемещения" + +msgid "Gizmo rotate" +msgstr "Инструмент вращения" + +msgid "Gizmo scale" +msgstr "Инструмент масштабирования" + +msgid "Gizmo place face on bed" +msgstr "Выбор контактной поверхности" + +msgid "Gizmo cut" +msgstr "Инструмент разрезания" + +msgid "Gizmo mesh boolean" +msgstr "Булевы операции" + +msgid "Gizmo FDM paint-on supports" +msgstr "" + +msgid "Gizmo FDM paint-on seam" +msgstr "Рисование шва (FDM)" + +msgid "Gizmo FDM paint-on fuzzy skin" +msgstr "Рисование нечёткой оболочки" + +msgid "Gizmo multi-material painting" +msgstr "" + +msgid "Gizmo text emboss/engrave" +msgstr "Инструмент размещения текста" + +msgid "Gizmo measure" +msgstr "Инструмент измерения" + +msgid "Gizmo assemble" +msgstr "Размещение частей сборки" + +msgid "Gizmo brim ears" +msgstr "Размещение «мышиных ушек»" + +msgid "Vertical slider - Move active thumb Up" +msgstr "Вертикальный ползунок - Сдвинуть активный ползунок вверх" + +msgid "Vertical slider - Move active thumb Down" +msgstr "Вертикальный ползунок - Сдвинуть активный ползунок вниз" + +msgid "Horizontal slider - Move active thumb Left" +msgstr "Горизонтальный ползунок - Сдвинуть активный ползунок влево" + +msgid "Horizontal slider - Move active thumb Right" +msgstr "Горизонтальный ползунок - Сдвинуть активный ползунок вправо" + +msgid "Horizontal slider - Move to start position" +msgstr "Горизонтальный ползунок - перемещение в начальную позицию" + +msgid "Horizontal slider - Move to last position" +msgstr "Горизонтальный ползунок - перемещение в конечную позицию" + +msgid "Camera view - Default" +msgstr "Камера по умолчанию" + +msgid "Camera view - Top" +msgstr "Камера сверху" + +msgid "Camera view - Bottom" +msgstr "Камера снизу" + +msgid "Camera view - Front" +msgstr "Камера спереди" + +msgid "Camera view - Behind" +msgstr "Камера сзади" + +msgid "Camera Angle - Left side" +msgstr "Камера слева" + +msgid "Camera Angle - Right side" +msgstr "Камера справа" + +msgid "Camera view - Current plate" +msgstr "" + +msgid "Zoom in" +msgstr "Приблизить" + +msgid "Zoom out" +msgstr "Отдалить" + +msgid "Show/Hide 3Dconnexion devices settings dialog" +msgstr "Показать/скрыть диалоговое окно настроек и устройств 3Dconnexion" + +msgid "Show/Hide wireframe" +msgstr "" + +msgid "On/Off G-code window" +msgstr "Показать/скрыть окно отображения G-кода" + +msgid "On/Off one layer mode of the vertical slider" +msgstr "Включение/отключение функции «Режим одного слоя» у вертикального ползунка" + +msgid "Switch between Prepare/Preview" +msgstr "Переключение между подготовкой и просмотром нарезки" + +msgid "Collapse/Expand the sidebar" +msgstr "Свернуть/развернуть боковую панель" + +msgid "Open the speed dial" +msgstr "" + +msgid "Reload the device page" +msgstr "" + +msgid "Show keyboard shortcuts list" +msgstr "Показать список сочетаний клавиш" + +msgid "Slicing and printing" +msgstr "" + +msgid "Editing" +msgstr "" + +msgid "Placement" +msgstr "" + +msgid "Gizmos" +msgstr "" + +msgid "Sliders" +msgstr "" + +msgid "Painting tools" +msgstr "" + +msgid "Application" +msgstr "" + #: resources/data/hints.ini: [hint:Precise wall] msgid "" "Precise wall\n" @@ -25165,6 +25320,65 @@ msgstr "" "Предотвращение коробления материала\n" "Знаете ли вы, что при печати материалами, склонными к короблению, таких как ABS, повышение температуры подогреваемого стола может снизить эту вероятность?" +# Название кнопки на клавиатуре, на момент 2.3.2 используется в 5 местах в +# значении названия кнопки +#~ msgid "Tab" +#~ msgstr "Tab" + +#~ msgid "Displays current viewport FPS in the top-right corner." +#~ msgstr "Выводить частоту кадров рабочего пространства в правом верхнем углу." + +# AI Translated +#~ msgid "Publish 3MF Wiki" +#~ msgstr "Wiki по публикации 3MF" + +# AI Translated +#~ msgid "Publish 3MF Video Guide" +#~ msgstr "Видеоруководство по публикации 3MF" + +#~ msgid "Toolbar" +#~ msgstr "Панель инструментов" + +#~ msgid "Switch table page" +#~ msgstr "Переключение между вкладками" + +#~ msgid "Global shortcuts" +#~ msgstr "Глобальные горячие клавиши" + +#~ msgid "Middle mouse button" +#~ msgstr "Средняя кнопка мыши" + +#~ msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." +#~ msgstr "Попытаться положить модели на стол. При выборе отдельных моделей операция применяется только к ним." + +#~ msgid "Auto orients all objects on the active plate." +#~ msgstr "Положить все модели только на активном столе" + +#~ msgid "Any arrow" +#~ msgstr "Любая стрелка" + +#~ msgid "Gizmo SLA support points" +#~ msgstr "Размещение поддержек (SLA)" + +# Plater – это название библиотеки. Используется в меню горячих клавиш в качестве заголовка сочетаний клавиш, которые работают внутри пространства Plater. Как минимум на Windows не отображается. +#~ msgid "Plater" +#~ msgstr "Рабочая область" + +#~ msgid "Gizmo" +#~ msgstr "Инструмент" + +#~ msgid "Delete objects, parts, modifiers" +#~ msgstr "Удаление моделей, частей, модификаторов" + +#~ msgid "Objects List" +#~ msgstr "Список моделей" + +#~ msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." +#~ msgstr "Код для вставки в первые строки файла (перед началом всего остального содержимого). Полезно для добавления метаданных для считывания прошивкой принтера, таких как время печати или расход материала. Можно использовать вставку переменных (например, {print_time_sec} и {used_filament_length} соответственно)." + +#~ msgid "Print time (seconds)" +#~ msgstr "Время печати (в секундах)" + #~ msgid "Open actions speed dial" #~ msgstr "Открыть строку быстрых действий" diff --git a/localization/i18n/sv/OrcaSlicer_sv.po b/localization/i18n/sv/OrcaSlicer_sv.po index e4f3079704..e05a90846b 100644 --- a/localization/i18n/sv/OrcaSlicer_sv.po +++ b/localization/i18n/sv/OrcaSlicer_sv.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-09-18 15:50+0800\n" +"POT-Creation-Date: 2026-09-22 17:02+0800\n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -6535,12 +6535,15 @@ msgctxt "Camera View" msgid "Right" msgstr "Höger" -msgid "Add" -msgstr "Lägg till" - msgid "Add plate" msgstr "Lägg till byggplata" +msgid "Split to objects" +msgstr "Dela upp till objekt" + +msgid "Add" +msgstr "Lägg till" + msgid "Auto orient all/selected objects" msgstr "Autoorientering alla/valda objekt" @@ -6553,9 +6556,6 @@ msgstr "Ordna alla objekt" msgid "Arrange objects on selected plates" msgstr "Ordna alla objekt på vald platta" -msgid "Split to objects" -msgstr "Dela upp till objekt" - msgid "Assembly View" msgstr "Monterings vy" @@ -6617,6 +6617,9 @@ msgstr "Kontur" msgid "Wireframe" msgstr "Trådram" +msgid "X-Ray" +msgstr "" + # AI Translated msgid "Realistic View" msgstr "Realistisk vy" @@ -7202,9 +7205,6 @@ msgstr "Visa en kontur runt det markerade objektet i 3D-scenen." msgid "Preferences" msgstr "Inställningar" -msgid "Open speed dial..." -msgstr "" - # AI Translated msgctxt "Menu" msgid "Edit" @@ -7213,6 +7213,9 @@ msgstr "Redigera" msgid "View" msgstr "Vy" +msgid "Open Speed Dial" +msgstr "" + # AI Translated msgid "Preset Bundle" msgstr "Förinställningspaket" @@ -9182,10 +9185,6 @@ msgstr "Expandera sidopanelen" msgid "Collapse sidebar" msgstr "Fäll ihop sidopanelen" -# AI Translated -msgid "Tab" -msgstr "Tabb" - #, c-format, boost-format msgid "Loading file: %s" msgstr "Laddar fil: %s" @@ -10324,10 +10323,10 @@ msgstr "Hantering av flera enheter" msgid "With this option enabled, you can send a task to multiple devices at the same time and manage multiple devices." msgstr "Med det här alternativet aktiverat kan du skicka en uppgift till flera enheter samtidigt och hantera flera enheter." -msgid "Open the Speed Dial with the Space key" +msgid "Open the Speed Dial from the keyboard" msgstr "" -msgid "When enabled, pressing Space (with no other key held) opens the Speed Dial action search from any page." +msgid "When enabled, the Speed Dial keyboard shortcut (Space by default) opens the action search from any page." msgstr "" msgid "Recent actions" @@ -10481,6 +10480,15 @@ msgstr "Dra med höger musknapp" msgid "Set the action that dragging the right mouse button should perform." msgstr "Ange vilken åtgärd som ska utföras när du drar med höger musknapp." +msgid "Keyboard" +msgstr "" + +msgid "Keyboard shortcuts" +msgstr "" + +msgid "Choose the key for each action." +msgstr "" + # AI Translated msgid "Clear my choice on..." msgstr "Rensa mitt val för..." @@ -10611,13 +10619,40 @@ msgstr "" "Begränsar vyns bildfrekvens för att minska GPU-belastning och strömförbrukning.\n" "Sätt till 0 för obegränsad bildfrekvens." +msgid "Reuse the 3D scene while idle" +msgstr "" + +msgid "" +"Skips redrawing the 3D scene when only the mouse cursor moves over the viewport,\n" +"and reuses the previous frame's scene instead. Reduces GPU load.\n" +"Disable it if the viewport shows stale or missing contents.\n" +"\n" +"Takes effect immediately." +msgstr "" + +msgid "Skip unchanged frames" +msgstr "" + +msgid "" +"Skips drawing a frame altogether when it would be identical to the one already on screen.\n" +"Only applies to frames that reuse the 3D scene, so it needs Reuse the 3D scene while idle.\n" +"Disable it if a hover highlight, tooltip or animation stops updating.\n" +"\n" +"Takes effect immediately." +msgstr "" + # AI Translated msgid "Show FPS overlay" msgstr "Visa FPS-överlägg" -# AI Translated -msgid "Displays current viewport FPS in the top-right corner." -msgstr "Visar vyns aktuella FPS i det övre högra hörnet." +msgid "Displays rendering counts in the top-right corner of the viewport." +msgstr "" + +msgid "FPS: frames presented to the screen per second." +msgstr "" + +msgid "3D: frames per second that redrew the 3D scene." +msgstr "" # AI Translated msgid "G-code Preview" @@ -11120,13 +11155,8 @@ msgstr "Publicera 3MF..." msgid "Select which settings to be published in the 3MF file" msgstr "Välj vilka inställningar som ska publiceras i 3MF-filen" -# AI Translated -msgid "Publish 3MF Wiki" -msgstr "Wiki för Publicera 3MF" - -# AI Translated -msgid "Publish 3MF Video Guide" -msgstr "Videoguide för Publicera 3MF" +msgid "Video Guide" +msgstr "" # AI Translated msgid "Mixed filament - published as a whole when \"Enable\" above is selected" @@ -11329,6 +11359,14 @@ msgstr "" msgid "No wiki page for this action" msgstr "" +# AI Translated +msgid "Show details" +msgstr "Visa detaljer" + +# AI Translated +msgid "Hide details" +msgstr "Dölj detaljer" + #, c-format, boost-format msgid "\"%s\" is a Developer setting. Enable Developer mode to edit it?" msgstr "" @@ -13403,69 +13441,39 @@ msgstr "Konfigurations paketet är ändrat i föregående Kofigurations Guide" msgid "Configuration package changed" msgstr "Konfigurations paketet är ändrat" -msgid "Toolbar" -msgstr "Verktygsfält" - -msgid "Objects list" -msgstr "Objektlista" - -msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" -msgstr "Importera geometri data från STL/STEP/3MF/OBJ/AMF filer" - -msgid "Paste from clipboard" -msgstr "Klistra in ifrån urklipp" - -msgid "Show/Hide 3Dconnexion devices settings dialog" -msgstr "Visa/Dölj 3Dconnexion enheternas inställnings dialogruta" - -msgid "Switch table page" -msgstr "Byt tabellsida" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Space" -msgstr "Blanksteg" - -msgid "Open speed dial" -msgstr "" - -msgid "Run a Speed Dial favourite (while the Speed Dial is open)" -msgstr "" - -msgid "Show keyboard shortcuts list" -msgstr "Visa tangentbordets genvägs lista" - -msgid "Global shortcuts" -msgstr "Övergripande genvägar" - msgid "Pan View" msgstr "Panoreringsvy" msgid "Rotate View" msgstr "Rotera vy" -# AI Translated -msgid "Middle mouse button" -msgstr "Mittersta musknappen" +#, c-format, boost-format +msgid "Use %s or %s, or a key that does not type a character." +msgstr "" -msgid "Zoom View" -msgstr "Zoomvy" +msgctxt "Keyboard Shortcut" +msgid "Key" +msgstr "" -msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." -msgstr "Auto placera valda objekt eller alla objekt. Om det finns valda objekt så placeras endast dem. Annars kommer den att orientera alla objekt i det aktuella projektet." +msgid "Left mouse" +msgstr "" -msgid "Auto orients all objects on the active plate." -msgstr "Placera alla föremål automatiskt på aktuell tallrik." +msgid "Available anywhere in the window, even while typing in a text field." +msgstr "" -msgid "Collapse/Expand the sidebar" -msgstr "Dölj/Visa meny" +msgid "Run a speed dial favorite while the dial is open" +msgstr "" # AI Translated -msgid "Any arrow" -msgstr "Valfri piltangent" +msgctxt "Keyboard Shortcut" +msgid "Tab" +msgstr "Tabb" -msgid "Movement in camera space" -msgstr "Rörelse i kamera område" +msgid "Switch to the next main tab" +msgstr "" + +msgid "Available while the 3D view on the Prepare tab has focus." +msgstr "" msgid "Select a part" msgstr "Välj del" @@ -13476,129 +13484,29 @@ msgstr "Välj flera objekt" msgid "Select objects by rectangle" msgstr "Välj objekt efter rektangel" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Up" -msgstr "Uppåtpil" - -msgid "Move selection 10mm in positive Y direction" -msgstr "Flytta markeringen 10mm i positiv Y riktning" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Down" -msgstr "Nedåtpil" - -msgid "Move selection 10mm in negative Y direction" -msgstr "Flytta markeringen 10mm i negativ Y riktning" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Left" -msgstr "Vänsterpil" - -msgid "Move selection 10mm in negative X direction" -msgstr "Flytta markeringen 10mm i negativ X riktning" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Right" -msgstr "Högerpil" - -msgid "Move selection 10mm in positive X direction" -msgstr "Flytta markeringen 10mm i positiv X riktning" +msgid "Keyboard 1-9: set filament for object/part" +msgstr "tangentbord 1-9: fastställer filament för objekt/del" msgid "Movement step set to 1mm" msgstr "Rörelse steg är vald till 1mm" -msgid "Keyboard 1-9: set filament for object/part" -msgstr "tangentbord 1-9: fastställer filament för objekt/del" +msgid "Movement in camera space" +msgstr "Rörelse i kamera område" -msgid "Camera view - Default" -msgstr "Kamera vy - Standard" +msgid "Middle mouse" +msgstr "" -msgid "Camera view - Top" -msgstr "Kamera vy - Topp" +msgid "Right mouse" +msgstr "" -msgid "Camera view - Bottom" -msgstr "Kamera vy - Botten" +msgid "Zoom View" +msgstr "Zoomvy" -msgid "Camera view - Front" -msgstr "Kamera vy - Fram" +msgid "Painting" +msgstr "" -msgid "Camera view - Behind" -msgstr "Kamera vy - Bakom" - -msgid "Camera Angle - Left side" -msgstr "Kamera vy - Vänster sida" - -msgid "Camera Angle - Right side" -msgstr "Kamera vy - Höger sida" - -msgid "Select all objects" -msgstr "Välj alla objekt" - -msgid "Gizmo move" -msgstr "Gizmo flytta" - -msgid "Gizmo rotate" -msgstr "Gizmo rotera" - -msgid "Gizmo scale" -msgstr "Gizmo skala" - -msgid "Gizmo place face on bed" -msgstr "Gizmo placera ansiktet på byggytan" - -msgid "Gizmo cut" -msgstr "Gizmo skär" - -# AI Translated -msgid "Gizmo mesh boolean" -msgstr "Gizmo boolesk mesh-operation" - -# AI Translated -msgid "Gizmo FDM paint-on fuzzy skin" -msgstr "Gizmo FDM måla ojämn yta" - -msgid "Gizmo SLA support points" -msgstr "Gizmo SLA support punkter" - -msgid "Gizmo FDM paint-on seam" -msgstr "Gizmo FDM målad söm" - -msgid "Gizmo text emboss/engrave" -msgstr "Gizmo textprägling/gravering" - -msgid "Gizmo measure" -msgstr "Gizmo mäta" - -msgid "Gizmo assemble" -msgstr "Gizmo montera" - -msgid "Gizmo brim ears" -msgstr "Gizmo brätte öron" - -msgid "Zoom in" -msgstr "Zooma in" - -msgid "Zoom out" -msgstr "Zooma ut" - -# AI Translated -msgid "Toggle printable for object/part" -msgstr "Växla utskrivbar för objekt/del" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Tab" -msgstr "Tabb" - -msgid "Switch between Prepare/Preview" -msgstr "Växla mellan Förbered/Förhandsgranska" - -msgid "Plater" -msgstr "Plätering/Förgyllning" +msgid "Available while a painting gizmo is open: supports, seam, fuzzy skin or color painting." +msgstr "" msgid "Move: press to snap by 1mm" msgstr "Flytta: tryck för att låsa med 1mm" @@ -13609,15 +13517,19 @@ msgstr "Support/Färgläggning: justera penn radie" msgid "Support/Color Painting: adjust section position" msgstr "Support/Färgläggning:justera sektions positionen" -# AI Translated -msgid "Gizmo" -msgstr "Gizmo" +msgid "Objects list" +msgstr "Objektlista" + +msgid "Available while the object list has focus." +msgstr "" msgid "Set extruder number for the objects and parts" msgstr "Välj extruder nummer för objekten och delarna" -msgid "Delete objects, parts, modifiers" -msgstr "Radera objekten, delarna och anpassningar" +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Space" +msgstr "Blanksteg" msgid "Select the object/part and press space to change the name" msgstr "Välj objektet/delen och tryck space för att ändra namnet" @@ -13628,48 +13540,48 @@ msgstr "Mus klick" msgid "Select the object/part and mouse click to change the name" msgstr "Välj objektet/delen och mus klicka för att ändra namnet" -msgid "Objects List" -msgstr "Objekts lista" - -msgid "Vertical slider - Move active thumb Up" -msgstr "Vertikal reglage - Flytta aktivt tryck Upp" - -msgid "Vertical slider - Move active thumb Down" -msgstr "Vertikal reglage - Flytta aktivt tryck Ner" - -msgid "Horizontal slider - Move active thumb Left" -msgstr "Horisontell reglage - Flytta aktivt tryck Vänster" - -msgid "Horizontal slider - Move active thumb Right" -msgstr "Horisontell reglage - Flytta aktivt tryck Höger" - -msgid "On/Off one layer mode of the vertical slider" -msgstr "På/Av 1 lager läge för det vertikala reglaget" - -# AI Translated -msgid "On/Off G-code window" -msgstr "På/av för G-code-fönstret" +msgid "Available while the 3D view on the Preview tab has focus." +msgstr "" msgid "Move slider 5x faster" msgstr "Flytta reglage 5x snabbare" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Home" -msgstr "Home" +msgid "Scroll slider 5x faster" +msgstr "" -# AI Translated -msgid "Horizontal slider - Move to start position" -msgstr "Horisontellt reglage – flytta till startpositionen" +msgid "Not customizable" +msgstr "" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "End" -msgstr "End" +#, c-format, boost-format +msgid "%s is assigned to %s. Reassign it to %s?" +msgstr "" -# AI Translated -msgid "Horizontal slider - Move to last position" -msgstr "Horisontellt reglage – flytta till sista positionen" +#, c-format, boost-format +msgid "The default %s is assigned to %s. Reassign it to %s?" +msgstr "" + +msgid "Global shortcuts also apply while typing." +msgstr "" + +msgid "A key that types a character cannot be a global shortcut." +msgstr "" + +msgid "Esc cancels, Enter confirms." +msgstr "" + +#, c-format, boost-format +msgid "" +"Press the new shortcut for\n" +"\"%s\"" +msgstr "" + +#, c-format, boost-format +msgid "Already used as a step of %s." +msgstr "" + +#, c-format, boost-format +msgid "Already assigned to %s. Press OK to reassign it." +msgstr "" msgid "Release Note" msgstr "Meddelande om utgåvan" @@ -19215,9 +19127,8 @@ msgstr "Förvärmningssteg" msgid "Insert multiple preheat commands (e.g. M104.1). Only useful for Prusa XL. For other printers, please set it to 1." msgstr "Infoga flera förvärmningskommandon (t.ex. M104.1). Endast användbart för Prusa XL. Ställ in det på 1 för andra skrivare." -# AI Translated -msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." -msgstr "G-code som skrivs allra överst i utdatafilen, före allt annat innehåll. Användbart för att lägga till metadata som skrivarens fasta programvara läser från filens första rader (t.ex. beräknad utskriftstid, filamentåtgång). Stöder platshållare som {print_time_sec} och {used_filament_length}." +msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_total_sec}, {print_time_day}, {print_time_hour}, {print_time_minute}, {print_time_sec} and {used_filament_length}." +msgstr "" msgid "Start G-code" msgstr "Starta G-kod" @@ -20963,14 +20874,37 @@ msgstr "Använt filament" msgid "Total length of filament used in the print." msgstr "Total längd filament som används i utskriften." -# AI Translated -msgid "Print time (seconds)" -msgstr "Utskriftstid (sekunder)" +msgid "Print time (total seconds)" +msgstr "" # AI Translated msgid "Total estimated print time in seconds. Replaced with actual value during post-processing." msgstr "Total beräknad utskriftstid i sekunder. Ersätts med det faktiska värdet under efterbearbetningen." +msgid "Print time (days component)" +msgstr "" + +msgid "Estimated print time day component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (hours component)" +msgstr "" + +msgid "Estimated print time hour component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (minutes component)" +msgstr "" + +msgid "Estimated print time minute component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (seconds component)" +msgstr "" + +msgid "Estimated print time second component (normal mode). Replaced with actual value during post-processing." +msgstr "" + # AI Translated msgid "Filament length (meters)" msgstr "Filamentlängd (meter)" @@ -23000,6 +22934,9 @@ msgstr "Ingen giltig session upptäcktes. Vill du fortsätta med inloggning till msgid "Success!" msgstr "Lyckades!" +msgid "Generate API Key" +msgstr "" + # AI Translated msgid "Are you sure to log out?" msgstr "Är du säker på att du vill logga ut?" @@ -24215,14 +24152,6 @@ msgstr "Bambu Network Plug-in krävs för molnfunktioner, upptäckt av skrivare msgid "Error: %s" msgstr "Fel: %s" -# AI Translated -msgid "Show details" -msgstr "Visa detaljer" - -# AI Translated -msgid "Hide details" -msgstr "Dölj detaljer" - # AI Translated msgid "Version to install:" msgstr "Version att installera:" @@ -26906,6 +26835,12 @@ msgstr "" msgid "No binding for that field" msgstr "" +msgid "Enter a number" +msgstr "" + +msgid "Not a number" +msgstr "" + msgid "Primitive" msgstr "" @@ -26918,6 +26853,222 @@ msgstr "" msgid "Clear All" msgstr "" +msgctxt "Keyboard Shortcut" +msgid "Ins" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Home" +msgstr "Home" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "End" +msgstr "End" + +msgctxt "Keyboard Shortcut" +msgid "PgUp" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "PgDn" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Left" +msgstr "Vänsterpil" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Right" +msgstr "Högerpil" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Up" +msgstr "Uppåtpil" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Down" +msgstr "Nedåtpil" + +msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" +msgstr "Importera geometri data från STL/STEP/3MF/OBJ/AMF filer" + +msgid "Select all objects" +msgstr "Välj alla objekt" + +msgid "Paste from clipboard" +msgstr "Klistra in ifrån urklipp" + +# AI Translated +msgid "Toggle printable for object/part" +msgstr "Växla utskrivbar för objekt/del" + +msgid "Move selection 10mm in negative X direction" +msgstr "Flytta markeringen 10mm i negativ X riktning" + +msgid "Move selection 10mm in positive X direction" +msgstr "Flytta markeringen 10mm i positiv X riktning" + +msgid "Move selection 10mm in positive Y direction" +msgstr "Flytta markeringen 10mm i positiv Y riktning" + +msgid "Move selection 10mm in negative Y direction" +msgstr "Flytta markeringen 10mm i negativ Y riktning" + +msgid "Rotate selection 45 degrees counterclockwise" +msgstr "" + +msgid "Rotate selection 45 degrees clockwise" +msgstr "" + +msgid "Gizmo move" +msgstr "Gizmo flytta" + +msgid "Gizmo rotate" +msgstr "Gizmo rotera" + +msgid "Gizmo scale" +msgstr "Gizmo skala" + +msgid "Gizmo place face on bed" +msgstr "Gizmo placera ansiktet på byggytan" + +msgid "Gizmo cut" +msgstr "Gizmo skär" + +# AI Translated +msgid "Gizmo mesh boolean" +msgstr "Gizmo boolesk mesh-operation" + +msgid "Gizmo FDM paint-on supports" +msgstr "" + +msgid "Gizmo FDM paint-on seam" +msgstr "Gizmo FDM målad söm" + +# AI Translated +msgid "Gizmo FDM paint-on fuzzy skin" +msgstr "Gizmo FDM måla ojämn yta" + +msgid "Gizmo multi-material painting" +msgstr "" + +msgid "Gizmo text emboss/engrave" +msgstr "Gizmo textprägling/gravering" + +msgid "Gizmo measure" +msgstr "Gizmo mäta" + +msgid "Gizmo assemble" +msgstr "Gizmo montera" + +msgid "Gizmo brim ears" +msgstr "Gizmo brätte öron" + +msgid "Vertical slider - Move active thumb Up" +msgstr "Vertikal reglage - Flytta aktivt tryck Upp" + +msgid "Vertical slider - Move active thumb Down" +msgstr "Vertikal reglage - Flytta aktivt tryck Ner" + +msgid "Horizontal slider - Move active thumb Left" +msgstr "Horisontell reglage - Flytta aktivt tryck Vänster" + +msgid "Horizontal slider - Move active thumb Right" +msgstr "Horisontell reglage - Flytta aktivt tryck Höger" + +# AI Translated +msgid "Horizontal slider - Move to start position" +msgstr "Horisontellt reglage – flytta till startpositionen" + +# AI Translated +msgid "Horizontal slider - Move to last position" +msgstr "Horisontellt reglage – flytta till sista positionen" + +msgid "Camera view - Default" +msgstr "Kamera vy - Standard" + +msgid "Camera view - Top" +msgstr "Kamera vy - Topp" + +msgid "Camera view - Bottom" +msgstr "Kamera vy - Botten" + +msgid "Camera view - Front" +msgstr "Kamera vy - Fram" + +msgid "Camera view - Behind" +msgstr "Kamera vy - Bakom" + +msgid "Camera Angle - Left side" +msgstr "Kamera vy - Vänster sida" + +msgid "Camera Angle - Right side" +msgstr "Kamera vy - Höger sida" + +msgid "Camera view - Current plate" +msgstr "" + +msgid "Zoom in" +msgstr "Zooma in" + +msgid "Zoom out" +msgstr "Zooma ut" + +msgid "Show/Hide 3Dconnexion devices settings dialog" +msgstr "Visa/Dölj 3Dconnexion enheternas inställnings dialogruta" + +msgid "Show/Hide wireframe" +msgstr "" + +# AI Translated +msgid "On/Off G-code window" +msgstr "På/av för G-code-fönstret" + +msgid "On/Off one layer mode of the vertical slider" +msgstr "På/Av 1 lager läge för det vertikala reglaget" + +msgid "Switch between Prepare/Preview" +msgstr "Växla mellan Förbered/Förhandsgranska" + +msgid "Collapse/Expand the sidebar" +msgstr "Dölj/Visa meny" + +msgid "Open the speed dial" +msgstr "" + +msgid "Reload the device page" +msgstr "" + +msgid "Show keyboard shortcuts list" +msgstr "Visa tangentbordets genvägs lista" + +msgid "Slicing and printing" +msgstr "" + +msgid "Editing" +msgstr "" + +msgid "Placement" +msgstr "" + +msgid "Gizmos" +msgstr "" + +msgid "Sliders" +msgstr "" + +msgid "Painting tools" +msgstr "" + +msgid "Application" +msgstr "" + # AI Translated #: resources/data/hints.ini: [hint:Precise wall] msgid "" @@ -27233,6 +27384,69 @@ msgstr "" "Undvik vridning\n" "Visste du att när du skriver ut material som är benägna att vrida, såsom ABS, kan en lämplig ökning av värmebäddens temperatur minska sannolikheten för vridning?" +# AI Translated +#~ msgid "Tab" +#~ msgstr "Tabb" + +# AI Translated +#~ msgid "Displays current viewport FPS in the top-right corner." +#~ msgstr "Visar vyns aktuella FPS i det övre högra hörnet." + +# AI Translated +#~ msgid "Publish 3MF Wiki" +#~ msgstr "Wiki för Publicera 3MF" + +# AI Translated +#~ msgid "Publish 3MF Video Guide" +#~ msgstr "Videoguide för Publicera 3MF" + +#~ msgid "Toolbar" +#~ msgstr "Verktygsfält" + +#~ msgid "Switch table page" +#~ msgstr "Byt tabellsida" + +#~ msgid "Global shortcuts" +#~ msgstr "Övergripande genvägar" + +# AI Translated +#~ msgid "Middle mouse button" +#~ msgstr "Mittersta musknappen" + +#~ msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." +#~ msgstr "Auto placera valda objekt eller alla objekt. Om det finns valda objekt så placeras endast dem. Annars kommer den att orientera alla objekt i det aktuella projektet." + +#~ msgid "Auto orients all objects on the active plate." +#~ msgstr "Placera alla föremål automatiskt på aktuell tallrik." + +# AI Translated +#~ msgid "Any arrow" +#~ msgstr "Valfri piltangent" + +#~ msgid "Gizmo SLA support points" +#~ msgstr "Gizmo SLA support punkter" + +#~ msgid "Plater" +#~ msgstr "Plätering/Förgyllning" + +# AI Translated +#~ msgid "Gizmo" +#~ msgstr "Gizmo" + +#~ msgid "Delete objects, parts, modifiers" +#~ msgstr "Radera objekten, delarna och anpassningar" + +#~ msgid "Objects List" +#~ msgstr "Objekts lista" + +# AI Translated +#~ msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." +#~ msgstr "G-code som skrivs allra överst i utdatafilen, före allt annat innehåll. Användbart för att lägga till metadata som skrivarens fasta programvara läser från filens första rader (t.ex. beräknad utskriftstid, filamentåtgång). Stöder platshållare som {print_time_sec} och {used_filament_length}." + +# AI Translated +#~ msgid "Print time (seconds)" +#~ msgstr "Utskriftstid (sekunder)" + # AI Translated #~ msgid "Open actions speed dial" #~ msgstr "Öppna snabbvalsmenyn för åtgärder" diff --git a/localization/i18n/th/OrcaSlicer_th.po b/localization/i18n/th/OrcaSlicer_th.po index 47aa50fb13..e300799cbe 100644 --- a/localization/i18n/th/OrcaSlicer_th.po +++ b/localization/i18n/th/OrcaSlicer_th.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-09-18 15:50+0800\n" +"POT-Creation-Date: 2026-09-22 17:02+0800\n" "PO-Revision-Date: 2026-06-19 13:40+0700\n" "Last-Translator: Icezaza\n" "Language-Team: Thai\n" @@ -5901,12 +5901,15 @@ msgctxt "Camera View" msgid "Right" msgstr "ขวา" -msgid "Add" -msgstr "เพิ่ม" - msgid "Add plate" msgstr "เพิ่มจาน" +msgid "Split to objects" +msgstr "แยกเป็นวัตถุ" + +msgid "Add" +msgstr "เพิ่ม" + msgid "Auto orient all/selected objects" msgstr "ปรับทิศทางวัตถุทั้งหมด/ที่เลือกโดยอัตโนมัติ" @@ -5919,9 +5922,6 @@ msgstr "จัดเรียงวัตถุทั้งหมด" msgid "Arrange objects on selected plates" msgstr "จัดเรียงวัตถุบนจานที่เลือก" -msgid "Split to objects" -msgstr "แยกเป็นวัตถุ" - msgid "Assembly View" msgstr "มุมมองการประกอบ" @@ -5978,6 +5978,9 @@ msgstr "เส้นขอบ" msgid "Wireframe" msgstr "โครงลวด" +msgid "X-Ray" +msgstr "" + msgid "Realistic View" msgstr "มุมมองสมจริง" @@ -6517,9 +6520,6 @@ msgstr "แสดงเค้าร่างรอบๆ วัตถุที msgid "Preferences" msgstr "การตั้งค่า" -msgid "Open speed dial..." -msgstr "" - # AI Translated msgctxt "Menu" msgid "Edit" @@ -6528,6 +6528,9 @@ msgstr "แก้ไข" msgid "View" msgstr "มุมมอง" +msgid "Open Speed Dial" +msgstr "" + msgid "Preset Bundle" msgstr "ชุดที่ตั้งไว้ล่วงหน้า" @@ -8318,9 +8321,6 @@ msgstr "ขยายแถบด้านข้าง" msgid "Collapse sidebar" msgstr "ยุบแถบด้านข้าง" -msgid "Tab" -msgstr "แท็บ" - #, c-format, boost-format msgid "Loading file: %s" msgstr "กำลังโหลดไฟล์: %s" @@ -9338,10 +9338,10 @@ msgstr "การจัดการอุปกรณ์หลายเครื msgid "With this option enabled, you can send a task to multiple devices at the same time and manage multiple devices." msgstr "เมื่อเปิดใช้งานตัวเลือกนี้ คุณสามารถส่งงานไปยังอุปกรณ์หลายเครื่องพร้อมกันและจัดการอุปกรณ์หลายเครื่องได้" -msgid "Open the Speed Dial with the Space key" +msgid "Open the Speed Dial from the keyboard" msgstr "" -msgid "When enabled, pressing Space (with no other key held) opens the Speed Dial action search from any page." +msgid "When enabled, the Speed Dial keyboard shortcut (Space by default) opens the action search from any page." msgstr "" msgid "Recent actions" @@ -9473,6 +9473,15 @@ msgstr "ลากเมาส์ขวา" msgid "Set the action that dragging the right mouse button should perform." msgstr "ตั้งค่าการดำเนินการที่ควรดำเนินการด้วยการลากปุ่มเมาส์ขวา" +msgid "Keyboard" +msgstr "" + +msgid "Keyboard shortcuts" +msgstr "" + +msgid "Choose the key for each action." +msgstr "" + msgid "Clear my choice on..." msgstr "ล้างตัวเลือกของฉันใน..." @@ -9583,11 +9592,39 @@ msgstr "" "จำกัดอัตราเฟรมวิวพอร์ตเพื่อลดภาระของ GPU และการใช้พลังงาน\n" "ตั้งค่าเป็น 0 สำหรับอัตราเฟรมไม่จำกัด" +msgid "Reuse the 3D scene while idle" +msgstr "" + +msgid "" +"Skips redrawing the 3D scene when only the mouse cursor moves over the viewport,\n" +"and reuses the previous frame's scene instead. Reduces GPU load.\n" +"Disable it if the viewport shows stale or missing contents.\n" +"\n" +"Takes effect immediately." +msgstr "" + +msgid "Skip unchanged frames" +msgstr "" + +msgid "" +"Skips drawing a frame altogether when it would be identical to the one already on screen.\n" +"Only applies to frames that reuse the 3D scene, so it needs Reuse the 3D scene while idle.\n" +"Disable it if a hover highlight, tooltip or animation stops updating.\n" +"\n" +"Takes effect immediately." +msgstr "" + msgid "Show FPS overlay" msgstr "แสดงการซ้อนทับ FPS" -msgid "Displays current viewport FPS in the top-right corner." -msgstr "แสดงวิวพอร์ต FPS ปัจจุบันที่มุมขวาบน" +msgid "Displays rendering counts in the top-right corner of the viewport." +msgstr "" + +msgid "FPS: frames presented to the screen per second." +msgstr "" + +msgid "3D: frames per second that redrew the 3D scene." +msgstr "" # AI Translated msgid "G-code Preview" @@ -10047,13 +10084,8 @@ msgstr "เผยแพร่ 3MF..." msgid "Select which settings to be published in the 3MF file" msgstr "เลือกว่าจะเผยแพร่การตั้งค่าใดในไฟล์ 3MF" -# AI Translated -msgid "Publish 3MF Wiki" -msgstr "วิกิการเผยแพร่ 3MF" - -# AI Translated -msgid "Publish 3MF Video Guide" -msgstr "คู่มือวีดีโอการเผยแพร่ 3MF" +msgid "Video Guide" +msgstr "" # AI Translated msgid "Mixed filament - published as a whole when \"Enable\" above is selected" @@ -10255,6 +10287,13 @@ msgstr "" msgid "No wiki page for this action" msgstr "" +msgid "Show details" +msgstr "แสดงรายละเอียด" + +# AI Translated +msgid "Hide details" +msgstr "ซ่อนรายละเอียด" + #, c-format, boost-format msgid "\"%s\" is a Developer setting. Enable Developer mode to edit it?" msgstr "" @@ -12087,67 +12126,39 @@ msgstr "แพ็คเกจการกำหนดค่ามีการเ msgid "Configuration package changed" msgstr "แพ็คเกจการกำหนดค่ามีการเปลี่ยนแปลง" -msgid "Toolbar" -msgstr "แถบเครื่องมือ" - -msgid "Objects list" -msgstr "รายการวัตถุ" - -msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" -msgstr "นำเข้าข้อมูลเรขาคณิตจากไฟล์ STL/STEP/3MF/OBJ/AMF" - -msgid "Paste from clipboard" -msgstr "วางจากคลิปบอร์ด" - -msgid "Show/Hide 3Dconnexion devices settings dialog" -msgstr "แสดง/ซ่อนกล่องโต้ตอบการตั้งค่าอุปกรณ์ 3Dconnexion" - -msgid "Switch table page" -msgstr "สลับหน้าตาราง" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Space" -msgstr "Space" - -msgid "Open speed dial" -msgstr "" - -msgid "Run a Speed Dial favourite (while the Speed Dial is open)" -msgstr "" - -msgid "Show keyboard shortcuts list" -msgstr "แสดงรายการแป้นพิมพ์ลัด" - -msgid "Global shortcuts" -msgstr "ทางลัดทั่วโลก" - msgid "Pan View" msgstr "แพนวิว" msgid "Rotate View" msgstr "หมุนมุมมอง" -msgid "Middle mouse button" -msgstr "ปุ่มกลางของเมาส์" +#, c-format, boost-format +msgid "Use %s or %s, or a key that does not type a character." +msgstr "" -msgid "Zoom View" -msgstr "ซูมดู" +msgctxt "Keyboard Shortcut" +msgid "Key" +msgstr "" -msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." -msgstr "ปรับทิศทางวัตถุที่เลือกหรือวัตถุทั้งหมดโดยอัตโนมัติ หากมีวัตถุที่เลือกไว้ วัตถุนั้นจะปรับทิศทางวัตถุที่เลือกเท่านั้น มิฉะนั้นจะวางแนววัตถุทั้งหมดในโปรเจ็กต์ปัจจุบัน" +msgid "Left mouse" +msgstr "" -msgid "Auto orients all objects on the active plate." -msgstr "ปรับทิศทางวัตถุทั้งหมดบนเพลตที่ใช้งานอยู่โดยอัตโนมัติ" +msgid "Available anywhere in the window, even while typing in a text field." +msgstr "" -msgid "Collapse/Expand the sidebar" -msgstr "ยุบ/ขยายแถบด้านข้าง" +msgid "Run a speed dial favorite while the dial is open" +msgstr "" -msgid "Any arrow" -msgstr "ลูกศรอะไรก็ได้" +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Tab" +msgstr "Tab" -msgid "Movement in camera space" -msgstr "การเคลื่อนไหวในพื้นที่กล้อง" +msgid "Switch to the next main tab" +msgstr "" + +msgid "Available while the 3D view on the Prepare tab has focus." +msgstr "" msgid "Select a part" msgstr "เลือกส่วนหนึ่ง" @@ -12158,126 +12169,29 @@ msgstr "เลือกหลายวัตถุ" msgid "Select objects by rectangle" msgstr "เลือกวัตถุตามสี่เหลี่ยม" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Up" -msgstr "ลูกศรขึ้น" - -msgid "Move selection 10mm in positive Y direction" -msgstr "เลื่อนส่วนที่เลือกไป 10 มม. ในทิศทางบวก Y" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Down" -msgstr "ลูกศรลง" - -msgid "Move selection 10mm in negative Y direction" -msgstr "ย้ายส่วนที่เลือกไป 10 มม. ในทิศทางลบ Y" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Left" -msgstr "ลูกศรซ้าย" - -msgid "Move selection 10mm in negative X direction" -msgstr "ย้ายส่วนที่เลือกไป 10 มม. ในทิศทาง X ลบ" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Right" -msgstr "ลูกศรขวา" - -msgid "Move selection 10mm in positive X direction" -msgstr "เลื่อนส่วนที่เลือกไป 10 มม. ในทิศทาง X บวก" +msgid "Keyboard 1-9: set filament for object/part" +msgstr "แป้นพิมพ์ 1-9: ตั้งค่าเส้นพลาสติกสำหรับวัตถุ/ชิ้นส่วน" msgid "Movement step set to 1mm" msgstr "ตั้งระยะขยับเป็น 1 มม." -msgid "Keyboard 1-9: set filament for object/part" -msgstr "แป้นพิมพ์ 1-9: ตั้งค่าเส้นพลาสติกสำหรับวัตถุ/ชิ้นส่วน" +msgid "Movement in camera space" +msgstr "การเคลื่อนไหวในพื้นที่กล้อง" -msgid "Camera view - Default" -msgstr "มุมมองกล้อง - ค่าเริ่มต้น" +msgid "Middle mouse" +msgstr "" -msgid "Camera view - Top" -msgstr "มุมมองกล้อง - ด้านบน" +msgid "Right mouse" +msgstr "" -msgid "Camera view - Bottom" -msgstr "มุมมองกล้อง - ด้านล่าง" +msgid "Zoom View" +msgstr "ซูมดู" -msgid "Camera view - Front" -msgstr "มุมมองกล้อง - ด้านหน้า" +msgid "Painting" +msgstr "" -msgid "Camera view - Behind" -msgstr "มุมมองกล้อง - ด้านหลัง" - -msgid "Camera Angle - Left side" -msgstr "มุมกล้อง - ด้านซ้าย" - -msgid "Camera Angle - Right side" -msgstr "มุมกล้อง - ด้านขวา" - -msgid "Select all objects" -msgstr "เลือกวัตถุทั้งหมด" - -msgid "Gizmo move" -msgstr "กิสโม่ย้าย" - -msgid "Gizmo rotate" -msgstr "กิสโม่หมุน" - -msgid "Gizmo scale" -msgstr "ขนาดกิสโม่" - -msgid "Gizmo place face on bed" -msgstr "กิสโมวางหน้าบนฐานพิมพ์" - -msgid "Gizmo cut" -msgstr "กิสโม่ตัด" - -msgid "Gizmo mesh boolean" -msgstr "Gizmo mesh บูลีน" - -msgid "Gizmo FDM paint-on fuzzy skin" -msgstr "Gizmo FDM เพ้นท์ผิวฟัซซี" - -msgid "Gizmo SLA support points" -msgstr "จุดส่วนรองรับ Gizmo SLA" - -msgid "Gizmo FDM paint-on seam" -msgstr "รอยตะเข็บทาสี Gizmo FDM" - -msgid "Gizmo text emboss/engrave" -msgstr "ข้อความ Gizmo นูน/แกะสลัก" - -msgid "Gizmo measure" -msgstr "เครื่องวัดกิสโม่" - -msgid "Gizmo assemble" -msgstr "กิสโมประกอบ" - -msgid "Gizmo brim ears" -msgstr "Gizmo หูขอบยึดชิ้นงาน (Brim Ears)" - -msgid "Zoom in" -msgstr "ซูมเข้า" - -msgid "Zoom out" -msgstr "ซูมออก" - -msgid "Toggle printable for object/part" -msgstr "สลับการพิมพ์สำหรับวัตถุ/ชิ้นส่วน" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Tab" -msgstr "Tab" - -msgid "Switch between Prepare/Preview" -msgstr "สลับระหว่างการเตรียม/ดูตัวอย่าง" - -msgid "Plater" -msgstr "เพลเตอร์" +msgid "Available while a painting gizmo is open: supports, seam, fuzzy skin or color painting." +msgstr "" msgid "Move: press to snap by 1mm" msgstr "ย้าย: กดเพื่อสแน็ป 1 มม" @@ -12288,14 +12202,19 @@ msgstr "ส่วนรองรับ / การวาดภาพสี: ป msgid "Support/Color Painting: adjust section position" msgstr "ส่วนรองรับ / การวาดภาพสี: ปรับตำแหน่งส่วน" -msgid "Gizmo" -msgstr "กิสโม่" +msgid "Objects list" +msgstr "รายการวัตถุ" + +msgid "Available while the object list has focus." +msgstr "" msgid "Set extruder number for the objects and parts" msgstr "กำหนดหมายเลขชุดดันเส้นสำหรับวัตถุและชิ้นส่วน" -msgid "Delete objects, parts, modifiers" -msgstr "ลบวัตถุ ชิ้นส่วน ตัวดัดแปลง" +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Space" +msgstr "Space" msgid "Select the object/part and press space to change the name" msgstr "เลือกวัตถุ/ชิ้นส่วนแล้วกด Space เพื่อเปลี่ยนชื่อ" @@ -12306,45 +12225,48 @@ msgstr "คลิกเมาส์" msgid "Select the object/part and mouse click to change the name" msgstr "เลือกวัตถุ/ชิ้นส่วนแล้วคลิกเมาส์เพื่อเปลี่ยนชื่อ" -msgid "Objects List" -msgstr "รายการวัตถุ" - -msgid "Vertical slider - Move active thumb Up" -msgstr "แถบเลื่อนแนวตั้ง - เลื่อนนิ้วโป้งที่ใช้งานอยู่ขึ้น" - -msgid "Vertical slider - Move active thumb Down" -msgstr "แถบเลื่อนแนวตั้ง - เลื่อนนิ้วโป้งที่ใช้งานอยู่ลง" - -msgid "Horizontal slider - Move active thumb Left" -msgstr "แถบเลื่อนแนวนอน - เลื่อนนิ้วหัวแม่มือที่ใช้งานไปทางซ้าย" - -msgid "Horizontal slider - Move active thumb Right" -msgstr "แถบเลื่อนแนวนอน - เลื่อนนิ้วหัวแม่มือที่ใช้งานไปทางขวา" - -msgid "On/Off one layer mode of the vertical slider" -msgstr "เปิด/ปิดโหมดเลเยอร์เดียวของแถบเลื่อนแนวตั้ง" - -msgid "On/Off G-code window" -msgstr "เปิด/ปิดหน้าต่างรหัส G" +msgid "Available while the 3D view on the Preview tab has focus." +msgstr "" msgid "Move slider 5x faster" msgstr "เลื่อนตัวเลื่อนเร็วขึ้น 5 เท่า" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Home" -msgstr "Home" +msgid "Scroll slider 5x faster" +msgstr "" -msgid "Horizontal slider - Move to start position" -msgstr "แถบเลื่อนแนวนอน - เลื่อนไปยังตำแหน่งเริ่มต้น" +msgid "Not customizable" +msgstr "" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "End" -msgstr "End" +#, c-format, boost-format +msgid "%s is assigned to %s. Reassign it to %s?" +msgstr "" -msgid "Horizontal slider - Move to last position" -msgstr "แถบเลื่อนแนวนอน - เลื่อนไปยังตำแหน่งสุดท้าย" +#, c-format, boost-format +msgid "The default %s is assigned to %s. Reassign it to %s?" +msgstr "" + +msgid "Global shortcuts also apply while typing." +msgstr "" + +msgid "A key that types a character cannot be a global shortcut." +msgstr "" + +msgid "Esc cancels, Enter confirms." +msgstr "" + +#, c-format, boost-format +msgid "" +"Press the new shortcut for\n" +"\"%s\"" +msgstr "" + +#, c-format, boost-format +msgid "Already used as a step of %s." +msgstr "" + +#, c-format, boost-format +msgid "Already assigned to %s. Press OK to reassign it." +msgstr "" msgid "Release Note" msgstr "บันทึกประจำรุ่น" @@ -17213,8 +17135,8 @@ msgstr "อุ่นเครื่องตามขั้นตอน" msgid "Insert multiple preheat commands (e.g. M104.1). Only useful for Prusa XL. For other printers, please set it to 1." msgstr "ใส่คำสั่งอุ่นล่วงหน้าหลายคำสั่ง (เช่น M104.1) มีประโยชน์สำหรับ Prusa XL เท่านั้น สำหรับเครื่องพิมพ์อื่นๆ โปรดตั้งค่าเป็น 1" -msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." -msgstr "G-code เขียนไว้ที่ด้านบนสุดของไฟล์เอาต์พุต ก่อนเนื้อหาอื่นๆ มีประโยชน์สำหรับการเพิ่มข้อมูลเมตาที่เฟิร์มแวร์เครื่องพิมพ์อ่านจากบรรทัดแรกของไฟล์ (เช่น เวลาในการพิมพ์โดยประมาณ การใช้เส้นพลาสติก) รองรับตัวยึดตำแหน่ง เช่น {print_time_sec} และ {used_filament_length}" +msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_total_sec}, {print_time_day}, {print_time_hour}, {print_time_minute}, {print_time_sec} and {used_filament_length}." +msgstr "" msgid "Start G-code" msgstr "เริ่ม G-code" @@ -18753,12 +18675,36 @@ msgstr "เส้นพลาสติกที่ใช้แล้ว" msgid "Total length of filament used in the print." msgstr "ความยาวรวมของเส้นพลาสติกที่ใช้ในการพิมพ์" -msgid "Print time (seconds)" -msgstr "เวลาในการพิมพ์ (วินาที)" +msgid "Print time (total seconds)" +msgstr "" msgid "Total estimated print time in seconds. Replaced with actual value during post-processing." msgstr "เวลาพิมพ์ทั้งหมดโดยประมาณเป็นวินาที แทนที่ด้วยค่าจริงระหว่างการประมวลผลภายหลัง" +msgid "Print time (days component)" +msgstr "" + +msgid "Estimated print time day component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (hours component)" +msgstr "" + +msgid "Estimated print time hour component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (minutes component)" +msgstr "" + +msgid "Estimated print time minute component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (seconds component)" +msgstr "" + +msgid "Estimated print time second component (normal mode). Replaced with actual value during post-processing." +msgstr "" + msgid "Filament length (meters)" msgstr "ความยาวเส้นพลาสติก (เมตร)" @@ -20592,6 +20538,9 @@ msgstr "ไม่พบเซสชันที่ถูกต้อง ดำ msgid "Success!" msgstr "สำเร็จ!" +msgid "Generate API Key" +msgstr "" + msgid "Are you sure to log out?" msgstr "คุณแน่ใจหรือว่าจะออกจากระบบ?" @@ -21591,13 +21540,6 @@ msgstr "ปลั๊กอินเครือข่าย Bambu จำเป msgid "Error: %s" msgstr "ข้อผิดพลาด: %s" -msgid "Show details" -msgstr "แสดงรายละเอียด" - -# AI Translated -msgid "Hide details" -msgstr "ซ่อนรายละเอียด" - msgid "Version to install:" msgstr "เวอร์ชันที่จะติดตั้ง:" @@ -24228,6 +24170,12 @@ msgstr "" msgid "No binding for that field" msgstr "" +msgid "Enter a number" +msgstr "" + +msgid "Not a number" +msgstr "" + msgid "Primitive" msgstr "" @@ -24240,6 +24188,216 @@ msgstr "" msgid "Clear All" msgstr "" +msgctxt "Keyboard Shortcut" +msgid "Ins" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Home" +msgstr "Home" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "End" +msgstr "End" + +msgctxt "Keyboard Shortcut" +msgid "PgUp" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "PgDn" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Left" +msgstr "ลูกศรซ้าย" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Right" +msgstr "ลูกศรขวา" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Up" +msgstr "ลูกศรขึ้น" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Down" +msgstr "ลูกศรลง" + +msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" +msgstr "นำเข้าข้อมูลเรขาคณิตจากไฟล์ STL/STEP/3MF/OBJ/AMF" + +msgid "Select all objects" +msgstr "เลือกวัตถุทั้งหมด" + +msgid "Paste from clipboard" +msgstr "วางจากคลิปบอร์ด" + +msgid "Toggle printable for object/part" +msgstr "สลับการพิมพ์สำหรับวัตถุ/ชิ้นส่วน" + +msgid "Move selection 10mm in negative X direction" +msgstr "ย้ายส่วนที่เลือกไป 10 มม. ในทิศทาง X ลบ" + +msgid "Move selection 10mm in positive X direction" +msgstr "เลื่อนส่วนที่เลือกไป 10 มม. ในทิศทาง X บวก" + +msgid "Move selection 10mm in positive Y direction" +msgstr "เลื่อนส่วนที่เลือกไป 10 มม. ในทิศทางบวก Y" + +msgid "Move selection 10mm in negative Y direction" +msgstr "ย้ายส่วนที่เลือกไป 10 มม. ในทิศทางลบ Y" + +msgid "Rotate selection 45 degrees counterclockwise" +msgstr "" + +msgid "Rotate selection 45 degrees clockwise" +msgstr "" + +msgid "Gizmo move" +msgstr "กิสโม่ย้าย" + +msgid "Gizmo rotate" +msgstr "กิสโม่หมุน" + +msgid "Gizmo scale" +msgstr "ขนาดกิสโม่" + +msgid "Gizmo place face on bed" +msgstr "กิสโมวางหน้าบนฐานพิมพ์" + +msgid "Gizmo cut" +msgstr "กิสโม่ตัด" + +msgid "Gizmo mesh boolean" +msgstr "Gizmo mesh บูลีน" + +msgid "Gizmo FDM paint-on supports" +msgstr "" + +msgid "Gizmo FDM paint-on seam" +msgstr "รอยตะเข็บทาสี Gizmo FDM" + +msgid "Gizmo FDM paint-on fuzzy skin" +msgstr "Gizmo FDM เพ้นท์ผิวฟัซซี" + +msgid "Gizmo multi-material painting" +msgstr "" + +msgid "Gizmo text emboss/engrave" +msgstr "ข้อความ Gizmo นูน/แกะสลัก" + +msgid "Gizmo measure" +msgstr "เครื่องวัดกิสโม่" + +msgid "Gizmo assemble" +msgstr "กิสโมประกอบ" + +msgid "Gizmo brim ears" +msgstr "Gizmo หูขอบยึดชิ้นงาน (Brim Ears)" + +msgid "Vertical slider - Move active thumb Up" +msgstr "แถบเลื่อนแนวตั้ง - เลื่อนนิ้วโป้งที่ใช้งานอยู่ขึ้น" + +msgid "Vertical slider - Move active thumb Down" +msgstr "แถบเลื่อนแนวตั้ง - เลื่อนนิ้วโป้งที่ใช้งานอยู่ลง" + +msgid "Horizontal slider - Move active thumb Left" +msgstr "แถบเลื่อนแนวนอน - เลื่อนนิ้วหัวแม่มือที่ใช้งานไปทางซ้าย" + +msgid "Horizontal slider - Move active thumb Right" +msgstr "แถบเลื่อนแนวนอน - เลื่อนนิ้วหัวแม่มือที่ใช้งานไปทางขวา" + +msgid "Horizontal slider - Move to start position" +msgstr "แถบเลื่อนแนวนอน - เลื่อนไปยังตำแหน่งเริ่มต้น" + +msgid "Horizontal slider - Move to last position" +msgstr "แถบเลื่อนแนวนอน - เลื่อนไปยังตำแหน่งสุดท้าย" + +msgid "Camera view - Default" +msgstr "มุมมองกล้อง - ค่าเริ่มต้น" + +msgid "Camera view - Top" +msgstr "มุมมองกล้อง - ด้านบน" + +msgid "Camera view - Bottom" +msgstr "มุมมองกล้อง - ด้านล่าง" + +msgid "Camera view - Front" +msgstr "มุมมองกล้อง - ด้านหน้า" + +msgid "Camera view - Behind" +msgstr "มุมมองกล้อง - ด้านหลัง" + +msgid "Camera Angle - Left side" +msgstr "มุมกล้อง - ด้านซ้าย" + +msgid "Camera Angle - Right side" +msgstr "มุมกล้อง - ด้านขวา" + +msgid "Camera view - Current plate" +msgstr "" + +msgid "Zoom in" +msgstr "ซูมเข้า" + +msgid "Zoom out" +msgstr "ซูมออก" + +msgid "Show/Hide 3Dconnexion devices settings dialog" +msgstr "แสดง/ซ่อนกล่องโต้ตอบการตั้งค่าอุปกรณ์ 3Dconnexion" + +msgid "Show/Hide wireframe" +msgstr "" + +msgid "On/Off G-code window" +msgstr "เปิด/ปิดหน้าต่างรหัส G" + +msgid "On/Off one layer mode of the vertical slider" +msgstr "เปิด/ปิดโหมดเลเยอร์เดียวของแถบเลื่อนแนวตั้ง" + +msgid "Switch between Prepare/Preview" +msgstr "สลับระหว่างการเตรียม/ดูตัวอย่าง" + +msgid "Collapse/Expand the sidebar" +msgstr "ยุบ/ขยายแถบด้านข้าง" + +msgid "Open the speed dial" +msgstr "" + +msgid "Reload the device page" +msgstr "" + +msgid "Show keyboard shortcuts list" +msgstr "แสดงรายการแป้นพิมพ์ลัด" + +msgid "Slicing and printing" +msgstr "" + +msgid "Editing" +msgstr "" + +msgid "Placement" +msgstr "" + +msgid "Gizmos" +msgstr "" + +msgid "Sliders" +msgstr "" + +msgid "Painting tools" +msgstr "" + +msgid "Application" +msgstr "" + #: resources/data/hints.ini: [hint:Precise wall] msgid "" "Precise wall\n" @@ -24540,6 +24698,62 @@ msgstr "" "หลีกเลี่ยงการบิดเบี้ยว\n" "คุณรู้หรือไม่ว่าเมื่อพิมพ์วัสดุที่มีแนวโน้มที่จะเกิดการบิดเบี้ยว เช่น ABS การเพิ่มอุณหภูมิฐานพิมพ์อย่างเหมาะสมสามารถลดความน่าจะเป็นของการบิดเบี้ยวได้" +#~ msgid "Tab" +#~ msgstr "แท็บ" + +#~ msgid "Displays current viewport FPS in the top-right corner." +#~ msgstr "แสดงวิวพอร์ต FPS ปัจจุบันที่มุมขวาบน" + +# AI Translated +#~ msgid "Publish 3MF Wiki" +#~ msgstr "วิกิการเผยแพร่ 3MF" + +# AI Translated +#~ msgid "Publish 3MF Video Guide" +#~ msgstr "คู่มือวีดีโอการเผยแพร่ 3MF" + +#~ msgid "Toolbar" +#~ msgstr "แถบเครื่องมือ" + +#~ msgid "Switch table page" +#~ msgstr "สลับหน้าตาราง" + +#~ msgid "Global shortcuts" +#~ msgstr "ทางลัดทั่วโลก" + +#~ msgid "Middle mouse button" +#~ msgstr "ปุ่มกลางของเมาส์" + +#~ msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." +#~ msgstr "ปรับทิศทางวัตถุที่เลือกหรือวัตถุทั้งหมดโดยอัตโนมัติ หากมีวัตถุที่เลือกไว้ วัตถุนั้นจะปรับทิศทางวัตถุที่เลือกเท่านั้น มิฉะนั้นจะวางแนววัตถุทั้งหมดในโปรเจ็กต์ปัจจุบัน" + +#~ msgid "Auto orients all objects on the active plate." +#~ msgstr "ปรับทิศทางวัตถุทั้งหมดบนเพลตที่ใช้งานอยู่โดยอัตโนมัติ" + +#~ msgid "Any arrow" +#~ msgstr "ลูกศรอะไรก็ได้" + +#~ msgid "Gizmo SLA support points" +#~ msgstr "จุดส่วนรองรับ Gizmo SLA" + +#~ msgid "Plater" +#~ msgstr "เพลเตอร์" + +#~ msgid "Gizmo" +#~ msgstr "กิสโม่" + +#~ msgid "Delete objects, parts, modifiers" +#~ msgstr "ลบวัตถุ ชิ้นส่วน ตัวดัดแปลง" + +#~ msgid "Objects List" +#~ msgstr "รายการวัตถุ" + +#~ msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." +#~ msgstr "G-code เขียนไว้ที่ด้านบนสุดของไฟล์เอาต์พุต ก่อนเนื้อหาอื่นๆ มีประโยชน์สำหรับการเพิ่มข้อมูลเมตาที่เฟิร์มแวร์เครื่องพิมพ์อ่านจากบรรทัดแรกของไฟล์ (เช่น เวลาในการพิมพ์โดยประมาณ การใช้เส้นพลาสติก) รองรับตัวยึดตำแหน่ง เช่น {print_time_sec} และ {used_filament_length}" + +#~ msgid "Print time (seconds)" +#~ msgstr "เวลาในการพิมพ์ (วินาที)" + # AI Translated #~ msgid "Open actions speed dial" #~ msgstr "เปิดสปีดไดอัลการดำเนินการ" diff --git a/localization/i18n/tr/OrcaSlicer_tr.po b/localization/i18n/tr/OrcaSlicer_tr.po index 91c5660328..1f56d37744 100644 --- a/localization/i18n/tr/OrcaSlicer_tr.po +++ b/localization/i18n/tr/OrcaSlicer_tr.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-09-18 15:50+0800\n" +"POT-Creation-Date: 2026-09-22 17:02+0800\n" "PO-Revision-Date: 2026-08-21 23:18+0300\n" "Last-Translator: GlauTech\n" "Language-Team: \n" @@ -5967,12 +5967,15 @@ msgctxt "Camera View" msgid "Right" msgstr "Sağ" -msgid "Add" -msgstr "Ekle" - msgid "Add plate" msgstr "Plaka ekle" +msgid "Split to objects" +msgstr "Nesnelere böl" + +msgid "Add" +msgstr "Ekle" + msgid "Auto orient all/selected objects" msgstr "Otomatik yönlendir tüm/seçili nesneler" @@ -5985,9 +5988,6 @@ msgstr "Tüm nesneleri hizala" msgid "Arrange objects on selected plates" msgstr "Seçilen plakalardaki nesneleri hizala" -msgid "Split to objects" -msgstr "Nesnelere böl" - msgid "Assembly View" msgstr "Montaj görünümü" @@ -6044,6 +6044,9 @@ msgstr "Taslak" msgid "Wireframe" msgstr "Wireframe" +msgid "X-Ray" +msgstr "" + # AI Translated msgid "Realistic View" msgstr "Gerçekçi Görünüm" @@ -6585,9 +6588,6 @@ msgstr "3D sahnede seçilen nesnenin etrafındaki ana hatları göster." msgid "Preferences" msgstr "Tercihler" -msgid "Open speed dial..." -msgstr "" - # AI Translated msgctxt "Menu" msgid "Edit" @@ -6596,6 +6596,9 @@ msgstr "Düzen" msgid "View" msgstr "Görünüm" +msgid "Open Speed Dial" +msgstr "" + msgid "Preset Bundle" msgstr "Ön ayar paketi" @@ -8409,10 +8412,6 @@ msgstr "Kenar çubuğunu genişlet" msgid "Collapse sidebar" msgstr "Kenar çubuğunu daralt" -# AI Translated -msgid "Tab" -msgstr "Sekme" - #, c-format, boost-format msgid "Loading file: %s" msgstr "Dosya yükleniyor: %s" @@ -9444,10 +9443,10 @@ msgstr "Çoklu cihaz yönetimi" msgid "With this option enabled, you can send a task to multiple devices at the same time and manage multiple devices." msgstr "Bu seçenek etkinleştirildiğinde, aynı anda birden fazla cihaza bir görev gönderebilir ve birden fazla cihazı yönetebilirsiniz." -msgid "Open the Speed Dial with the Space key" +msgid "Open the Speed Dial from the keyboard" msgstr "" -msgid "When enabled, pressing Space (with no other key held) opens the Speed Dial action search from any page." +msgid "When enabled, the Speed Dial keyboard shortcut (Space by default) opens the action search from any page." msgstr "" msgid "Recent actions" @@ -9586,6 +9585,15 @@ msgstr "Sağ fare sürükleme" msgid "Set the action that dragging the right mouse button should perform." msgstr "Sağ fare düğmesiyle sürüklemenin gerçekleştireceği eylemi ayarlayın." +msgid "Keyboard" +msgstr "" + +msgid "Keyboard shortcuts" +msgstr "" + +msgid "Choose the key for each action." +msgstr "" + msgid "Clear my choice on..." msgstr "Seçimimi Temizle" @@ -9710,13 +9718,40 @@ msgstr "" "GPU yükünü ve güç tüketimini azaltmak için görünüm penceresinin kare hızını sınırlar.\n" "Sınırsız kare hızı için 0 olarak ayarlayın." +msgid "Reuse the 3D scene while idle" +msgstr "" + +msgid "" +"Skips redrawing the 3D scene when only the mouse cursor moves over the viewport,\n" +"and reuses the previous frame's scene instead. Reduces GPU load.\n" +"Disable it if the viewport shows stale or missing contents.\n" +"\n" +"Takes effect immediately." +msgstr "" + +msgid "Skip unchanged frames" +msgstr "" + +msgid "" +"Skips drawing a frame altogether when it would be identical to the one already on screen.\n" +"Only applies to frames that reuse the 3D scene, so it needs Reuse the 3D scene while idle.\n" +"Disable it if a hover highlight, tooltip or animation stops updating.\n" +"\n" +"Takes effect immediately." +msgstr "" + # AI Translated msgid "Show FPS overlay" msgstr "FPS göstergesini göster" -# AI Translated -msgid "Displays current viewport FPS in the top-right corner." -msgstr "Geçerli görünüm penceresinin FPS değerini sağ üst köşede gösterir." +msgid "Displays rendering counts in the top-right corner of the viewport." +msgstr "" + +msgid "FPS: frames presented to the screen per second." +msgstr "" + +msgid "3D: frames per second that redrew the 3D scene." +msgstr "" # AI Translated msgid "G-code Preview" @@ -10192,13 +10227,8 @@ msgstr "3MF Yayınla..." msgid "Select which settings to be published in the 3MF file" msgstr "3MF dosyasında hangi ayarların yayınlanacağını seçin" -# AI Translated -msgid "Publish 3MF Wiki" -msgstr "3MF Yayınlama Wiki" - -# AI Translated -msgid "Publish 3MF Video Guide" -msgstr "3MF Yayınlama Video Kılavuzu" +msgid "Video Guide" +msgstr "" # AI Translated msgid "Mixed filament - published as a whole when \"Enable\" above is selected" @@ -10400,6 +10430,13 @@ msgstr "" msgid "No wiki page for this action" msgstr "" +msgid "Show details" +msgstr "Ayrıntıları göster" + +# AI Translated +msgid "Hide details" +msgstr "Ayrıntıları gizle" + #, c-format, boost-format msgid "\"%s\" is a Developer setting. Enable Developer mode to edit it?" msgstr "" @@ -12274,68 +12311,39 @@ msgstr "Yapılandırma paketi önceki Yapılandırma Kılavuzu'nda değiştirild msgid "Configuration package changed" msgstr "Yapılandırma paketi değiştirildi" -msgid "Toolbar" -msgstr "Araç Çubuğu" - -msgid "Objects list" -msgstr "Nesne listesi" - -msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" -msgstr "STL/STEP/3MF/OBJ/AMF dosyalarından geometri verilerini içe aktarın" - -msgid "Paste from clipboard" -msgstr "Panodan yapıştır" - -msgid "Show/Hide 3Dconnexion devices settings dialog" -msgstr "3Dconnexion cihazları ayarları iletişim kutusunu Göster/Gizle" - -msgid "Switch table page" -msgstr "Tablo sayfasını değiştir" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Space" -msgstr "Boşluk" - -msgid "Open speed dial" -msgstr "" - -msgid "Run a Speed Dial favourite (while the Speed Dial is open)" -msgstr "" - -msgid "Show keyboard shortcuts list" -msgstr "Klavye kısayolları listesini göster" - -msgid "Global shortcuts" -msgstr "Genel kısayollar" - msgid "Pan View" msgstr "Pan Görünümü" msgid "Rotate View" msgstr "Görüntüyü döndür" +#, c-format, boost-format +msgid "Use %s or %s, or a key that does not type a character." +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "Key" +msgstr "" + +msgid "Left mouse" +msgstr "" + +msgid "Available anywhere in the window, even while typing in a text field." +msgstr "" + +msgid "Run a speed dial favorite while the dial is open" +msgstr "" + # AI Translated -msgid "Middle mouse button" -msgstr "Orta fare düğmesi" +msgctxt "Keyboard Shortcut" +msgid "Tab" +msgstr "Tab" -msgid "Zoom View" -msgstr "Zoom Görünümü" +msgid "Switch to the next main tab" +msgstr "" -msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." -msgstr "Seçilen nesneleri veya tüm nesneleri otomatik olarak yönlendirir. Seçilen nesneler varsa, yalnızca seçilenleri yönlendirir. Aksi takdirde mevcut projedeki tüm nesneler yönlendirilecektir." - -msgid "Auto orients all objects on the active plate." -msgstr "Aktif plakadaki tüm nesneleri otomatik olarak yönlendirir." - -msgid "Collapse/Expand the sidebar" -msgstr "Kenar çubuğunu daralt/genişlet" - -msgid "Any arrow" -msgstr "Herhangi bir ok" - -msgid "Movement in camera space" -msgstr "Kamera alanında hareket" +msgid "Available while the 3D view on the Prepare tab has focus." +msgstr "" msgid "Select a part" msgstr "Parça seçin" @@ -12346,127 +12354,29 @@ msgstr "Birden fazla nesne seç" msgid "Select objects by rectangle" msgstr "Nesneleri dikdörtgene göre seç" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Up" -msgstr "Yukarı Ok" - -msgid "Move selection 10mm in positive Y direction" -msgstr "Seçimi pozitif Y yönünde 10 mm taşı" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Down" -msgstr "Aşağı Ok" - -msgid "Move selection 10mm in negative Y direction" -msgstr "Seçimi negatif Y yönünde 10 mm taşı" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Left" -msgstr "Sol Ok" - -msgid "Move selection 10mm in negative X direction" -msgstr "Seçimi negatif X yönünde 10 mm taşı" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Right" -msgstr "Sağ Ok" - -msgid "Move selection 10mm in positive X direction" -msgstr "Seçimi pozitif X yönünde 10 mm taşı" +msgid "Keyboard 1-9: set filament for object/part" +msgstr "Klavye 1-9: nesneye/parçaya filament ata" msgid "Movement step set to 1mm" msgstr "Hareket adımı 1 mm'ye ayarlandı" -msgid "Keyboard 1-9: set filament for object/part" -msgstr "Klavye 1-9: nesneye/parçaya filament ata" +msgid "Movement in camera space" +msgstr "Kamera alanında hareket" -msgid "Camera view - Default" -msgstr "Kamera görünümü - Varsayılan" +msgid "Middle mouse" +msgstr "" -msgid "Camera view - Top" -msgstr "Kamera görünümü - Üst" +msgid "Right mouse" +msgstr "" -msgid "Camera view - Bottom" -msgstr "Kamera görünümü - Alt" +msgid "Zoom View" +msgstr "Zoom Görünümü" -msgid "Camera view - Front" -msgstr "Kamera görünümü - Ön" +msgid "Painting" +msgstr "" -msgid "Camera view - Behind" -msgstr "Kamera görünümü - Arka" - -msgid "Camera Angle - Left side" -msgstr "Kamera Açısı - Sol" - -msgid "Camera Angle - Right side" -msgstr "Kamera Açısı - Sağ" - -msgid "Select all objects" -msgstr "Tüm nesneleri seç" - -msgid "Gizmo move" -msgstr "Gizmo hareket" - -msgid "Gizmo rotate" -msgstr "Gizmo döndürme" - -msgid "Gizmo scale" -msgstr "Gizmo ölçek" - -msgid "Gizmo place face on bed" -msgstr "Gizmo yüzünüzü yatağa yerleştirin" - -msgid "Gizmo cut" -msgstr "Gizmo kesim" - -msgid "Gizmo mesh boolean" -msgstr "Gizmo mesh bölme" - -msgid "Gizmo FDM paint-on fuzzy skin" -msgstr "Gizmo FDM boyama ile uygulanan pütürlü yüzey" - -msgid "Gizmo SLA support points" -msgstr "Gizmo SLA destek noktaları" - -msgid "Gizmo FDM paint-on seam" -msgstr "Gizmo FDM boyalı dikiş" - -msgid "Gizmo text emboss/engrave" -msgstr "Gizmo metin kabartma/kazıma" - -msgid "Gizmo measure" -msgstr "Gizmo ölçüm" - -msgid "Gizmo assemble" -msgstr "Gizmo birleştir" - -msgid "Gizmo brim ears" -msgstr "Gizmo lenarlık kulakları" - -msgid "Zoom in" -msgstr "Yakınlaştır" - -msgid "Zoom out" -msgstr "Uzaklaştır" - -# AI Translated -msgid "Toggle printable for object/part" -msgstr "Nesne/parça için yazdırılabilirliği aç/kapat" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Tab" -msgstr "Tab" - -msgid "Switch between Prepare/Preview" -msgstr "Hazırlama/Önizleme arasında geçiş yap" - -msgid "Plater" -msgstr "Plakacı" +msgid "Available while a painting gizmo is open: supports, seam, fuzzy skin or color painting." +msgstr "" msgid "Move: press to snap by 1mm" msgstr "Hareket Ettir: 1 mm kadar yaslamak için basın" @@ -12477,15 +12387,19 @@ msgstr "Destek/Renkli Boyama: kalem yarıçapını ayarlayın" msgid "Support/Color Painting: adjust section position" msgstr "Destek/Renkli Boyama: bölüm konumunu ayarlayın" -# AI Translated -msgid "Gizmo" -msgstr "Gizmo" +msgid "Objects list" +msgstr "Nesne listesi" + +msgid "Available while the object list has focus." +msgstr "" msgid "Set extruder number for the objects and parts" msgstr "Nesneler ve parçalar için ekstruder numarasını ayarlayın" -msgid "Delete objects, parts, modifiers" -msgstr "Nesneleri, parçaları, değiştiricileri silin" +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Space" +msgstr "Boşluk" msgid "Select the object/part and press space to change the name" msgstr "Nesneyi/parçayı seçin ve adını değiştirmek için boşluk tuşuna basın" @@ -12496,45 +12410,48 @@ msgstr "Fare tıklaması" msgid "Select the object/part and mouse click to change the name" msgstr "Nesneyi/parçayı seçin ve adını değiştirmek için fareye tıklayın" -msgid "Objects List" -msgstr "Nesne Listesi" - -msgid "Vertical slider - Move active thumb Up" -msgstr "Dikey kaydırıcı - Etkin başparmağı yukarı hareket ettir" - -msgid "Vertical slider - Move active thumb Down" -msgstr "Dikey kaydırıcı - Etkin başparmağı Aşağı hareket ettir" - -msgid "Horizontal slider - Move active thumb Left" -msgstr "Yatay kaydırıcı - Etkin başparmağı sola taşı" - -msgid "Horizontal slider - Move active thumb Right" -msgstr "Yatay kaydırıcı - Etkin başparmağı sağa taşı" - -msgid "On/Off one layer mode of the vertical slider" -msgstr "Dikey kaydırıcının tek katman modunu açma/kapama" - -msgid "On/Off G-code window" -msgstr "G-code penceresini aç/kapat" +msgid "Available while the 3D view on the Preview tab has focus." +msgstr "" msgid "Move slider 5x faster" msgstr "Kaydırıcıyı 5 kat daha hızlı hareket ettirin" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Home" -msgstr "Home" +msgid "Scroll slider 5x faster" +msgstr "" -msgid "Horizontal slider - Move to start position" -msgstr "Yatay kaydırıcı - Başlangıç konumuna taşıyın" +msgid "Not customizable" +msgstr "" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "End" -msgstr "End" +#, c-format, boost-format +msgid "%s is assigned to %s. Reassign it to %s?" +msgstr "" -msgid "Horizontal slider - Move to last position" -msgstr "Yatay kaydırıcı - Son konuma git" +#, c-format, boost-format +msgid "The default %s is assigned to %s. Reassign it to %s?" +msgstr "" + +msgid "Global shortcuts also apply while typing." +msgstr "" + +msgid "A key that types a character cannot be a global shortcut." +msgstr "" + +msgid "Esc cancels, Enter confirms." +msgstr "" + +#, c-format, boost-format +msgid "" +"Press the new shortcut for\n" +"\"%s\"" +msgstr "" + +#, c-format, boost-format +msgid "Already used as a step of %s." +msgstr "" + +#, c-format, boost-format +msgid "Already assigned to %s. Press OK to reassign it." +msgstr "" msgid "Release Note" msgstr "Sürüm notu" @@ -17528,8 +17445,8 @@ msgstr "Ön ısıtma adımları" msgid "Insert multiple preheat commands (e.g. M104.1). Only useful for Prusa XL. For other printers, please set it to 1." msgstr "Birden fazla ön ısıtma komutu ekleyin (örn. M104.1). Yalnızca Prusa XL için kullanışlıdır. Diğer yazıcılar için lütfen 1’e ayarlayın." -msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." -msgstr "G-code, çıktı dosyasının en üstünde, diğer içeriklerden önce yazılır. Yazıcı ürün yazılımının dosyanın ilk satırlarından okuduğu meta verileri (ör. tahmini yazdırma süresi, filament kullanımı) eklemek için kullanışlıdır. {print_time_sec} ve {used_filament_length} gibi yer tutucuları destekler." +msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_total_sec}, {print_time_day}, {print_time_hour}, {print_time_minute}, {print_time_sec} and {used_filament_length}." +msgstr "" msgid "Start G-code" msgstr "Başlangıç G-code" @@ -19087,12 +19004,36 @@ msgstr "Kullanılan" msgid "Total length of filament used in the print." msgstr "Baskıda kullanılan filamentin toplam uzunluğu." -msgid "Print time (seconds)" -msgstr "Yazdırma süresi (saniye)" +msgid "Print time (total seconds)" +msgstr "" msgid "Total estimated print time in seconds. Replaced with actual value during post-processing." msgstr "Saniye cinsinden toplam tahmini yazdırma süresi. Son işlem sırasında gerçek değerle değiştirilir." +msgid "Print time (days component)" +msgstr "" + +msgid "Estimated print time day component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (hours component)" +msgstr "" + +msgid "Estimated print time hour component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (minutes component)" +msgstr "" + +msgid "Estimated print time minute component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (seconds component)" +msgstr "" + +msgid "Estimated print time second component (normal mode). Replaced with actual value during post-processing." +msgstr "" + msgid "Filament length (meters)" msgstr "Filament uzunluğu (metre)" @@ -20965,6 +20906,9 @@ msgstr "Geçerli oturum algılanmadı. 3DPrinterOS'a giriş yapılsın mı?" msgid "Success!" msgstr "Başarılı!" +msgid "Generate API Key" +msgstr "" + msgid "Are you sure to log out?" msgstr "Çıkış yaptığınızdan emin misiniz?" @@ -22018,13 +21962,6 @@ msgstr "Bulut özellikleri, yazıcı keşfi ve uzaktan yazdırma için Bambu Ağ msgid "Error: %s" msgstr "Hata: %s" -msgid "Show details" -msgstr "Ayrıntıları göster" - -# AI Translated -msgid "Hide details" -msgstr "Ayrıntıları gizle" - msgid "Version to install:" msgstr "Yüklenecek sürüm:" @@ -24681,6 +24618,12 @@ msgstr "" msgid "No binding for that field" msgstr "" +msgid "Enter a number" +msgstr "" + +msgid "Not a number" +msgstr "" + msgid "Primitive" msgstr "" @@ -24693,6 +24636,217 @@ msgstr "" msgid "Clear All" msgstr "" +msgctxt "Keyboard Shortcut" +msgid "Ins" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Home" +msgstr "Home" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "End" +msgstr "End" + +msgctxt "Keyboard Shortcut" +msgid "PgUp" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "PgDn" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Left" +msgstr "Sol Ok" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Right" +msgstr "Sağ Ok" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Up" +msgstr "Yukarı Ok" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Down" +msgstr "Aşağı Ok" + +msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" +msgstr "STL/STEP/3MF/OBJ/AMF dosyalarından geometri verilerini içe aktarın" + +msgid "Select all objects" +msgstr "Tüm nesneleri seç" + +msgid "Paste from clipboard" +msgstr "Panodan yapıştır" + +# AI Translated +msgid "Toggle printable for object/part" +msgstr "Nesne/parça için yazdırılabilirliği aç/kapat" + +msgid "Move selection 10mm in negative X direction" +msgstr "Seçimi negatif X yönünde 10 mm taşı" + +msgid "Move selection 10mm in positive X direction" +msgstr "Seçimi pozitif X yönünde 10 mm taşı" + +msgid "Move selection 10mm in positive Y direction" +msgstr "Seçimi pozitif Y yönünde 10 mm taşı" + +msgid "Move selection 10mm in negative Y direction" +msgstr "Seçimi negatif Y yönünde 10 mm taşı" + +msgid "Rotate selection 45 degrees counterclockwise" +msgstr "" + +msgid "Rotate selection 45 degrees clockwise" +msgstr "" + +msgid "Gizmo move" +msgstr "Gizmo hareket" + +msgid "Gizmo rotate" +msgstr "Gizmo döndürme" + +msgid "Gizmo scale" +msgstr "Gizmo ölçek" + +msgid "Gizmo place face on bed" +msgstr "Gizmo yüzünüzü yatağa yerleştirin" + +msgid "Gizmo cut" +msgstr "Gizmo kesim" + +msgid "Gizmo mesh boolean" +msgstr "Gizmo mesh bölme" + +msgid "Gizmo FDM paint-on supports" +msgstr "" + +msgid "Gizmo FDM paint-on seam" +msgstr "Gizmo FDM boyalı dikiş" + +msgid "Gizmo FDM paint-on fuzzy skin" +msgstr "Gizmo FDM boyama ile uygulanan pütürlü yüzey" + +msgid "Gizmo multi-material painting" +msgstr "" + +msgid "Gizmo text emboss/engrave" +msgstr "Gizmo metin kabartma/kazıma" + +msgid "Gizmo measure" +msgstr "Gizmo ölçüm" + +msgid "Gizmo assemble" +msgstr "Gizmo birleştir" + +msgid "Gizmo brim ears" +msgstr "Gizmo lenarlık kulakları" + +msgid "Vertical slider - Move active thumb Up" +msgstr "Dikey kaydırıcı - Etkin başparmağı yukarı hareket ettir" + +msgid "Vertical slider - Move active thumb Down" +msgstr "Dikey kaydırıcı - Etkin başparmağı Aşağı hareket ettir" + +msgid "Horizontal slider - Move active thumb Left" +msgstr "Yatay kaydırıcı - Etkin başparmağı sola taşı" + +msgid "Horizontal slider - Move active thumb Right" +msgstr "Yatay kaydırıcı - Etkin başparmağı sağa taşı" + +msgid "Horizontal slider - Move to start position" +msgstr "Yatay kaydırıcı - Başlangıç konumuna taşıyın" + +msgid "Horizontal slider - Move to last position" +msgstr "Yatay kaydırıcı - Son konuma git" + +msgid "Camera view - Default" +msgstr "Kamera görünümü - Varsayılan" + +msgid "Camera view - Top" +msgstr "Kamera görünümü - Üst" + +msgid "Camera view - Bottom" +msgstr "Kamera görünümü - Alt" + +msgid "Camera view - Front" +msgstr "Kamera görünümü - Ön" + +msgid "Camera view - Behind" +msgstr "Kamera görünümü - Arka" + +msgid "Camera Angle - Left side" +msgstr "Kamera Açısı - Sol" + +msgid "Camera Angle - Right side" +msgstr "Kamera Açısı - Sağ" + +msgid "Camera view - Current plate" +msgstr "" + +msgid "Zoom in" +msgstr "Yakınlaştır" + +msgid "Zoom out" +msgstr "Uzaklaştır" + +msgid "Show/Hide 3Dconnexion devices settings dialog" +msgstr "3Dconnexion cihazları ayarları iletişim kutusunu Göster/Gizle" + +msgid "Show/Hide wireframe" +msgstr "" + +msgid "On/Off G-code window" +msgstr "G-code penceresini aç/kapat" + +msgid "On/Off one layer mode of the vertical slider" +msgstr "Dikey kaydırıcının tek katman modunu açma/kapama" + +msgid "Switch between Prepare/Preview" +msgstr "Hazırlama/Önizleme arasında geçiş yap" + +msgid "Collapse/Expand the sidebar" +msgstr "Kenar çubuğunu daralt/genişlet" + +msgid "Open the speed dial" +msgstr "" + +msgid "Reload the device page" +msgstr "" + +msgid "Show keyboard shortcuts list" +msgstr "Klavye kısayolları listesini göster" + +msgid "Slicing and printing" +msgstr "" + +msgid "Editing" +msgstr "" + +msgid "Placement" +msgstr "" + +msgid "Gizmos" +msgstr "" + +msgid "Sliders" +msgstr "" + +msgid "Painting tools" +msgstr "" + +msgid "Application" +msgstr "" + #: resources/data/hints.ini: [hint:Precise wall] msgid "" "Precise wall\n" @@ -24995,6 +25149,66 @@ msgstr "" "Eğilmeyi önleyin\n" "ABS gibi bükülmeye yatkın malzemelere baskı yaparken, ısıtma yatağı sıcaklığının uygun şekilde arttırılmasının bükülme olasılığını azaltabileceğini biliyor muydunuz?" +# AI Translated +#~ msgid "Tab" +#~ msgstr "Sekme" + +# AI Translated +#~ msgid "Displays current viewport FPS in the top-right corner." +#~ msgstr "Geçerli görünüm penceresinin FPS değerini sağ üst köşede gösterir." + +# AI Translated +#~ msgid "Publish 3MF Wiki" +#~ msgstr "3MF Yayınlama Wiki" + +# AI Translated +#~ msgid "Publish 3MF Video Guide" +#~ msgstr "3MF Yayınlama Video Kılavuzu" + +#~ msgid "Toolbar" +#~ msgstr "Araç Çubuğu" + +#~ msgid "Switch table page" +#~ msgstr "Tablo sayfasını değiştir" + +#~ msgid "Global shortcuts" +#~ msgstr "Genel kısayollar" + +# AI Translated +#~ msgid "Middle mouse button" +#~ msgstr "Orta fare düğmesi" + +#~ msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." +#~ msgstr "Seçilen nesneleri veya tüm nesneleri otomatik olarak yönlendirir. Seçilen nesneler varsa, yalnızca seçilenleri yönlendirir. Aksi takdirde mevcut projedeki tüm nesneler yönlendirilecektir." + +#~ msgid "Auto orients all objects on the active plate." +#~ msgstr "Aktif plakadaki tüm nesneleri otomatik olarak yönlendirir." + +#~ msgid "Any arrow" +#~ msgstr "Herhangi bir ok" + +#~ msgid "Gizmo SLA support points" +#~ msgstr "Gizmo SLA destek noktaları" + +#~ msgid "Plater" +#~ msgstr "Plakacı" + +# AI Translated +#~ msgid "Gizmo" +#~ msgstr "Gizmo" + +#~ msgid "Delete objects, parts, modifiers" +#~ msgstr "Nesneleri, parçaları, değiştiricileri silin" + +#~ msgid "Objects List" +#~ msgstr "Nesne Listesi" + +#~ msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." +#~ msgstr "G-code, çıktı dosyasının en üstünde, diğer içeriklerden önce yazılır. Yazıcı ürün yazılımının dosyanın ilk satırlarından okuduğu meta verileri (ör. tahmini yazdırma süresi, filament kullanımı) eklemek için kullanışlıdır. {print_time_sec} ve {used_filament_length} gibi yer tutucuları destekler." + +#~ msgid "Print time (seconds)" +#~ msgstr "Yazdırma süresi (saniye)" + # AI Translated #~ msgid "Open actions speed dial" #~ msgstr "Eylem hızlı erişim menüsünü aç" diff --git a/localization/i18n/uk/OrcaSlicer_uk.po b/localization/i18n/uk/OrcaSlicer_uk.po index ffa055a2ff..d173e6fa5c 100644 --- a/localization/i18n/uk/OrcaSlicer_uk.po +++ b/localization/i18n/uk/OrcaSlicer_uk.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: orcaslicerua\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-09-18 15:50+0800\n" +"POT-Creation-Date: 2026-09-22 17:02+0800\n" "PO-Revision-Date: 2026-07-17 16:25+0300\n" "Last-Translator: Andrij Mizyk \n" "Language-Team: Ukrainian\n" @@ -5926,12 +5926,15 @@ msgctxt "Camera View" msgid "Right" msgstr "Право" -msgid "Add" -msgstr "Додати" - msgid "Add plate" msgstr "Додати пластину" +msgid "Split to objects" +msgstr "Розділити на обʼєкти" + +msgid "Add" +msgstr "Додати" + msgid "Auto orient all/selected objects" msgstr "Автоорієнтація всі/вибрані обʼєкти" @@ -5944,9 +5947,6 @@ msgstr "Впорядкувати всі обʼєкти" msgid "Arrange objects on selected plates" msgstr "Впорядкувати обʼєкти на вибраних пластинах" -msgid "Split to objects" -msgstr "Розділити на обʼєкти" - msgid "Assembly View" msgstr "Вигляд збирання" @@ -6002,6 +6002,9 @@ msgstr "Контур" msgid "Wireframe" msgstr "Каркас" +msgid "X-Ray" +msgstr "" + msgid "Realistic View" msgstr "Реалістичний вигляд" @@ -6554,9 +6557,6 @@ msgstr "Показувати контур навколо виділеного о msgid "Preferences" msgstr "Налаштування" -msgid "Open speed dial..." -msgstr "" - # AI Translated msgctxt "Menu" msgid "Edit" @@ -6565,6 +6565,9 @@ msgstr "Редагування" msgid "View" msgstr "Вигляд" +msgid "Open Speed Dial" +msgstr "" + msgid "Preset Bundle" msgstr "Набір пресетів" @@ -8411,9 +8414,6 @@ msgstr "Розгорнути бічну панель" msgid "Collapse sidebar" msgstr "Згорнути бічну панель" -msgid "Tab" -msgstr "Табуляції" - #, c-format, boost-format msgid "Loading file: %s" msgstr "Завантаження файлу: %s" @@ -9462,10 +9462,10 @@ msgstr "Керування кількома пристроями" msgid "With this option enabled, you can send a task to multiple devices at the same time and manage multiple devices." msgstr "З цією опцією ввімкненою, ви можете відправляти завдання на кілька пристроїв одночасно та керувати декількома пристроями." -msgid "Open the Speed Dial with the Space key" +msgid "Open the Speed Dial from the keyboard" msgstr "" -msgid "When enabled, pressing Space (with no other key held) opens the Speed Dial action search from any page." +msgid "When enabled, the Speed Dial keyboard shortcut (Space by default) opens the action search from any page." msgstr "" msgid "Recent actions" @@ -9609,6 +9609,15 @@ msgstr "Перетягування правою кнопкою миші" msgid "Set the action that dragging the right mouse button should perform." msgstr "Задає дію, яку має виконувати перетягування правою кнопкою миші." +msgid "Keyboard" +msgstr "" + +msgid "Keyboard shortcuts" +msgstr "" + +msgid "Choose the key for each action." +msgstr "" + # AI Translated msgid "Clear my choice on..." msgstr "Очистити мій вибір для..." @@ -9723,13 +9732,40 @@ msgstr "" "Обмежує частоту кадрів вікна перегляду, щоб зменшити навантаження на GPU та енергоспоживання.\n" "Встановіть 0 для необмеженої частоти кадрів." +msgid "Reuse the 3D scene while idle" +msgstr "" + +msgid "" +"Skips redrawing the 3D scene when only the mouse cursor moves over the viewport,\n" +"and reuses the previous frame's scene instead. Reduces GPU load.\n" +"Disable it if the viewport shows stale or missing contents.\n" +"\n" +"Takes effect immediately." +msgstr "" + +msgid "Skip unchanged frames" +msgstr "" + +msgid "" +"Skips drawing a frame altogether when it would be identical to the one already on screen.\n" +"Only applies to frames that reuse the 3D scene, so it needs Reuse the 3D scene while idle.\n" +"Disable it if a hover highlight, tooltip or animation stops updating.\n" +"\n" +"Takes effect immediately." +msgstr "" + # AI Translated msgid "Show FPS overlay" msgstr "Показувати накладку FPS" -# AI Translated -msgid "Displays current viewport FPS in the top-right corner." -msgstr "Показує поточний FPS вікна перегляду у верхньому правому куті." +msgid "Displays rendering counts in the top-right corner of the viewport." +msgstr "" + +msgid "FPS: frames presented to the screen per second." +msgstr "" + +msgid "3D: frames per second that redrew the 3D scene." +msgstr "" # AI Translated msgid "G-code Preview" @@ -10195,13 +10231,8 @@ msgstr "Публікувати 3MF..." msgid "Select which settings to be published in the 3MF file" msgstr "Виберіть, які налаштування буде опубліковано у файлі 3MF" -# AI Translated -msgid "Publish 3MF Wiki" -msgstr "Енциклопедія з публікації 3MF" - -# AI Translated -msgid "Publish 3MF Video Guide" -msgstr "Відеопосібник з публікації 3MF" +msgid "Video Guide" +msgstr "" # AI Translated msgid "Mixed filament - published as a whole when \"Enable\" above is selected" @@ -10404,6 +10435,13 @@ msgstr "" msgid "No wiki page for this action" msgstr "" +msgid "Show details" +msgstr "Показати подробиці" + +# AI Translated +msgid "Hide details" +msgstr "Сховати подробиці" + #, c-format, boost-format msgid "\"%s\" is a Developer setting. Enable Developer mode to edit it?" msgstr "" @@ -12338,68 +12376,39 @@ msgstr "Пакет конфігурації змінено в попереднь msgid "Configuration package changed" msgstr "Змінено пакет конфігурації" -msgid "Toolbar" -msgstr "Панель інструментів" - -msgid "Objects list" -msgstr "Список обʼєктів" - -msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" -msgstr "Імпорт геометричних даних із файлів STL/STEP/3MF/OBJ/AMF" - -msgid "Paste from clipboard" -msgstr "Вставити з буфера обміну" - -msgid "Show/Hide 3Dconnexion devices settings dialog" -msgstr "Показати/приховати діалог налаштувань пристроїв 3Dconnexion" - -msgid "Switch table page" -msgstr "Перемкнути сторінку таблиці" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Space" -msgstr "Пробіл" - -msgid "Open speed dial" -msgstr "" - -msgid "Run a Speed Dial favourite (while the Speed Dial is open)" -msgstr "" - -msgid "Show keyboard shortcuts list" -msgstr "Показати список клавіш" - -msgid "Global shortcuts" -msgstr "Глобальні ярлики" - msgid "Pan View" msgstr "Панорамний вигляд" msgid "Rotate View" msgstr "Повернути вигляд" +#, c-format, boost-format +msgid "Use %s or %s, or a key that does not type a character." +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "Key" +msgstr "" + +msgid "Left mouse" +msgstr "" + +msgid "Available anywhere in the window, even while typing in a text field." +msgstr "" + +msgid "Run a speed dial favorite while the dial is open" +msgstr "" + # AI Translated -msgid "Middle mouse button" -msgstr "Середня кнопка миші" +msgctxt "Keyboard Shortcut" +msgid "Tab" +msgstr "Tab" -msgid "Zoom View" -msgstr "Перегляд масштабу" +msgid "Switch to the next main tab" +msgstr "" -msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." -msgstr "Автоматично орієнтує вибрані обʼєкти або всі обʼєкти. Якщо вибрано обʼєкти, він просто орієнтує обрані. В іншому випадку він будеОрієнтувати всі обʼєкти на поточному проєкт." - -msgid "Auto orients all objects on the active plate." -msgstr "Автоматично орієнтує всі обʼєкти на поточному диску." - -msgid "Collapse/Expand the sidebar" -msgstr "Згорнути/розгорнути бічну панель" - -msgid "Any arrow" -msgstr "Будь-яка стрілка" - -msgid "Movement in camera space" -msgstr "Рух у просторі камери" +msgid "Available while the 3D view on the Prepare tab has focus." +msgstr "" msgid "Select a part" msgstr "Виберіть частину" @@ -12410,127 +12419,29 @@ msgstr "Вибрати кілька обʼєктів" msgid "Select objects by rectangle" msgstr "Виділити обʼєкти прямокутником" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Up" -msgstr "Стрілка вгору" - -msgid "Move selection 10mm in positive Y direction" -msgstr "Перемістити виділення на 10 мм у позитивному напрямку Y" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Down" -msgstr "Стрілка вниз" - -msgid "Move selection 10mm in negative Y direction" -msgstr "Перемістити виділення на 10 мм у негативному напрямку Y" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Left" -msgstr "Стрілка вліво" - -msgid "Move selection 10mm in negative X direction" -msgstr "Перемістити виділення на 10 мм у негативному напрямку по осі X" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Right" -msgstr "Стрілка вправо" - -msgid "Move selection 10mm in positive X direction" -msgstr "Перемістити виділення на 10 мм у позитивному напрямку X" +msgid "Keyboard 1-9: set filament for object/part" +msgstr "клавіатура 1-9: встановити філамент для обʼєкта/деталі" msgid "Movement step set to 1mm" msgstr "Крок переміщення встановлено на 1 мм" -msgid "Keyboard 1-9: set filament for object/part" -msgstr "клавіатура 1-9: встановити філамент для обʼєкта/деталі" +msgid "Movement in camera space" +msgstr "Рух у просторі камери" -msgid "Camera view - Default" -msgstr "Вигляд камери - Типовий" +msgid "Middle mouse" +msgstr "" -msgid "Camera view - Top" -msgstr "Вигляд камери - Верх" +msgid "Right mouse" +msgstr "" -msgid "Camera view - Bottom" -msgstr "Вигляд камери - Низ" +msgid "Zoom View" +msgstr "Перегляд масштабу" -msgid "Camera view - Front" -msgstr "Вигляд камери - Перед" +msgid "Painting" +msgstr "" -msgid "Camera view - Behind" -msgstr "Вигляд камери - Зад" - -msgid "Camera Angle - Left side" -msgstr "Кут камери – Лівий бік" - -msgid "Camera Angle - Right side" -msgstr "Кут камери - Правий бік" - -msgid "Select all objects" -msgstr "Вибрати всі обʼєкти" - -msgid "Gizmo move" -msgstr "Рух Gizmo" - -msgid "Gizmo rotate" -msgstr "Поворот Gizmo" - -msgid "Gizmo scale" -msgstr "Шкала Gizmo" - -msgid "Gizmo place face on bed" -msgstr "Покласти грань на стіл Gizmo" - -msgid "Gizmo cut" -msgstr "Виріз Gizmo" - -msgid "Gizmo mesh boolean" -msgstr "Булеві операції Gizmo" - -msgid "Gizmo FDM paint-on fuzzy skin" -msgstr "Gizmo Малювання шорсткої поверхні" - -msgid "Gizmo SLA support points" -msgstr "Точки підтримки Gizmo SL" - -msgid "Gizmo FDM paint-on seam" -msgstr "Швид, що фарбується Gizmo FDM" - -msgid "Gizmo text emboss/engrave" -msgstr "Текстове тиснення/гравіювання Gizmo" - -msgid "Gizmo measure" -msgstr "виміряти Gizmo" - -msgid "Gizmo assemble" -msgstr "Зібрати Gizmo" - -msgid "Gizmo brim ears" -msgstr "Краєчки Gizmo" - -msgid "Zoom in" -msgstr "Приблизити" - -msgid "Zoom out" -msgstr "Віддалити" - -# AI Translated -msgid "Toggle printable for object/part" -msgstr "Перемкнути можливість друку для обʼєкта/частини" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Tab" -msgstr "Tab" - -msgid "Switch between Prepare/Preview" -msgstr "Переключення між Підготовка/Попередній перегляд" - -msgid "Plater" -msgstr "Тарілка" +msgid "Available while a painting gizmo is open: supports, seam, fuzzy skin or color painting." +msgstr "" msgid "Move: press to snap by 1mm" msgstr "Переміщення: натисніть для переміщення на 1 мм" @@ -12541,14 +12452,19 @@ msgstr "Підтримка/Фарбування: регулювання раді msgid "Support/Color Painting: adjust section position" msgstr "Підтримка/Фарбування: регулювання положення секцій" -msgid "Gizmo" -msgstr "Gizmo" +msgid "Objects list" +msgstr "Список обʼєктів" + +msgid "Available while the object list has focus." +msgstr "" msgid "Set extruder number for the objects and parts" msgstr "Встановіть номер екструдера для обʼєктів та деталей" -msgid "Delete objects, parts, modifiers" -msgstr "Видалення обʼєктів, частин, модифікаторів" +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Space" +msgstr "Пробіл" msgid "Select the object/part and press space to change the name" msgstr "Виберіть обʼєкт/деталь і натисніть пробіл, щоб змінити назву" @@ -12559,45 +12475,48 @@ msgstr "Клацання миші" msgid "Select the object/part and mouse click to change the name" msgstr "Виберіть обʼєкт/деталь і клацніть, щоб змінити назву" -msgid "Objects List" -msgstr "Список обʼєктів" - -msgid "Vertical slider - Move active thumb Up" -msgstr "Вертикальний повзунок - рух активного великого пальця вгору" - -msgid "Vertical slider - Move active thumb Down" -msgstr "Вертикальний повзунок - Перемістити активний палець вниз" - -msgid "Horizontal slider - Move active thumb Left" -msgstr "Горизонтальний повзунок - Перемістити активний палець вліво" - -msgid "Horizontal slider - Move active thumb Right" -msgstr "Горизонтальний повзунок - Перемістити активний палець праворуч" - -msgid "On/Off one layer mode of the vertical slider" -msgstr "Увімкнення/вимкнення одношарового режиму вертикального повзунка" - -msgid "On/Off G-code window" -msgstr "Увімкнення/вимкнення вікна G-коду" +msgid "Available while the 3D view on the Preview tab has focus." +msgstr "" msgid "Move slider 5x faster" msgstr "Переміщення повзунка в 5 разів швидше" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Home" -msgstr "Home" +msgid "Scroll slider 5x faster" +msgstr "" -msgid "Horizontal slider - Move to start position" -msgstr "Горизонтальний повзунок - Перемістити в початкове положення" +msgid "Not customizable" +msgstr "" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "End" -msgstr "End" +#, c-format, boost-format +msgid "%s is assigned to %s. Reassign it to %s?" +msgstr "" -msgid "Horizontal slider - Move to last position" -msgstr "Горизонтальний повзунок - Перемістити в останню позицію" +#, c-format, boost-format +msgid "The default %s is assigned to %s. Reassign it to %s?" +msgstr "" + +msgid "Global shortcuts also apply while typing." +msgstr "" + +msgid "A key that types a character cannot be a global shortcut." +msgstr "" + +msgid "Esc cancels, Enter confirms." +msgstr "" + +#, c-format, boost-format +msgid "" +"Press the new shortcut for\n" +"\"%s\"" +msgstr "" + +#, c-format, boost-format +msgid "Already used as a step of %s." +msgstr "" + +#, c-format, boost-format +msgid "Already assigned to %s. Press OK to reassign it." +msgstr "" msgid "Release Note" msgstr "Примітка до випуску" @@ -17717,9 +17636,8 @@ msgstr "Кроки підігріву" msgid "Insert multiple preheat commands (e.g. M104.1). Only useful for Prusa XL. For other printers, please set it to 1." msgstr "Вставляє кілька команд попереднього нагріву (наприклад, M104.1). Корисно лише для Prusa XL. Для інших принтерів слід встановити значення 1." -# AI Translated -msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." -msgstr "G-код, що записується на самому початку вихідного файлу, перед будь-яким іншим вмістом. Корисно для додавання метаданих, які прошивка принтера читає з перших рядків файлу (наприклад, орієнтовний час друку, витрата філаменту). Підтримує підстановки на кшталт {print_time_sec} та {used_filament_length}." +msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_total_sec}, {print_time_day}, {print_time_hour}, {print_time_minute}, {print_time_sec} and {used_filament_length}." +msgstr "" msgid "Start G-code" msgstr "Початковий G-код" @@ -19307,13 +19225,37 @@ msgstr "Філамент, що використовується" msgid "Total length of filament used in the print." msgstr "Загальна довжина філаменту, використаної під час друку." -msgid "Print time (seconds)" -msgstr "Час друку (в секундах)" +msgid "Print time (total seconds)" +msgstr "" # AI Translated msgid "Total estimated print time in seconds. Replaced with actual value during post-processing." msgstr "Загальний орієнтовний час друку в секундах. Замінюється фактичним значенням під час постобробки." +msgid "Print time (days component)" +msgstr "" + +msgid "Estimated print time day component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (hours component)" +msgstr "" + +msgid "Estimated print time hour component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (minutes component)" +msgstr "" + +msgid "Estimated print time minute component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (seconds component)" +msgstr "" + +msgid "Estimated print time second component (normal mode). Replaced with actual value during post-processing." +msgstr "" + msgid "Filament length (meters)" msgstr "Довжина філаменту (в метрах)" @@ -21216,6 +21158,9 @@ msgstr "Дійсний сеанс не виявлено. Продовжити в msgid "Success!" msgstr "Успішно!" +msgid "Generate API Key" +msgstr "" + msgid "Are you sure to log out?" msgstr "Ви впевнені, що вийшли?" @@ -22197,13 +22142,6 @@ msgstr "Мережевий плагін Bambu потрібен для можли msgid "Error: %s" msgstr "Помилка: %s" -msgid "Show details" -msgstr "Показати подробиці" - -# AI Translated -msgid "Hide details" -msgstr "Сховати подробиці" - msgid "Version to install:" msgstr "Версія для встановлення:" @@ -24841,6 +24779,12 @@ msgstr "" msgid "No binding for that field" msgstr "" +msgid "Enter a number" +msgstr "" + +msgid "Not a number" +msgstr "" + msgid "Primitive" msgstr "" @@ -24853,6 +24797,217 @@ msgstr "" msgid "Clear All" msgstr "" +msgctxt "Keyboard Shortcut" +msgid "Ins" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Home" +msgstr "Home" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "End" +msgstr "End" + +msgctxt "Keyboard Shortcut" +msgid "PgUp" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "PgDn" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Left" +msgstr "Стрілка вліво" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Right" +msgstr "Стрілка вправо" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Up" +msgstr "Стрілка вгору" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Down" +msgstr "Стрілка вниз" + +msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" +msgstr "Імпорт геометричних даних із файлів STL/STEP/3MF/OBJ/AMF" + +msgid "Select all objects" +msgstr "Вибрати всі обʼєкти" + +msgid "Paste from clipboard" +msgstr "Вставити з буфера обміну" + +# AI Translated +msgid "Toggle printable for object/part" +msgstr "Перемкнути можливість друку для обʼєкта/частини" + +msgid "Move selection 10mm in negative X direction" +msgstr "Перемістити виділення на 10 мм у негативному напрямку по осі X" + +msgid "Move selection 10mm in positive X direction" +msgstr "Перемістити виділення на 10 мм у позитивному напрямку X" + +msgid "Move selection 10mm in positive Y direction" +msgstr "Перемістити виділення на 10 мм у позитивному напрямку Y" + +msgid "Move selection 10mm in negative Y direction" +msgstr "Перемістити виділення на 10 мм у негативному напрямку Y" + +msgid "Rotate selection 45 degrees counterclockwise" +msgstr "" + +msgid "Rotate selection 45 degrees clockwise" +msgstr "" + +msgid "Gizmo move" +msgstr "Рух Gizmo" + +msgid "Gizmo rotate" +msgstr "Поворот Gizmo" + +msgid "Gizmo scale" +msgstr "Шкала Gizmo" + +msgid "Gizmo place face on bed" +msgstr "Покласти грань на стіл Gizmo" + +msgid "Gizmo cut" +msgstr "Виріз Gizmo" + +msgid "Gizmo mesh boolean" +msgstr "Булеві операції Gizmo" + +msgid "Gizmo FDM paint-on supports" +msgstr "" + +msgid "Gizmo FDM paint-on seam" +msgstr "Швид, що фарбується Gizmo FDM" + +msgid "Gizmo FDM paint-on fuzzy skin" +msgstr "Gizmo Малювання шорсткої поверхні" + +msgid "Gizmo multi-material painting" +msgstr "" + +msgid "Gizmo text emboss/engrave" +msgstr "Текстове тиснення/гравіювання Gizmo" + +msgid "Gizmo measure" +msgstr "виміряти Gizmo" + +msgid "Gizmo assemble" +msgstr "Зібрати Gizmo" + +msgid "Gizmo brim ears" +msgstr "Краєчки Gizmo" + +msgid "Vertical slider - Move active thumb Up" +msgstr "Вертикальний повзунок - рух активного великого пальця вгору" + +msgid "Vertical slider - Move active thumb Down" +msgstr "Вертикальний повзунок - Перемістити активний палець вниз" + +msgid "Horizontal slider - Move active thumb Left" +msgstr "Горизонтальний повзунок - Перемістити активний палець вліво" + +msgid "Horizontal slider - Move active thumb Right" +msgstr "Горизонтальний повзунок - Перемістити активний палець праворуч" + +msgid "Horizontal slider - Move to start position" +msgstr "Горизонтальний повзунок - Перемістити в початкове положення" + +msgid "Horizontal slider - Move to last position" +msgstr "Горизонтальний повзунок - Перемістити в останню позицію" + +msgid "Camera view - Default" +msgstr "Вигляд камери - Типовий" + +msgid "Camera view - Top" +msgstr "Вигляд камери - Верх" + +msgid "Camera view - Bottom" +msgstr "Вигляд камери - Низ" + +msgid "Camera view - Front" +msgstr "Вигляд камери - Перед" + +msgid "Camera view - Behind" +msgstr "Вигляд камери - Зад" + +msgid "Camera Angle - Left side" +msgstr "Кут камери – Лівий бік" + +msgid "Camera Angle - Right side" +msgstr "Кут камери - Правий бік" + +msgid "Camera view - Current plate" +msgstr "" + +msgid "Zoom in" +msgstr "Приблизити" + +msgid "Zoom out" +msgstr "Віддалити" + +msgid "Show/Hide 3Dconnexion devices settings dialog" +msgstr "Показати/приховати діалог налаштувань пристроїв 3Dconnexion" + +msgid "Show/Hide wireframe" +msgstr "" + +msgid "On/Off G-code window" +msgstr "Увімкнення/вимкнення вікна G-коду" + +msgid "On/Off one layer mode of the vertical slider" +msgstr "Увімкнення/вимкнення одношарового режиму вертикального повзунка" + +msgid "Switch between Prepare/Preview" +msgstr "Переключення між Підготовка/Попередній перегляд" + +msgid "Collapse/Expand the sidebar" +msgstr "Згорнути/розгорнути бічну панель" + +msgid "Open the speed dial" +msgstr "" + +msgid "Reload the device page" +msgstr "" + +msgid "Show keyboard shortcuts list" +msgstr "Показати список клавіш" + +msgid "Slicing and printing" +msgstr "" + +msgid "Editing" +msgstr "" + +msgid "Placement" +msgstr "" + +msgid "Gizmos" +msgstr "" + +msgid "Sliders" +msgstr "" + +msgid "Painting tools" +msgstr "" + +msgid "Application" +msgstr "" + #: resources/data/hints.ini: [hint:Precise wall] msgid "" "Precise wall\n" @@ -25158,6 +25313,65 @@ msgstr "" "Уникнення деформації\n" "Чи знаєте ви, що при друку матеріалами, схильними до деформації, такими як ABS, відповідне підвищення температури столу може зменшити ймовірність деформації?" +#~ msgid "Tab" +#~ msgstr "Табуляції" + +# AI Translated +#~ msgid "Displays current viewport FPS in the top-right corner." +#~ msgstr "Показує поточний FPS вікна перегляду у верхньому правому куті." + +# AI Translated +#~ msgid "Publish 3MF Wiki" +#~ msgstr "Енциклопедія з публікації 3MF" + +# AI Translated +#~ msgid "Publish 3MF Video Guide" +#~ msgstr "Відеопосібник з публікації 3MF" + +#~ msgid "Toolbar" +#~ msgstr "Панель інструментів" + +#~ msgid "Switch table page" +#~ msgstr "Перемкнути сторінку таблиці" + +#~ msgid "Global shortcuts" +#~ msgstr "Глобальні ярлики" + +# AI Translated +#~ msgid "Middle mouse button" +#~ msgstr "Середня кнопка миші" + +#~ msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." +#~ msgstr "Автоматично орієнтує вибрані обʼєкти або всі обʼєкти. Якщо вибрано обʼєкти, він просто орієнтує обрані. В іншому випадку він будеОрієнтувати всі обʼєкти на поточному проєкт." + +#~ msgid "Auto orients all objects on the active plate." +#~ msgstr "Автоматично орієнтує всі обʼєкти на поточному диску." + +#~ msgid "Any arrow" +#~ msgstr "Будь-яка стрілка" + +#~ msgid "Gizmo SLA support points" +#~ msgstr "Точки підтримки Gizmo SL" + +#~ msgid "Plater" +#~ msgstr "Тарілка" + +#~ msgid "Gizmo" +#~ msgstr "Gizmo" + +#~ msgid "Delete objects, parts, modifiers" +#~ msgstr "Видалення обʼєктів, частин, модифікаторів" + +#~ msgid "Objects List" +#~ msgstr "Список обʼєктів" + +# AI Translated +#~ msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." +#~ msgstr "G-код, що записується на самому початку вихідного файлу, перед будь-яким іншим вмістом. Корисно для додавання метаданих, які прошивка принтера читає з перших рядків файлу (наприклад, орієнтовний час друку, витрата філаменту). Підтримує підстановки на кшталт {print_time_sec} та {used_filament_length}." + +#~ msgid "Print time (seconds)" +#~ msgstr "Час друку (в секундах)" + # AI Translated #~ msgid "Open actions speed dial" #~ msgstr "Відкрити панель швидких дій" diff --git a/localization/i18n/vi/OrcaSlicer_vi.po b/localization/i18n/vi/OrcaSlicer_vi.po index 3263e575c5..8c6349c923 100644 --- a/localization/i18n/vi/OrcaSlicer_vi.po +++ b/localization/i18n/vi/OrcaSlicer_vi.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-09-18 15:50+0800\n" +"POT-Creation-Date: 2026-09-22 17:02+0800\n" "PO-Revision-Date: 2025-10-02 17:43+0700\n" "Last-Translator: \n" "Language-Team: hainguyen.ts13@gmail.com\n" @@ -6253,12 +6253,15 @@ msgctxt "Camera View" msgid "Right" msgstr "Phải" -msgid "Add" -msgstr "Thêm" - msgid "Add plate" msgstr "Thêm plate" +msgid "Split to objects" +msgstr "Tách thành vật thể" + +msgid "Add" +msgstr "Thêm" + msgid "Auto orient all/selected objects" msgstr "Tự động định hướng tất cả/các vật thể đã chọn" @@ -6271,9 +6274,6 @@ msgstr "Sắp xếp tất cả vật thể" msgid "Arrange objects on selected plates" msgstr "Sắp xếp vật thể trên các plate đã chọn" -msgid "Split to objects" -msgstr "Tách thành vật thể" - msgid "Assembly View" msgstr "Chế độ xem lắp ráp" @@ -6336,6 +6336,9 @@ msgstr "Đường viền" msgid "Wireframe" msgstr "Khung dây" +msgid "X-Ray" +msgstr "" + # AI Translated msgid "Realistic View" msgstr "Chế độ xem thực tế" @@ -6904,9 +6907,6 @@ msgstr "Hiện đường viền xung quanh vật thể đã chọn trong cảnh msgid "Preferences" msgstr "Tùy chọn" -msgid "Open speed dial..." -msgstr "" - # AI Translated msgctxt "Menu" msgid "Edit" @@ -6915,6 +6915,9 @@ msgstr "Chỉnh sửa" msgid "View" msgstr "Xem" +msgid "Open Speed Dial" +msgstr "" + # AI Translated msgid "Preset Bundle" msgstr "Gói cài đặt sẵn" @@ -8820,10 +8823,6 @@ msgstr "Mở rộng thanh bên" msgid "Collapse sidebar" msgstr "Thu gọn thanh bên" -# AI Translated -msgid "Tab" -msgstr "Tab" - #, c-format, boost-format msgid "Loading file: %s" msgstr "Đang tải file: %s" @@ -9923,10 +9922,10 @@ msgstr "Quản lý nhiều thiết bị" msgid "With this option enabled, you can send a task to multiple devices at the same time and manage multiple devices." msgstr "Với tùy chọn này được bật, bạn có thể gửi tác vụ đến nhiều thiết bị cùng lúc và quản lý nhiều thiết bị." -msgid "Open the Speed Dial with the Space key" +msgid "Open the Speed Dial from the keyboard" msgstr "" -msgid "When enabled, pressing Space (with no other key held) opens the Speed Dial action search from any page." +msgid "When enabled, the Speed Dial keyboard shortcut (Space by default) opens the action search from any page." msgstr "" msgid "Recent actions" @@ -10074,6 +10073,15 @@ msgstr "Kéo chuột phải" msgid "Set the action that dragging the right mouse button should perform." msgstr "Đặt hành động sẽ thực hiện khi kéo nút chuột phải." +msgid "Keyboard" +msgstr "" + +msgid "Keyboard shortcuts" +msgstr "" + +msgid "Choose the key for each action." +msgstr "" + # AI Translated msgid "Clear my choice on..." msgstr "Xóa lựa chọn của tôi về..." @@ -10203,13 +10211,40 @@ msgstr "" "Giới hạn tốc độ khung hình của khung nhìn để giảm tải GPU và mức tiêu thụ điện.\n" "Đặt 0 để không giới hạn tốc độ khung hình." +msgid "Reuse the 3D scene while idle" +msgstr "" + +msgid "" +"Skips redrawing the 3D scene when only the mouse cursor moves over the viewport,\n" +"and reuses the previous frame's scene instead. Reduces GPU load.\n" +"Disable it if the viewport shows stale or missing contents.\n" +"\n" +"Takes effect immediately." +msgstr "" + +msgid "Skip unchanged frames" +msgstr "" + +msgid "" +"Skips drawing a frame altogether when it would be identical to the one already on screen.\n" +"Only applies to frames that reuse the 3D scene, so it needs Reuse the 3D scene while idle.\n" +"Disable it if a hover highlight, tooltip or animation stops updating.\n" +"\n" +"Takes effect immediately." +msgstr "" + # AI Translated msgid "Show FPS overlay" msgstr "Hiện lớp phủ FPS" -# AI Translated -msgid "Displays current viewport FPS in the top-right corner." -msgstr "Hiển thị FPS hiện tại của khung nhìn ở góc trên bên phải." +msgid "Displays rendering counts in the top-right corner of the viewport." +msgstr "" + +msgid "FPS: frames presented to the screen per second." +msgstr "" + +msgid "3D: frames per second that redrew the 3D scene." +msgstr "" # AI Translated msgid "G-code Preview" @@ -10706,13 +10741,8 @@ msgstr "Xuất bản 3MF..." msgid "Select which settings to be published in the 3MF file" msgstr "Chọn những cài đặt sẽ được xuất bản trong tệp 3MF" -# AI Translated -msgid "Publish 3MF Wiki" -msgstr "Wiki về Xuất bản 3MF" - -# AI Translated -msgid "Publish 3MF Video Guide" -msgstr "Hướng dẫn video về Xuất bản 3MF" +msgid "Video Guide" +msgstr "" # AI Translated msgid "Mixed filament - published as a whole when \"Enable\" above is selected" @@ -10915,6 +10945,14 @@ msgstr "" msgid "No wiki page for this action" msgstr "" +# AI Translated +msgid "Show details" +msgstr "Hiện chi tiết" + +# AI Translated +msgid "Hide details" +msgstr "Ẩn chi tiết" + #, c-format, boost-format msgid "\"%s\" is a Developer setting. Enable Developer mode to edit it?" msgstr "" @@ -12886,41 +12924,6 @@ msgstr "Gói cấu hình đã được thay đổi trong hướng dẫn cấu h msgid "Configuration package changed" msgstr "Gói cấu hình đã thay đổi" -msgid "Toolbar" -msgstr "Thanh công cụ" - -msgid "Objects list" -msgstr "Danh sách đối tượng" - -msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" -msgstr "Nhập dữ liệu hình học từ file STL/STEP/3MF/OBJ/AMF" - -msgid "Paste from clipboard" -msgstr "Dán từ clipboard" - -msgid "Show/Hide 3Dconnexion devices settings dialog" -msgstr "Hiển thị/Ẩn hộp thoại cài đặt thiết bị 3Dconnexion" - -msgid "Switch table page" -msgstr "Chuyển trang bảng" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Space" -msgstr "Space" - -msgid "Open speed dial" -msgstr "" - -msgid "Run a Speed Dial favourite (while the Speed Dial is open)" -msgstr "" - -msgid "Show keyboard shortcuts list" -msgstr "Hiển thị danh sách phím tắt" - -msgid "Global shortcuts" -msgstr "Phím tắt toàn cục" - # AI Translated msgid "Pan View" msgstr "Di chuyển khung nhìn" @@ -12929,28 +12932,33 @@ msgstr "Di chuyển khung nhìn" msgid "Rotate View" msgstr "Xoay khung nhìn" -# AI Translated -msgid "Middle mouse button" -msgstr "Nút chuột giữa" +#, c-format, boost-format +msgid "Use %s or %s, or a key that does not type a character." +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "Key" +msgstr "" + +msgid "Left mouse" +msgstr "" + +msgid "Available anywhere in the window, even while typing in a text field." +msgstr "" + +msgid "Run a speed dial favorite while the dial is open" +msgstr "" # AI Translated -msgid "Zoom View" -msgstr "Thu phóng khung nhìn" +msgctxt "Keyboard Shortcut" +msgid "Tab" +msgstr "Tab" -msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." -msgstr "Tự động định hướng đối tượng đã chọn hoặc tất cả đối tượng. Nếu có đối tượng đã chọn, nó chỉ định hướng những đối tượng đã chọn. Nếu không, nó sẽ định hướng tất cả đối tượng trong dự án hiện tại." +msgid "Switch to the next main tab" +msgstr "" -msgid "Auto orients all objects on the active plate." -msgstr "Tự động định hướng tất cả đối tượng trên bản đang hoạt động." - -msgid "Collapse/Expand the sidebar" -msgstr "Thu gọn/Mở rộng thanh bên" - -msgid "Any arrow" -msgstr "Phím mũi tên bất kỳ" - -msgid "Movement in camera space" -msgstr "Di chuyển trong không gian camera" +msgid "Available while the 3D view on the Prepare tab has focus." +msgstr "" msgid "Select a part" msgstr "Chọn một phần" @@ -12961,128 +12969,30 @@ msgstr "Chọn nhiều đối tượng" msgid "Select objects by rectangle" msgstr "Chọn đối tượng bằng hình chữ nhật" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Up" -msgstr "Mũi tên lên" - -msgid "Move selection 10mm in positive Y direction" -msgstr "Di chuyển lựa chọn 10 mm theo hướng Y dương" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Down" -msgstr "Mũi tên xuống" - -msgid "Move selection 10mm in negative Y direction" -msgstr "Di chuyển lựa chọn 10 mm theo hướng Y âm" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Left" -msgstr "Mũi tên trái" - -msgid "Move selection 10mm in negative X direction" -msgstr "Di chuyển lựa chọn 10 mm theo hướng X âm" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Right" -msgstr "Mũi tên phải" - -msgid "Move selection 10mm in positive X direction" -msgstr "Di chuyển lựa chọn 10 mm theo hướng X dương" +msgid "Keyboard 1-9: set filament for object/part" +msgstr "bàn phím 1-9: đặt filament cho đối tượng/phần" msgid "Movement step set to 1mm" msgstr "Bước di chuyển được đặt thành 1 mm" -msgid "Keyboard 1-9: set filament for object/part" -msgstr "bàn phím 1-9: đặt filament cho đối tượng/phần" +msgid "Movement in camera space" +msgstr "Di chuyển trong không gian camera" -msgid "Camera view - Default" -msgstr "Chế độ xem camera - Mặc định" +msgid "Middle mouse" +msgstr "" -msgid "Camera view - Top" -msgstr "Chế độ xem camera - Trên" - -msgid "Camera view - Bottom" -msgstr "Chế độ xem camera - Dưới" - -msgid "Camera view - Front" -msgstr "Chế độ xem camera - Trước" - -msgid "Camera view - Behind" -msgstr "Chế độ xem camera - Sau" - -msgid "Camera Angle - Left side" -msgstr "Góc camera - Bên trái" - -msgid "Camera Angle - Right side" -msgstr "Góc camera - Bên phải" - -msgid "Select all objects" -msgstr "Chọn tất cả đối tượng" - -msgid "Gizmo move" -msgstr "Gizmo di chuyển" - -msgid "Gizmo rotate" -msgstr "Gizmo xoay" - -msgid "Gizmo scale" -msgstr "Gizmo tỷ lệ" - -msgid "Gizmo place face on bed" -msgstr "Gizmo đặt mặt lên bàn" - -msgid "Gizmo cut" -msgstr "Gizmo cắt" +msgid "Right mouse" +msgstr "" # AI Translated -msgid "Gizmo mesh boolean" -msgstr "Gizmo boolean lưới" +msgid "Zoom View" +msgstr "Thu phóng khung nhìn" -msgid "Gizmo FDM paint-on fuzzy skin" -msgstr "Gizmo FDM tô fuzzy skin" +msgid "Painting" +msgstr "" -msgid "Gizmo SLA support points" -msgstr "Gizmo điểm support SLA" - -msgid "Gizmo FDM paint-on seam" -msgstr "Gizmo FDM tô seam" - -msgid "Gizmo text emboss/engrave" -msgstr "Gizmo văn bản emboss/khắc" - -msgid "Gizmo measure" -msgstr "Gizmo đo" - -msgid "Gizmo assemble" -msgstr "Gizmo lắp ráp" - -msgid "Gizmo brim ears" -msgstr "Gizmo tai viền" - -msgid "Zoom in" -msgstr "Phóng to" - -msgid "Zoom out" -msgstr "Thu nhỏ" - -# AI Translated -msgid "Toggle printable for object/part" -msgstr "Bật/tắt khả năng in cho vật thể/phần" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Tab" -msgstr "Tab" - -msgid "Switch between Prepare/Preview" -msgstr "Chuyển đổi giữa Chuẩn bị/Xem trước" - -msgid "Plater" -msgstr "Bàn in" +msgid "Available while a painting gizmo is open: supports, seam, fuzzy skin or color painting." +msgstr "" msgid "Move: press to snap by 1mm" msgstr "Di chuyển: nhấn để bám theo 1mm" @@ -13093,15 +13003,19 @@ msgstr "Tô support/màu: điều chỉnh bán kính bút" msgid "Support/Color Painting: adjust section position" msgstr "Tô support/màu: điều chỉnh vị trí phần" -# AI Translated -msgid "Gizmo" -msgstr "Gizmo" +msgid "Objects list" +msgstr "Danh sách đối tượng" + +msgid "Available while the object list has focus." +msgstr "" msgid "Set extruder number for the objects and parts" msgstr "Đặt số extruder cho đối tượng và phần" -msgid "Delete objects, parts, modifiers" -msgstr "Xóa đối tượng, phần, modifier" +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Space" +msgstr "Space" msgid "Select the object/part and press space to change the name" msgstr "Chọn đối tượng/phần và nhấn phím cách để thay đổi tên" @@ -13112,45 +13026,48 @@ msgstr "Nhấp chuột" msgid "Select the object/part and mouse click to change the name" msgstr "Chọn đối tượng/phần và nhấp chuột để thay đổi tên" -msgid "Objects List" -msgstr "Danh sách đối tượng" - -msgid "Vertical slider - Move active thumb Up" -msgstr "Thanh trượt dọc - Di chuyển nút hoạt động lên" - -msgid "Vertical slider - Move active thumb Down" -msgstr "Thanh trượt dọc - Di chuyển nút hoạt động xuống" - -msgid "Horizontal slider - Move active thumb Left" -msgstr "Thanh trượt ngang - Di chuyển nút hoạt động sang trái" - -msgid "Horizontal slider - Move active thumb Right" -msgstr "Thanh trượt ngang - Di chuyển nút hoạt động sang phải" - -msgid "On/Off one layer mode of the vertical slider" -msgstr "Bật/Tắt chế độ một lớp của thanh trượt dọc" - -msgid "On/Off G-code window" -msgstr "Bật/Tắt cửa sổ G-code" +msgid "Available while the 3D view on the Preview tab has focus." +msgstr "" msgid "Move slider 5x faster" msgstr "Di chuyển thanh trượt nhanh hơn 5 lần" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Home" -msgstr "Home" +msgid "Scroll slider 5x faster" +msgstr "" -msgid "Horizontal slider - Move to start position" -msgstr "Thanh trượt ngang - Di chuyển đến vị trí bắt đầu" +msgid "Not customizable" +msgstr "" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "End" -msgstr "End" +#, c-format, boost-format +msgid "%s is assigned to %s. Reassign it to %s?" +msgstr "" -msgid "Horizontal slider - Move to last position" -msgstr "Thanh trượt ngang - Di chuyển đến vị trí cuối cùng" +#, c-format, boost-format +msgid "The default %s is assigned to %s. Reassign it to %s?" +msgstr "" + +msgid "Global shortcuts also apply while typing." +msgstr "" + +msgid "A key that types a character cannot be a global shortcut." +msgstr "" + +msgid "Esc cancels, Enter confirms." +msgstr "" + +#, c-format, boost-format +msgid "" +"Press the new shortcut for\n" +"\"%s\"" +msgstr "" + +#, c-format, boost-format +msgid "Already used as a step of %s." +msgstr "" + +#, c-format, boost-format +msgid "Already assigned to %s. Press OK to reassign it." +msgstr "" msgid "Release Note" msgstr "Ghi chú phát hành" @@ -18243,9 +18160,8 @@ msgstr "Bước làm nóng trước" msgid "Insert multiple preheat commands (e.g. M104.1). Only useful for Prusa XL. For other printers, please set it to 1." msgstr "Chèn nhiều lệnh làm nóng trước (ví dụ M104.1). Chỉ hữu ích cho Prusa XL. Đối với các máy in khác, vui lòng đặt nó thành 1." -# AI Translated -msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." -msgstr "G-code được ghi ở ngay đầu file xuất, trước mọi nội dung khác. Hữu ích để thêm siêu dữ liệu mà firmware máy in đọc từ những dòng đầu tiên của file (ví dụ thời gian in ước tính, lượng filament sử dụng). Hỗ trợ các trình giữ chỗ như {print_time_sec} và {used_filament_length}." +msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_total_sec}, {print_time_day}, {print_time_hour}, {print_time_minute}, {print_time_sec} and {used_filament_length}." +msgstr "" msgid "Start G-code" msgstr "G-code bắt đầu" @@ -19832,14 +19748,37 @@ msgstr "Filament đã dùng" msgid "Total length of filament used in the print." msgstr "Tổng độ dài filament dùng trong bản in." -# AI Translated -msgid "Print time (seconds)" -msgstr "Thời gian in (giây)" +msgid "Print time (total seconds)" +msgstr "" # AI Translated msgid "Total estimated print time in seconds. Replaced with actual value during post-processing." msgstr "Tổng thời gian in ước tính tính bằng giây. Được thay bằng giá trị thực tế trong quá trình hậu xử lý." +msgid "Print time (days component)" +msgstr "" + +msgid "Estimated print time day component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (hours component)" +msgstr "" + +msgid "Estimated print time hour component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (minutes component)" +msgstr "" + +msgid "Estimated print time minute component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (seconds component)" +msgstr "" + +msgid "Estimated print time second component (normal mode). Replaced with actual value during post-processing." +msgstr "" + # AI Translated msgid "Filament length (meters)" msgstr "Độ dài filament (mét)" @@ -21758,6 +21697,9 @@ msgstr "Không phát hiện phiên hợp lệ. Tiếp tục đăng nhập vào 3 msgid "Success!" msgstr "Thành công!" +msgid "Generate API Key" +msgstr "" + msgid "Are you sure to log out?" msgstr "Bạn có chắc chắn đăng xuất không?" @@ -22871,14 +22813,6 @@ msgstr "Bambu Network Plug-in là bắt buộc cho các tính năng cloud, phát msgid "Error: %s" msgstr "Lỗi: %s" -# AI Translated -msgid "Show details" -msgstr "Hiện chi tiết" - -# AI Translated -msgid "Hide details" -msgstr "Ẩn chi tiết" - # AI Translated msgid "Version to install:" msgstr "Phiên bản sẽ cài đặt:" @@ -25562,6 +25496,12 @@ msgstr "" msgid "No binding for that field" msgstr "" +msgid "Enter a number" +msgstr "" + +msgid "Not a number" +msgstr "" + msgid "Primitive" msgstr "" @@ -25574,6 +25514,218 @@ msgstr "" msgid "Clear All" msgstr "" +msgctxt "Keyboard Shortcut" +msgid "Ins" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Home" +msgstr "Home" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "End" +msgstr "End" + +msgctxt "Keyboard Shortcut" +msgid "PgUp" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "PgDn" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Left" +msgstr "Mũi tên trái" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Right" +msgstr "Mũi tên phải" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Up" +msgstr "Mũi tên lên" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Down" +msgstr "Mũi tên xuống" + +msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" +msgstr "Nhập dữ liệu hình học từ file STL/STEP/3MF/OBJ/AMF" + +msgid "Select all objects" +msgstr "Chọn tất cả đối tượng" + +msgid "Paste from clipboard" +msgstr "Dán từ clipboard" + +# AI Translated +msgid "Toggle printable for object/part" +msgstr "Bật/tắt khả năng in cho vật thể/phần" + +msgid "Move selection 10mm in negative X direction" +msgstr "Di chuyển lựa chọn 10 mm theo hướng X âm" + +msgid "Move selection 10mm in positive X direction" +msgstr "Di chuyển lựa chọn 10 mm theo hướng X dương" + +msgid "Move selection 10mm in positive Y direction" +msgstr "Di chuyển lựa chọn 10 mm theo hướng Y dương" + +msgid "Move selection 10mm in negative Y direction" +msgstr "Di chuyển lựa chọn 10 mm theo hướng Y âm" + +msgid "Rotate selection 45 degrees counterclockwise" +msgstr "" + +msgid "Rotate selection 45 degrees clockwise" +msgstr "" + +msgid "Gizmo move" +msgstr "Gizmo di chuyển" + +msgid "Gizmo rotate" +msgstr "Gizmo xoay" + +msgid "Gizmo scale" +msgstr "Gizmo tỷ lệ" + +msgid "Gizmo place face on bed" +msgstr "Gizmo đặt mặt lên bàn" + +msgid "Gizmo cut" +msgstr "Gizmo cắt" + +# AI Translated +msgid "Gizmo mesh boolean" +msgstr "Gizmo boolean lưới" + +msgid "Gizmo FDM paint-on supports" +msgstr "" + +msgid "Gizmo FDM paint-on seam" +msgstr "Gizmo FDM tô seam" + +msgid "Gizmo FDM paint-on fuzzy skin" +msgstr "Gizmo FDM tô fuzzy skin" + +msgid "Gizmo multi-material painting" +msgstr "" + +msgid "Gizmo text emboss/engrave" +msgstr "Gizmo văn bản emboss/khắc" + +msgid "Gizmo measure" +msgstr "Gizmo đo" + +msgid "Gizmo assemble" +msgstr "Gizmo lắp ráp" + +msgid "Gizmo brim ears" +msgstr "Gizmo tai viền" + +msgid "Vertical slider - Move active thumb Up" +msgstr "Thanh trượt dọc - Di chuyển nút hoạt động lên" + +msgid "Vertical slider - Move active thumb Down" +msgstr "Thanh trượt dọc - Di chuyển nút hoạt động xuống" + +msgid "Horizontal slider - Move active thumb Left" +msgstr "Thanh trượt ngang - Di chuyển nút hoạt động sang trái" + +msgid "Horizontal slider - Move active thumb Right" +msgstr "Thanh trượt ngang - Di chuyển nút hoạt động sang phải" + +msgid "Horizontal slider - Move to start position" +msgstr "Thanh trượt ngang - Di chuyển đến vị trí bắt đầu" + +msgid "Horizontal slider - Move to last position" +msgstr "Thanh trượt ngang - Di chuyển đến vị trí cuối cùng" + +msgid "Camera view - Default" +msgstr "Chế độ xem camera - Mặc định" + +msgid "Camera view - Top" +msgstr "Chế độ xem camera - Trên" + +msgid "Camera view - Bottom" +msgstr "Chế độ xem camera - Dưới" + +msgid "Camera view - Front" +msgstr "Chế độ xem camera - Trước" + +msgid "Camera view - Behind" +msgstr "Chế độ xem camera - Sau" + +msgid "Camera Angle - Left side" +msgstr "Góc camera - Bên trái" + +msgid "Camera Angle - Right side" +msgstr "Góc camera - Bên phải" + +msgid "Camera view - Current plate" +msgstr "" + +msgid "Zoom in" +msgstr "Phóng to" + +msgid "Zoom out" +msgstr "Thu nhỏ" + +msgid "Show/Hide 3Dconnexion devices settings dialog" +msgstr "Hiển thị/Ẩn hộp thoại cài đặt thiết bị 3Dconnexion" + +msgid "Show/Hide wireframe" +msgstr "" + +msgid "On/Off G-code window" +msgstr "Bật/Tắt cửa sổ G-code" + +msgid "On/Off one layer mode of the vertical slider" +msgstr "Bật/Tắt chế độ một lớp của thanh trượt dọc" + +msgid "Switch between Prepare/Preview" +msgstr "Chuyển đổi giữa Chuẩn bị/Xem trước" + +msgid "Collapse/Expand the sidebar" +msgstr "Thu gọn/Mở rộng thanh bên" + +msgid "Open the speed dial" +msgstr "" + +msgid "Reload the device page" +msgstr "" + +msgid "Show keyboard shortcuts list" +msgstr "Hiển thị danh sách phím tắt" + +msgid "Slicing and printing" +msgstr "" + +msgid "Editing" +msgstr "" + +msgid "Placement" +msgstr "" + +msgid "Gizmos" +msgstr "" + +msgid "Sliders" +msgstr "" + +msgid "Painting tools" +msgstr "" + +msgid "Application" +msgstr "" + #: resources/data/hints.ini: [hint:Precise wall] msgid "" "Precise wall\n" @@ -25875,6 +26027,68 @@ msgstr "" "Tránh cong vênh\n" "Bạn có biết rằng khi in vật liệu dễ cong vênh như ABS, tăng nhiệt độ bàn nóng một cách thích hợp có thể giảm xác suất cong vênh không?" +# AI Translated +#~ msgid "Tab" +#~ msgstr "Tab" + +# AI Translated +#~ msgid "Displays current viewport FPS in the top-right corner." +#~ msgstr "Hiển thị FPS hiện tại của khung nhìn ở góc trên bên phải." + +# AI Translated +#~ msgid "Publish 3MF Wiki" +#~ msgstr "Wiki về Xuất bản 3MF" + +# AI Translated +#~ msgid "Publish 3MF Video Guide" +#~ msgstr "Hướng dẫn video về Xuất bản 3MF" + +#~ msgid "Toolbar" +#~ msgstr "Thanh công cụ" + +#~ msgid "Switch table page" +#~ msgstr "Chuyển trang bảng" + +#~ msgid "Global shortcuts" +#~ msgstr "Phím tắt toàn cục" + +# AI Translated +#~ msgid "Middle mouse button" +#~ msgstr "Nút chuột giữa" + +#~ msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." +#~ msgstr "Tự động định hướng đối tượng đã chọn hoặc tất cả đối tượng. Nếu có đối tượng đã chọn, nó chỉ định hướng những đối tượng đã chọn. Nếu không, nó sẽ định hướng tất cả đối tượng trong dự án hiện tại." + +#~ msgid "Auto orients all objects on the active plate." +#~ msgstr "Tự động định hướng tất cả đối tượng trên bản đang hoạt động." + +#~ msgid "Any arrow" +#~ msgstr "Phím mũi tên bất kỳ" + +#~ msgid "Gizmo SLA support points" +#~ msgstr "Gizmo điểm support SLA" + +#~ msgid "Plater" +#~ msgstr "Bàn in" + +# AI Translated +#~ msgid "Gizmo" +#~ msgstr "Gizmo" + +#~ msgid "Delete objects, parts, modifiers" +#~ msgstr "Xóa đối tượng, phần, modifier" + +#~ msgid "Objects List" +#~ msgstr "Danh sách đối tượng" + +# AI Translated +#~ msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." +#~ msgstr "G-code được ghi ở ngay đầu file xuất, trước mọi nội dung khác. Hữu ích để thêm siêu dữ liệu mà firmware máy in đọc từ những dòng đầu tiên của file (ví dụ thời gian in ước tính, lượng filament sử dụng). Hỗ trợ các trình giữ chỗ như {print_time_sec} và {used_filament_length}." + +# AI Translated +#~ msgid "Print time (seconds)" +#~ msgstr "Thời gian in (giây)" + # AI Translated #~ msgid "Open actions speed dial" #~ msgstr "Mở vòng quay thao tác nhanh" diff --git a/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po b/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po index d3c0b03ec1..a86678a8c2 100644 --- a/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po +++ b/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Slic3rPE\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-09-18 15:50+0800\n" +"POT-Creation-Date: 2026-09-22 17:02+0800\n" "PO-Revision-Date: 2026-06-11 12:37-0300\n" "Last-Translator: Handle \n" "Language-Team: \n" @@ -5757,12 +5757,15 @@ msgctxt "Camera View" msgid "Right" msgstr "右" -msgid "Add" -msgstr "添加" - msgid "Add plate" msgstr "添加新盘" +msgid "Split to objects" +msgstr "拆分为对象" + +msgid "Add" +msgstr "添加" + msgid "Auto orient all/selected objects" msgstr "自动定位所有/选定的对象" @@ -5775,9 +5778,6 @@ msgstr "全局整理" msgid "Arrange objects on selected plates" msgstr "单盘整理" -msgid "Split to objects" -msgstr "拆分为对象" - msgid "Assembly View" msgstr "装配体视图" @@ -5833,6 +5833,9 @@ msgstr "轮廓线" msgid "Wireframe" msgstr "线框" +msgid "X-Ray" +msgstr "" + msgid "Realistic View" msgstr "写实渲染" @@ -6372,9 +6375,6 @@ msgstr "在3D场景中显示选中对象的轮廓" msgid "Preferences" msgstr "偏好设置" -msgid "Open speed dial..." -msgstr "" - # AI Translated msgctxt "Menu" msgid "Edit" @@ -6383,6 +6383,9 @@ msgstr "编辑" msgid "View" msgstr "视图" +msgid "Open Speed Dial" +msgstr "" + msgid "Preset Bundle" msgstr "预设包" @@ -8147,9 +8150,6 @@ msgstr "展开侧边栏" msgid "Collapse sidebar" msgstr "折叠边栏" -msgid "Tab" -msgstr "标签" - #, c-format, boost-format msgid "Loading file: %s" msgstr "加载文件：%s" @@ -9160,10 +9160,10 @@ msgstr "多设备管理" msgid "With this option enabled, you can send a task to multiple devices at the same time and manage multiple devices." msgstr "启用此选项后，您可以同时向多个设备发送任务并管理多个设备。" -msgid "Open the Speed Dial with the Space key" +msgid "Open the Speed Dial from the keyboard" msgstr "" -msgid "When enabled, pressing Space (with no other key held) opens the Speed Dial action search from any page." +msgid "When enabled, the Speed Dial keyboard shortcut (Space by default) opens the action search from any page." msgstr "" msgid "Recent actions" @@ -9295,6 +9295,15 @@ msgstr "鼠标右键拖动" msgid "Set the action that dragging the right mouse button should perform." msgstr "设置拖动鼠标右键时应执行的操作。" +msgid "Keyboard" +msgstr "" + +msgid "Keyboard shortcuts" +msgstr "" + +msgid "Choose the key for each action." +msgstr "" + msgid "Clear my choice on..." msgstr "清除我的选择..." @@ -9405,11 +9414,39 @@ msgstr "" "限制视口帧率以降低 GPU 负载和功耗。\n" "设置为 0 表示不限制帧率。" +msgid "Reuse the 3D scene while idle" +msgstr "" + +msgid "" +"Skips redrawing the 3D scene when only the mouse cursor moves over the viewport,\n" +"and reuses the previous frame's scene instead. Reduces GPU load.\n" +"Disable it if the viewport shows stale or missing contents.\n" +"\n" +"Takes effect immediately." +msgstr "" + +msgid "Skip unchanged frames" +msgstr "" + +msgid "" +"Skips drawing a frame altogether when it would be identical to the one already on screen.\n" +"Only applies to frames that reuse the 3D scene, so it needs Reuse the 3D scene while idle.\n" +"Disable it if a hover highlight, tooltip or animation stops updating.\n" +"\n" +"Takes effect immediately." +msgstr "" + msgid "Show FPS overlay" msgstr "显示 FPS 叠加层" -msgid "Displays current viewport FPS in the top-right corner." -msgstr "在右上角显示当前视口的 FPS。" +msgid "Displays rendering counts in the top-right corner of the viewport." +msgstr "" + +msgid "FPS: frames presented to the screen per second." +msgstr "" + +msgid "3D: frames per second that redrew the 3D scene." +msgstr "" # AI Translated msgid "G-code Preview" @@ -9869,13 +9906,8 @@ msgstr "发布 3MF..." msgid "Select which settings to be published in the 3MF file" msgstr "选择要在 3MF 文件中发布的设置" -# AI Translated -msgid "Publish 3MF Wiki" -msgstr "发布 3MF Wiki" - -# AI Translated -msgid "Publish 3MF Video Guide" -msgstr "发布 3MF 视频指南" +msgid "Video Guide" +msgstr "" # AI Translated msgid "Mixed filament - published as a whole when \"Enable\" above is selected" @@ -10077,6 +10109,13 @@ msgstr "" msgid "No wiki page for this action" msgstr "" +msgid "Show details" +msgstr "显示详情" + +# AI Translated +msgid "Hide details" +msgstr "隐藏详情" + #, c-format, boost-format msgid "\"%s\" is a Developer setting. Enable Developer mode to edit it?" msgstr "" @@ -11876,70 +11915,39 @@ msgstr "参数配置包在之前的配置向导中发生了变更" msgid "Configuration package changed" msgstr "参数配置包发生变更" -msgid "Toolbar" -msgstr "工具栏" - -msgid "Objects list" -msgstr "对象列表" - -msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" -msgstr "从STL/STEP/3MF/OBJ/AMF文件中导入几何数据" - -msgid "Paste from clipboard" -msgstr "从剪切板粘贴" - -msgid "Show/Hide 3Dconnexion devices settings dialog" -msgstr "显示/隐藏 3Dconnexion设备的设置对话框" - -msgid "Switch table page" -msgstr "切换标签页" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Space" -msgstr "Space" - -msgid "Open speed dial" -msgstr "" - -msgid "Run a Speed Dial favourite (while the Speed Dial is open)" -msgstr "" - -msgid "Show keyboard shortcuts list" -msgstr "显示键盘快捷键列表" - -msgid "Global shortcuts" -msgstr "全局快捷键" - msgid "Pan View" msgstr "移动视角" msgid "Rotate View" msgstr "旋转视角" -msgid "Middle mouse button" -msgstr "鼠标中键" - -msgid "Zoom View" -msgstr "缩放视角" - -msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." +#, c-format, boost-format +msgid "Use %s or %s, or a key that does not type a character." msgstr "" -"自动调整选定零件/所有零件的方向,\n" -"有选定零件时调整选定零件的朝向,\n" -"没有选择零件时调整当项目所有零件的朝向" -msgid "Auto orients all objects on the active plate." -msgstr "自动调整活动盘上的所有物体的方向。" +msgctxt "Keyboard Shortcut" +msgid "Key" +msgstr "" -msgid "Collapse/Expand the sidebar" -msgstr "收起/展开 侧边栏" +msgid "Left mouse" +msgstr "" -msgid "Any arrow" -msgstr "任意箭头" +msgid "Available anywhere in the window, even while typing in a text field." +msgstr "" -msgid "Movement in camera space" -msgstr "沿相机视角移动对象" +msgid "Run a speed dial favorite while the dial is open" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Tab" +msgstr "Tab" + +msgid "Switch to the next main tab" +msgstr "" + +msgid "Available while the 3D view on the Prepare tab has focus." +msgstr "" msgid "Select a part" msgstr "选择单个零件" @@ -11950,130 +11958,29 @@ msgstr "选择多个对象" msgid "Select objects by rectangle" msgstr "框选多个零件" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Up" -msgstr "↑" - -# AI Translated -msgid "Move selection 10mm in positive Y direction" -msgstr "将所选项沿 Y 轴正方向移动 10mm" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Down" -msgstr "↓" - -# AI Translated -msgid "Move selection 10mm in negative Y direction" -msgstr "将所选项沿 Y 轴负方向移动 10mm" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Left" -msgstr "←" - -# AI Translated -msgid "Move selection 10mm in negative X direction" -msgstr "将所选项沿 X 轴负方向移动 10mm" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Right" -msgstr "→" - -# AI Translated -msgid "Move selection 10mm in positive X direction" -msgstr "将所选项沿 X 轴正方向移动 10mm" +msgid "Keyboard 1-9: set filament for object/part" +msgstr "按键1-9：设置对象/零件的耗材丝" msgid "Movement step set to 1mm" msgstr "沿X、Y轴以1mm为步进移动对象" -msgid "Keyboard 1-9: set filament for object/part" -msgstr "按键1-9：设置对象/零件的耗材丝" +msgid "Movement in camera space" +msgstr "沿相机视角移动对象" -msgid "Camera view - Default" -msgstr "摄像机视角 - 默认" +msgid "Middle mouse" +msgstr "" -msgid "Camera view - Top" -msgstr "摄像机视角 - 顶部" +msgid "Right mouse" +msgstr "" -msgid "Camera view - Bottom" -msgstr "摄像机视角 - 底部" +msgid "Zoom View" +msgstr "缩放视角" -msgid "Camera view - Front" -msgstr "摄像机视角 - 正面" +msgid "Painting" +msgstr "" -msgid "Camera view - Behind" -msgstr "摄像机视角 - 后面" - -msgid "Camera Angle - Left side" -msgstr "摄像机视角 - 左面" - -msgid "Camera Angle - Right side" -msgstr "摄像机视角 - 右面" - -msgid "Select all objects" -msgstr "选择所有对象" - -msgid "Gizmo move" -msgstr "线框移动" - -msgid "Gizmo rotate" -msgstr "旋转物件" - -msgid "Gizmo scale" -msgstr "线框缩放" - -msgid "Gizmo place face on bed" -msgstr "选择底面" - -msgid "Gizmo cut" -msgstr "剪切物件" - -msgid "Gizmo mesh boolean" -msgstr "线框网格布尔操作" - -msgid "Gizmo FDM paint-on fuzzy skin" -msgstr "Gizmo FDM手绘绒毛表面" - -msgid "Gizmo SLA support points" -msgstr "SLA支撑点" - -msgid "Gizmo FDM paint-on seam" -msgstr "FDM涂装接缝" - -msgid "Gizmo text emboss/engrave" -msgstr "线框文本浮雕/雕刻" - -msgid "Gizmo measure" -msgstr "线框测量" - -msgid "Gizmo assemble" -msgstr "线框组合" - -msgid "Gizmo brim ears" -msgstr "线框耳状帽檐" - -msgid "Zoom in" -msgstr "放大" - -msgid "Zoom out" -msgstr "缩小" - -msgid "Toggle printable for object/part" -msgstr "切换对象/零件的可打印状态" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Tab" -msgstr "Tab" - -msgid "Switch between Prepare/Preview" -msgstr "准备/预览之间的切换" - -msgid "Plater" -msgstr "准备" +msgid "Available while a painting gizmo is open: supports, seam, fuzzy skin or color painting." +msgstr "" msgid "Move: press to snap by 1mm" msgstr "移动：以1mm为步进移动" @@ -12084,14 +11991,19 @@ msgstr "支撑/颜色绘制：调节画笔半径" msgid "Support/Color Painting: adjust section position" msgstr "支撑/色彩绘制：调节剖面位置" -msgid "Gizmo" -msgstr "小工具" +msgid "Objects list" +msgstr "对象列表" + +msgid "Available while the object list has focus." +msgstr "" msgid "Set extruder number for the objects and parts" msgstr "设置对象、零件使用的挤出机编号" -msgid "Delete objects, parts, modifiers" -msgstr "删除对象、零件、修改器" +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Space" +msgstr "Space" msgid "Select the object/part and press space to change the name" msgstr "选中对象、零件，按空格可修改名称" @@ -12102,45 +12014,48 @@ msgstr "鼠标点击" msgid "Select the object/part and mouse click to change the name" msgstr "选中对象、零件，双击零件名可修改名称" -msgid "Objects List" -msgstr "对象列表" - -msgid "Vertical slider - Move active thumb Up" -msgstr "垂直滑动条 - 向上移动一层" - -msgid "Vertical slider - Move active thumb Down" -msgstr "垂直滑动条 - 向下移动一层" - -msgid "Horizontal slider - Move active thumb Left" -msgstr "水平滑动条 - 向左移动一步" - -msgid "Horizontal slider - Move active thumb Right" -msgstr "水平滑动条 - 向右移动一步" - -msgid "On/Off one layer mode of the vertical slider" -msgstr "开启/关闭垂直滑动条的单层模式" - -msgid "On/Off G-code window" -msgstr "开启/关闭G-code窗口" +msgid "Available while the 3D view on the Preview tab has focus." +msgstr "" msgid "Move slider 5x faster" msgstr "5倍速移动滑动条" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Home" -msgstr "Home" +msgid "Scroll slider 5x faster" +msgstr "" -msgid "Horizontal slider - Move to start position" -msgstr "水平滑块 - 移动到起始位置" +msgid "Not customizable" +msgstr "" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "End" -msgstr "End" +#, c-format, boost-format +msgid "%s is assigned to %s. Reassign it to %s?" +msgstr "" -msgid "Horizontal slider - Move to last position" -msgstr "水平滑块 - 移动到末尾位置" +#, c-format, boost-format +msgid "The default %s is assigned to %s. Reassign it to %s?" +msgstr "" + +msgid "Global shortcuts also apply while typing." +msgstr "" + +msgid "A key that types a character cannot be a global shortcut." +msgstr "" + +msgid "Esc cancels, Enter confirms." +msgstr "" + +#, c-format, boost-format +msgid "" +"Press the new shortcut for\n" +"\"%s\"" +msgstr "" + +#, c-format, boost-format +msgid "Already used as a step of %s." +msgstr "" + +#, c-format, boost-format +msgid "Already assigned to %s. Press OK to reassign it." +msgstr "" msgid "Release Note" msgstr "更新说明" @@ -16971,8 +16886,8 @@ msgstr "预热步骤" msgid "Insert multiple preheat commands (e.g. M104.1). Only useful for Prusa XL. For other printers, please set it to 1." msgstr "插入多个预热命令（例如 M104.1）。仅适用于 Prusa XL。对于其他打印机，请将其设置为 1。" -msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." -msgstr "G-code 写在输出文件的最顶部，位于任何其他内容之前。对于添加打印机固件从文件第一行读取的元数据（例如估计打印时间、耗材使用情况）很有用。支持 {print_time_sec} 和 {used_filament_length} 等占位符。" +msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_total_sec}, {print_time_day}, {print_time_hour}, {print_time_minute}, {print_time_sec} and {used_filament_length}." +msgstr "" msgid "Start G-code" msgstr "起始G-code" @@ -18504,12 +18419,36 @@ msgstr "已用耗材" msgid "Total length of filament used in the print." msgstr "打印中使用的耗材的总长度。" -msgid "Print time (seconds)" -msgstr "打印耗时（秒）" +msgid "Print time (total seconds)" +msgstr "" msgid "Total estimated print time in seconds. Replaced with actual value during post-processing." msgstr "预计总打印耗时（以秒为单位）。在后处理时将替换为实际值。" +msgid "Print time (days component)" +msgstr "" + +msgid "Estimated print time day component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (hours component)" +msgstr "" + +msgid "Estimated print time hour component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (minutes component)" +msgstr "" + +msgid "Estimated print time minute component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (seconds component)" +msgstr "" + +msgid "Estimated print time second component (normal mode). Replaced with actual value during post-processing." +msgstr "" + msgid "Filament length (meters)" msgstr "耗材长度（米）" @@ -20342,6 +20281,9 @@ msgstr "未检测到有效会话。是否继续登录 3DPrinterOS？" msgid "Success!" msgstr "成功！" +msgid "Generate API Key" +msgstr "" + msgid "Are you sure to log out?" msgstr "您确定要登出吗？" @@ -21339,13 +21281,6 @@ msgstr "Bambu 网络插件用于云功能、打印机发现和远程打印。" msgid "Error: %s" msgstr "错误：%s" -msgid "Show details" -msgstr "显示详情" - -# AI Translated -msgid "Hide details" -msgstr "隐藏详情" - msgid "Version to install:" msgstr "将安装的版本：" @@ -23976,6 +23911,12 @@ msgstr "" msgid "No binding for that field" msgstr "" +msgid "Enter a number" +msgstr "" + +msgid "Not a number" +msgstr "" + msgid "Primitive" msgstr "" @@ -23988,6 +23929,220 @@ msgstr "" msgid "Clear All" msgstr "" +msgctxt "Keyboard Shortcut" +msgid "Ins" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Home" +msgstr "Home" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "End" +msgstr "End" + +msgctxt "Keyboard Shortcut" +msgid "PgUp" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "PgDn" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Left" +msgstr "←" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Right" +msgstr "→" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Up" +msgstr "↑" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Down" +msgstr "↓" + +msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" +msgstr "从STL/STEP/3MF/OBJ/AMF文件中导入几何数据" + +msgid "Select all objects" +msgstr "选择所有对象" + +msgid "Paste from clipboard" +msgstr "从剪切板粘贴" + +msgid "Toggle printable for object/part" +msgstr "切换对象/零件的可打印状态" + +# AI Translated +msgid "Move selection 10mm in negative X direction" +msgstr "将所选项沿 X 轴负方向移动 10mm" + +# AI Translated +msgid "Move selection 10mm in positive X direction" +msgstr "将所选项沿 X 轴正方向移动 10mm" + +# AI Translated +msgid "Move selection 10mm in positive Y direction" +msgstr "将所选项沿 Y 轴正方向移动 10mm" + +# AI Translated +msgid "Move selection 10mm in negative Y direction" +msgstr "将所选项沿 Y 轴负方向移动 10mm" + +msgid "Rotate selection 45 degrees counterclockwise" +msgstr "" + +msgid "Rotate selection 45 degrees clockwise" +msgstr "" + +msgid "Gizmo move" +msgstr "线框移动" + +msgid "Gizmo rotate" +msgstr "旋转物件" + +msgid "Gizmo scale" +msgstr "线框缩放" + +msgid "Gizmo place face on bed" +msgstr "选择底面" + +msgid "Gizmo cut" +msgstr "剪切物件" + +msgid "Gizmo mesh boolean" +msgstr "线框网格布尔操作" + +msgid "Gizmo FDM paint-on supports" +msgstr "" + +msgid "Gizmo FDM paint-on seam" +msgstr "FDM涂装接缝" + +msgid "Gizmo FDM paint-on fuzzy skin" +msgstr "Gizmo FDM手绘绒毛表面" + +msgid "Gizmo multi-material painting" +msgstr "" + +msgid "Gizmo text emboss/engrave" +msgstr "线框文本浮雕/雕刻" + +msgid "Gizmo measure" +msgstr "线框测量" + +msgid "Gizmo assemble" +msgstr "线框组合" + +msgid "Gizmo brim ears" +msgstr "线框耳状帽檐" + +msgid "Vertical slider - Move active thumb Up" +msgstr "垂直滑动条 - 向上移动一层" + +msgid "Vertical slider - Move active thumb Down" +msgstr "垂直滑动条 - 向下移动一层" + +msgid "Horizontal slider - Move active thumb Left" +msgstr "水平滑动条 - 向左移动一步" + +msgid "Horizontal slider - Move active thumb Right" +msgstr "水平滑动条 - 向右移动一步" + +msgid "Horizontal slider - Move to start position" +msgstr "水平滑块 - 移动到起始位置" + +msgid "Horizontal slider - Move to last position" +msgstr "水平滑块 - 移动到末尾位置" + +msgid "Camera view - Default" +msgstr "摄像机视角 - 默认" + +msgid "Camera view - Top" +msgstr "摄像机视角 - 顶部" + +msgid "Camera view - Bottom" +msgstr "摄像机视角 - 底部" + +msgid "Camera view - Front" +msgstr "摄像机视角 - 正面" + +msgid "Camera view - Behind" +msgstr "摄像机视角 - 后面" + +msgid "Camera Angle - Left side" +msgstr "摄像机视角 - 左面" + +msgid "Camera Angle - Right side" +msgstr "摄像机视角 - 右面" + +msgid "Camera view - Current plate" +msgstr "" + +msgid "Zoom in" +msgstr "放大" + +msgid "Zoom out" +msgstr "缩小" + +msgid "Show/Hide 3Dconnexion devices settings dialog" +msgstr "显示/隐藏 3Dconnexion设备的设置对话框" + +msgid "Show/Hide wireframe" +msgstr "" + +msgid "On/Off G-code window" +msgstr "开启/关闭G-code窗口" + +msgid "On/Off one layer mode of the vertical slider" +msgstr "开启/关闭垂直滑动条的单层模式" + +msgid "Switch between Prepare/Preview" +msgstr "准备/预览之间的切换" + +msgid "Collapse/Expand the sidebar" +msgstr "收起/展开 侧边栏" + +msgid "Open the speed dial" +msgstr "" + +msgid "Reload the device page" +msgstr "" + +msgid "Show keyboard shortcuts list" +msgstr "显示键盘快捷键列表" + +msgid "Slicing and printing" +msgstr "" + +msgid "Editing" +msgstr "" + +msgid "Placement" +msgstr "" + +msgid "Gizmos" +msgstr "" + +msgid "Sliders" +msgstr "" + +msgid "Painting tools" +msgstr "" + +msgid "Application" +msgstr "" + #: resources/data/hints.ini: [hint:Precise wall] msgid "" "Precise wall\n" @@ -24288,6 +24443,65 @@ msgstr "" "避免翘曲\n" "您知道吗？打印ABS这类易翘曲材料时，适当提高热床温度可以降低翘曲的概率。" +#~ msgid "Tab" +#~ msgstr "标签" + +#~ msgid "Displays current viewport FPS in the top-right corner." +#~ msgstr "在右上角显示当前视口的 FPS。" + +# AI Translated +#~ msgid "Publish 3MF Wiki" +#~ msgstr "发布 3MF Wiki" + +# AI Translated +#~ msgid "Publish 3MF Video Guide" +#~ msgstr "发布 3MF 视频指南" + +#~ msgid "Toolbar" +#~ msgstr "工具栏" + +#~ msgid "Switch table page" +#~ msgstr "切换标签页" + +#~ msgid "Global shortcuts" +#~ msgstr "全局快捷键" + +#~ msgid "Middle mouse button" +#~ msgstr "鼠标中键" + +#~ msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." +#~ msgstr "" +#~ "自动调整选定零件/所有零件的方向,\n" +#~ "有选定零件时调整选定零件的朝向,\n" +#~ "没有选择零件时调整当项目所有零件的朝向" + +#~ msgid "Auto orients all objects on the active plate." +#~ msgstr "自动调整活动盘上的所有物体的方向。" + +#~ msgid "Any arrow" +#~ msgstr "任意箭头" + +#~ msgid "Gizmo SLA support points" +#~ msgstr "SLA支撑点" + +#~ msgid "Plater" +#~ msgstr "准备" + +#~ msgid "Gizmo" +#~ msgstr "小工具" + +#~ msgid "Delete objects, parts, modifiers" +#~ msgstr "删除对象、零件、修改器" + +#~ msgid "Objects List" +#~ msgstr "对象列表" + +#~ msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." +#~ msgstr "G-code 写在输出文件的最顶部，位于任何其他内容之前。对于添加打印机固件从文件第一行读取的元数据（例如估计打印时间、耗材使用情况）很有用。支持 {print_time_sec} 和 {used_filament_length} 等占位符。" + +#~ msgid "Print time (seconds)" +#~ msgstr "打印耗时（秒）" + # AI Translated #~ msgid "Open actions speed dial" #~ msgstr "打开快捷操作盘" diff --git a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po index d50ec44d21..734d547ac9 100644 --- a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po +++ b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Orca Slicer\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-09-18 15:50+0800\n" +"POT-Creation-Date: 2026-09-22 17:02+0800\n" "PO-Revision-Date: 2025-11-28 13:48-0600\n" "Last-Translator: tntchn <15895303+tntchn@users.noreply.github.com>\n" "Language-Team: \n" @@ -5886,12 +5886,15 @@ msgctxt "Camera View" msgid "Right" msgstr "右" -msgid "Add" -msgstr "新增" - msgid "Add plate" msgstr "新增列印板" +msgid "Split to objects" +msgstr "拆分為物件" + +msgid "Add" +msgstr "新增" + msgid "Auto orient all/selected objects" msgstr "自動旋轉所有/選取物件的方向" @@ -5904,9 +5907,6 @@ msgstr "全域整理" msgid "Arrange objects on selected plates" msgstr "在選定的列印板上排列物件" -msgid "Split to objects" -msgstr "拆分為物件" - msgid "Assembly View" msgstr "組裝視角" @@ -5962,6 +5962,9 @@ msgstr "輪廓線" msgid "Wireframe" msgstr "線框" +msgid "X-Ray" +msgstr "" + msgid "Realistic View" msgstr "擬真檢視" @@ -6502,9 +6505,6 @@ msgstr "在 3D 場景中顯示選定物件的輪廓" msgid "Preferences" msgstr "偏好設定" -msgid "Open speed dial..." -msgstr "" - # AI Translated msgctxt "Menu" msgid "Edit" @@ -6513,6 +6513,9 @@ msgstr "編輯" msgid "View" msgstr "視角" +msgid "Open Speed Dial" +msgstr "" + msgid "Preset Bundle" msgstr "設定檔組" @@ -8310,9 +8313,6 @@ msgstr "展開側邊欄" msgid "Collapse sidebar" msgstr "折疊側邊欄" -msgid "Tab" -msgstr "分頁" - #, c-format, boost-format msgid "Loading file: %s" msgstr "載入檔案：%s" @@ -9333,10 +9333,10 @@ msgstr "多臺裝置管理" msgid "With this option enabled, you can send a task to multiple devices at the same time and manage multiple devices." msgstr "啟用時可以同時傳送到並管理多個機臺。" -msgid "Open the Speed Dial with the Space key" +msgid "Open the Speed Dial from the keyboard" msgstr "" -msgid "When enabled, pressing Space (with no other key held) opens the Speed Dial action search from any page." +msgid "When enabled, the Speed Dial keyboard shortcut (Space by default) opens the action search from any page." msgstr "" msgid "Recent actions" @@ -9468,6 +9468,15 @@ msgstr "滑鼠右鍵拖曳" msgid "Set the action that dragging the right mouse button should perform." msgstr "設定拖曳滑鼠右鍵時應執行的動作。" +msgid "Keyboard" +msgstr "" + +msgid "Keyboard shortcuts" +msgstr "" + +msgid "Choose the key for each action." +msgstr "" + msgid "Clear my choice on..." msgstr "清除我的選擇於..." @@ -9578,11 +9587,39 @@ msgstr "" "限制視埠影格率以降低 GPU 負載與耗電量。\n" "設為 0 表示不限制影格率。" +msgid "Reuse the 3D scene while idle" +msgstr "" + +msgid "" +"Skips redrawing the 3D scene when only the mouse cursor moves over the viewport,\n" +"and reuses the previous frame's scene instead. Reduces GPU load.\n" +"Disable it if the viewport shows stale or missing contents.\n" +"\n" +"Takes effect immediately." +msgstr "" + +msgid "Skip unchanged frames" +msgstr "" + +msgid "" +"Skips drawing a frame altogether when it would be identical to the one already on screen.\n" +"Only applies to frames that reuse the 3D scene, so it needs Reuse the 3D scene while idle.\n" +"Disable it if a hover highlight, tooltip or animation stops updating.\n" +"\n" +"Takes effect immediately." +msgstr "" + msgid "Show FPS overlay" msgstr "顯示 FPS 疊加層" -msgid "Displays current viewport FPS in the top-right corner." -msgstr "在右上角顯示目前視埠的 FPS。" +msgid "Displays rendering counts in the top-right corner of the viewport." +msgstr "" + +msgid "FPS: frames presented to the screen per second." +msgstr "" + +msgid "3D: frames per second that redrew the 3D scene." +msgstr "" # AI Translated msgid "G-code Preview" @@ -10042,13 +10079,8 @@ msgstr "發布 3MF..." msgid "Select which settings to be published in the 3MF file" msgstr "選擇要在 3MF 檔案中發布的設定" -# AI Translated -msgid "Publish 3MF Wiki" -msgstr "發布 3MF Wiki" - -# AI Translated -msgid "Publish 3MF Video Guide" -msgstr "發布 3MF 影片指南" +msgid "Video Guide" +msgstr "" # AI Translated msgid "Mixed filament - published as a whole when \"Enable\" above is selected" @@ -10250,6 +10282,13 @@ msgstr "" msgid "No wiki page for this action" msgstr "" +msgid "Show details" +msgstr "顯示詳細資訊" + +# AI Translated +msgid "Hide details" +msgstr "隱藏詳細資料" + #, c-format, boost-format msgid "\"%s\" is a Developer setting. Enable Developer mode to edit it?" msgstr "" @@ -12084,67 +12123,39 @@ msgstr "設定檔在之前的設定引導過程中已改變" msgid "Configuration package changed" msgstr "設定檔已改變" -msgid "Toolbar" -msgstr "工具欄" - -msgid "Objects list" -msgstr "物件清單" - -msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" -msgstr "從 STL/STEP/3MF/OBJ/AMF 檔案中匯入幾何模型" - -msgid "Paste from clipboard" -msgstr "從剪貼簿貼上" - -msgid "Show/Hide 3Dconnexion devices settings dialog" -msgstr "顯示/隱藏 3Dconnexion 裝置的設定對話框" - -msgid "Switch table page" -msgstr "切換表單頁面" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Space" -msgstr "Space" - -msgid "Open speed dial" -msgstr "" - -msgid "Run a Speed Dial favourite (while the Speed Dial is open)" -msgstr "" - -msgid "Show keyboard shortcuts list" -msgstr "顯示鍵盤快速鍵清單" - -msgid "Global shortcuts" -msgstr "全域快速鍵" - msgid "Pan View" msgstr "移動視角" msgid "Rotate View" msgstr "旋轉視角" -msgid "Middle mouse button" -msgstr "滑鼠中鍵" +#, c-format, boost-format +msgid "Use %s or %s, or a key that does not type a character." +msgstr "" -msgid "Zoom View" -msgstr "縮放視角" +msgctxt "Keyboard Shortcut" +msgid "Key" +msgstr "" -msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." -msgstr "自動旋轉選取的物件或所有物件的方向。當有物件被選取時，僅自動旋轉選取的物件。無選取的物件時，會自動旋轉專案中的所有物件。" +msgid "Left mouse" +msgstr "" -msgid "Auto orients all objects on the active plate." -msgstr "自動旋轉目前板上所有物件的方向" +msgid "Available anywhere in the window, even while typing in a text field." +msgstr "" -msgid "Collapse/Expand the sidebar" -msgstr "摺疊/展開 側邊欄" +msgid "Run a speed dial favorite while the dial is open" +msgstr "" -msgid "Any arrow" -msgstr "任意方向鍵" +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Tab" +msgstr "Tab" -msgid "Movement in camera space" -msgstr "沿相機視角移動物件" +msgid "Switch to the next main tab" +msgstr "" + +msgid "Available while the 3D view on the Prepare tab has focus." +msgstr "" msgid "Select a part" msgstr "選擇單一零件" @@ -12155,130 +12166,29 @@ msgstr "選擇多個物件" msgid "Select objects by rectangle" msgstr "框選多個零件" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Up" -msgstr "Arrow Up" - -# AI Translated -msgid "Move selection 10mm in positive Y direction" -msgstr "將選取物件沿 Y 軸正方向移動 10mm" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Down" -msgstr "Arrow Down" - -# AI Translated -msgid "Move selection 10mm in negative Y direction" -msgstr "將選取物件沿 Y 軸負方向移動 10mm" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Left" -msgstr "Arrow Left" - -# AI Translated -msgid "Move selection 10mm in negative X direction" -msgstr "將選取物件沿 X 軸負方向移動 10mm" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Arrow Right" -msgstr "Arrow Right" - -# AI Translated -msgid "Move selection 10mm in positive X direction" -msgstr "將選取物件沿 X 軸正方向移動 10mm" +msgid "Keyboard 1-9: set filament for object/part" +msgstr "按鍵 １～９：設定物件/零件的線材" msgid "Movement step set to 1mm" msgstr "沿 X、Y 軸以 1mm 為單位步進移動" -msgid "Keyboard 1-9: set filament for object/part" -msgstr "按鍵 １～９：設定物件/零件的線材" +msgid "Movement in camera space" +msgstr "沿相機視角移動物件" -msgid "Camera view - Default" -msgstr "攝影機視角 - 預設" +msgid "Middle mouse" +msgstr "" -msgid "Camera view - Top" -msgstr "攝影機視角 - 頂部" +msgid "Right mouse" +msgstr "" -msgid "Camera view - Bottom" -msgstr "攝影機視角 - 底部" +msgid "Zoom View" +msgstr "縮放視角" -msgid "Camera view - Front" -msgstr "攝影機視角 - 前面" +msgid "Painting" +msgstr "" -msgid "Camera view - Behind" -msgstr "攝影機視角 - 後面" - -msgid "Camera Angle - Left side" -msgstr "攝影機視角 - 左面" - -msgid "Camera Angle - Right side" -msgstr "攝影機視角 - 右面" - -msgid "Select all objects" -msgstr "選擇所有物件" - -msgid "Gizmo move" -msgstr "線框移動" - -msgid "Gizmo rotate" -msgstr "旋轉物件" - -msgid "Gizmo scale" -msgstr "線框縮放" - -msgid "Gizmo place face on bed" -msgstr "選擇底面" - -msgid "Gizmo cut" -msgstr "切割物件" - -msgid "Gizmo mesh boolean" -msgstr "線框網格布林運算" - -msgid "Gizmo FDM paint-on fuzzy skin" -msgstr "Gizmo FDM 塗刷絨毛表面效果" - -msgid "Gizmo SLA support points" -msgstr "SLA 支撐點" - -msgid "Gizmo FDM paint-on seam" -msgstr "FDM 塗裝接縫" - -msgid "Gizmo text emboss/engrave" -msgstr "浮雕/雕刻文字工具" - -msgid "Gizmo measure" -msgstr "測量" - -msgid "Gizmo assemble" -msgstr "組裝" - -msgid "Gizmo brim ears" -msgstr "擴邊耳工具" - -msgid "Zoom in" -msgstr "放大" - -msgid "Zoom out" -msgstr "縮小" - -msgid "Toggle printable for object/part" -msgstr "切換物件/零件的可列印屬性" - -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Tab" -msgstr "Tab" - -msgid "Switch between Prepare/Preview" -msgstr "在準備/預覽模式之中切換" - -msgid "Plater" -msgstr "準備" +msgid "Available while a painting gizmo is open: supports, seam, fuzzy skin or color painting." +msgstr "" msgid "Move: press to snap by 1mm" msgstr "移動：以 1mm 為單位步進移動" @@ -12289,14 +12199,19 @@ msgstr "支撐/顏色繪製：調整筆刷半徑" msgid "Support/Color Painting: adjust section position" msgstr "支撐/色彩繪製：調整剖面位置" -msgid "Gizmo" -msgstr "浮雕" +msgid "Objects list" +msgstr "物件清單" + +msgid "Available while the object list has focus." +msgstr "" msgid "Set extruder number for the objects and parts" msgstr "設定物件、零件使用的擠出機編號" -msgid "Delete objects, parts, modifiers" -msgstr "刪除物件、零件、修改器" +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Space" +msgstr "Space" msgid "Select the object/part and press space to change the name" msgstr "選取物件、零件，按空格可修改名稱" @@ -12307,45 +12222,48 @@ msgstr "滑鼠點選" msgid "Select the object/part and mouse click to change the name" msgstr "選取物件或零件，雙擊可修改名稱" -msgid "Objects List" -msgstr "物件清單" - -msgid "Vertical slider - Move active thumb Up" -msgstr "垂直滑動條 - 向上移動一層" - -msgid "Vertical slider - Move active thumb Down" -msgstr "垂直滑動條 - 向下移動一層" - -msgid "Horizontal slider - Move active thumb Left" -msgstr "水平滑動條 - 向左移動一步" - -msgid "Horizontal slider - Move active thumb Right" -msgstr "水平滑動條 - 向右移動一步" - -msgid "On/Off one layer mode of the vertical slider" -msgstr "開啟/關閉垂直滑動條的單層模式" - -msgid "On/Off G-code window" -msgstr "開啟/關閉 G-code 視窗" +msgid "Available while the 3D view on the Preview tab has focus." +msgstr "" msgid "Move slider 5x faster" msgstr "5 倍速移動滑動條" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "Home" -msgstr "Home" +msgid "Scroll slider 5x faster" +msgstr "" -msgid "Horizontal slider - Move to start position" -msgstr "水平滑動條 - 移動到起始位置" +msgid "Not customizable" +msgstr "" -# AI Translated -msgctxt "Keyboard Shortcut" -msgid "End" -msgstr "End" +#, c-format, boost-format +msgid "%s is assigned to %s. Reassign it to %s?" +msgstr "" -msgid "Horizontal slider - Move to last position" -msgstr "水平滑動條 - 移動到最後位置" +#, c-format, boost-format +msgid "The default %s is assigned to %s. Reassign it to %s?" +msgstr "" + +msgid "Global shortcuts also apply while typing." +msgstr "" + +msgid "A key that types a character cannot be a global shortcut." +msgstr "" + +msgid "Esc cancels, Enter confirms." +msgstr "" + +#, c-format, boost-format +msgid "" +"Press the new shortcut for\n" +"\"%s\"" +msgstr "" + +#, c-format, boost-format +msgid "Already used as a step of %s." +msgstr "" + +#, c-format, boost-format +msgid "Already assigned to %s. Press OK to reassign it." +msgstr "" msgid "Release Note" msgstr "更新說明" @@ -17167,8 +17085,8 @@ msgstr "預熱階段" msgid "Insert multiple preheat commands (e.g. M104.1). Only useful for Prusa XL. For other printers, please set it to 1." msgstr "插入多條預熱指令（例如：M104.1）。此功能僅適用於 Prusa XL。其他列印裝置請將其設為 1。" -msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." -msgstr "G-code 寫在輸出檔案的最頂部，位於任何其他內容之前。對於新增列印裝置韌體從檔案第一行讀取的中繼資料（例如估計列印時間、線材使用情況）很有用。支援 {print_time_sec} 和 {used_filament_length} 等預留位置。" +msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_total_sec}, {print_time_day}, {print_time_hour}, {print_time_minute}, {print_time_sec} and {used_filament_length}." +msgstr "" msgid "Start G-code" msgstr "起始 G-code" @@ -18691,12 +18609,36 @@ msgstr "使用的線材" msgid "Total length of filament used in the print." msgstr "列印所使用的線材總長度" -msgid "Print time (seconds)" -msgstr "列印時間（秒）" +msgid "Print time (total seconds)" +msgstr "" msgid "Total estimated print time in seconds. Replaced with actual value during post-processing." msgstr "預估列印總時間（秒）。後處理時將以實際值取代" +msgid "Print time (days component)" +msgstr "" + +msgid "Estimated print time day component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (hours component)" +msgstr "" + +msgid "Estimated print time hour component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (minutes component)" +msgstr "" + +msgid "Estimated print time minute component (normal mode). Replaced with actual value during post-processing." +msgstr "" + +msgid "Print time (seconds component)" +msgstr "" + +msgid "Estimated print time second component (normal mode). Replaced with actual value during post-processing." +msgstr "" + msgid "Filament length (meters)" msgstr "線材長度（公尺）" @@ -20532,6 +20474,9 @@ msgstr "未偵測到有效的工作階段。要繼續登入 3DPrinterOS 嗎？" msgid "Success!" msgstr "成功！" +msgid "Generate API Key" +msgstr "" + msgid "Are you sure to log out?" msgstr "確認要登出嗎？" @@ -21531,13 +21476,6 @@ msgstr "Bambu 網路外掛程式用於雲端功能、印表機探索和遠端列 msgid "Error: %s" msgstr "錯誤：%s" -msgid "Show details" -msgstr "顯示詳細資訊" - -# AI Translated -msgid "Hide details" -msgstr "隱藏詳細資料" - msgid "Version to install:" msgstr "將安裝的版本：" @@ -24168,6 +24106,12 @@ msgstr "" msgid "No binding for that field" msgstr "" +msgid "Enter a number" +msgstr "" + +msgid "Not a number" +msgstr "" + msgid "Primitive" msgstr "" @@ -24180,6 +24124,220 @@ msgstr "" msgid "Clear All" msgstr "" +msgctxt "Keyboard Shortcut" +msgid "Ins" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Home" +msgstr "Home" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "End" +msgstr "End" + +msgctxt "Keyboard Shortcut" +msgid "PgUp" +msgstr "" + +msgctxt "Keyboard Shortcut" +msgid "PgDn" +msgstr "" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Left" +msgstr "Arrow Left" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Right" +msgstr "Arrow Right" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Up" +msgstr "Arrow Up" + +# AI Translated +msgctxt "Keyboard Shortcut" +msgid "Arrow Down" +msgstr "Arrow Down" + +msgid "Import geometry data from STL/STEP/3MF/OBJ/AMF files" +msgstr "從 STL/STEP/3MF/OBJ/AMF 檔案中匯入幾何模型" + +msgid "Select all objects" +msgstr "選擇所有物件" + +msgid "Paste from clipboard" +msgstr "從剪貼簿貼上" + +msgid "Toggle printable for object/part" +msgstr "切換物件/零件的可列印屬性" + +# AI Translated +msgid "Move selection 10mm in negative X direction" +msgstr "將選取物件沿 X 軸負方向移動 10mm" + +# AI Translated +msgid "Move selection 10mm in positive X direction" +msgstr "將選取物件沿 X 軸正方向移動 10mm" + +# AI Translated +msgid "Move selection 10mm in positive Y direction" +msgstr "將選取物件沿 Y 軸正方向移動 10mm" + +# AI Translated +msgid "Move selection 10mm in negative Y direction" +msgstr "將選取物件沿 Y 軸負方向移動 10mm" + +msgid "Rotate selection 45 degrees counterclockwise" +msgstr "" + +msgid "Rotate selection 45 degrees clockwise" +msgstr "" + +msgid "Gizmo move" +msgstr "線框移動" + +msgid "Gizmo rotate" +msgstr "旋轉物件" + +msgid "Gizmo scale" +msgstr "線框縮放" + +msgid "Gizmo place face on bed" +msgstr "選擇底面" + +msgid "Gizmo cut" +msgstr "切割物件" + +msgid "Gizmo mesh boolean" +msgstr "線框網格布林運算" + +msgid "Gizmo FDM paint-on supports" +msgstr "" + +msgid "Gizmo FDM paint-on seam" +msgstr "FDM 塗裝接縫" + +msgid "Gizmo FDM paint-on fuzzy skin" +msgstr "Gizmo FDM 塗刷絨毛表面效果" + +msgid "Gizmo multi-material painting" +msgstr "" + +msgid "Gizmo text emboss/engrave" +msgstr "浮雕/雕刻文字工具" + +msgid "Gizmo measure" +msgstr "測量" + +msgid "Gizmo assemble" +msgstr "組裝" + +msgid "Gizmo brim ears" +msgstr "擴邊耳工具" + +msgid "Vertical slider - Move active thumb Up" +msgstr "垂直滑動條 - 向上移動一層" + +msgid "Vertical slider - Move active thumb Down" +msgstr "垂直滑動條 - 向下移動一層" + +msgid "Horizontal slider - Move active thumb Left" +msgstr "水平滑動條 - 向左移動一步" + +msgid "Horizontal slider - Move active thumb Right" +msgstr "水平滑動條 - 向右移動一步" + +msgid "Horizontal slider - Move to start position" +msgstr "水平滑動條 - 移動到起始位置" + +msgid "Horizontal slider - Move to last position" +msgstr "水平滑動條 - 移動到最後位置" + +msgid "Camera view - Default" +msgstr "攝影機視角 - 預設" + +msgid "Camera view - Top" +msgstr "攝影機視角 - 頂部" + +msgid "Camera view - Bottom" +msgstr "攝影機視角 - 底部" + +msgid "Camera view - Front" +msgstr "攝影機視角 - 前面" + +msgid "Camera view - Behind" +msgstr "攝影機視角 - 後面" + +msgid "Camera Angle - Left side" +msgstr "攝影機視角 - 左面" + +msgid "Camera Angle - Right side" +msgstr "攝影機視角 - 右面" + +msgid "Camera view - Current plate" +msgstr "" + +msgid "Zoom in" +msgstr "放大" + +msgid "Zoom out" +msgstr "縮小" + +msgid "Show/Hide 3Dconnexion devices settings dialog" +msgstr "顯示/隱藏 3Dconnexion 裝置的設定對話框" + +msgid "Show/Hide wireframe" +msgstr "" + +msgid "On/Off G-code window" +msgstr "開啟/關閉 G-code 視窗" + +msgid "On/Off one layer mode of the vertical slider" +msgstr "開啟/關閉垂直滑動條的單層模式" + +msgid "Switch between Prepare/Preview" +msgstr "在準備/預覽模式之中切換" + +msgid "Collapse/Expand the sidebar" +msgstr "摺疊/展開 側邊欄" + +msgid "Open the speed dial" +msgstr "" + +msgid "Reload the device page" +msgstr "" + +msgid "Show keyboard shortcuts list" +msgstr "顯示鍵盤快速鍵清單" + +msgid "Slicing and printing" +msgstr "" + +msgid "Editing" +msgstr "" + +msgid "Placement" +msgstr "" + +msgid "Gizmos" +msgstr "" + +msgid "Sliders" +msgstr "" + +msgid "Painting tools" +msgstr "" + +msgid "Application" +msgstr "" + #: resources/data/hints.ini: [hint:Precise wall] msgid "" "Precise wall\n" @@ -24501,6 +24659,62 @@ msgstr "" "避免翹曲\n" "您知道嗎？當列印容易翹曲的材料（如 ABS）時，適當提高熱床溫度可以降低翹曲的機率。" +#~ msgid "Tab" +#~ msgstr "分頁" + +#~ msgid "Displays current viewport FPS in the top-right corner." +#~ msgstr "在右上角顯示目前視埠的 FPS。" + +# AI Translated +#~ msgid "Publish 3MF Wiki" +#~ msgstr "發布 3MF Wiki" + +# AI Translated +#~ msgid "Publish 3MF Video Guide" +#~ msgstr "發布 3MF 影片指南" + +#~ msgid "Toolbar" +#~ msgstr "工具欄" + +#~ msgid "Switch table page" +#~ msgstr "切換表單頁面" + +#~ msgid "Global shortcuts" +#~ msgstr "全域快速鍵" + +#~ msgid "Middle mouse button" +#~ msgstr "滑鼠中鍵" + +#~ msgid "Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project." +#~ msgstr "自動旋轉選取的物件或所有物件的方向。當有物件被選取時，僅自動旋轉選取的物件。無選取的物件時，會自動旋轉專案中的所有物件。" + +#~ msgid "Auto orients all objects on the active plate." +#~ msgstr "自動旋轉目前板上所有物件的方向" + +#~ msgid "Any arrow" +#~ msgstr "任意方向鍵" + +#~ msgid "Gizmo SLA support points" +#~ msgstr "SLA 支撐點" + +#~ msgid "Plater" +#~ msgstr "準備" + +#~ msgid "Gizmo" +#~ msgstr "浮雕" + +#~ msgid "Delete objects, parts, modifiers" +#~ msgstr "刪除物件、零件、修改器" + +#~ msgid "Objects List" +#~ msgstr "物件清單" + +#~ msgid "G-code written at the very top of the output file, before any other content. Useful for adding metadata that printer firmware reads from the first lines of the file (e.g. estimated print time, filament usage). Supports placeholders like {print_time_sec} and {used_filament_length}." +#~ msgstr "G-code 寫在輸出檔案的最頂部，位於任何其他內容之前。對於新增列印裝置韌體從檔案第一行讀取的中繼資料（例如估計列印時間、線材使用情況）很有用。支援 {print_time_sec} 和 {used_filament_length} 等預留位置。" + +#~ msgid "Print time (seconds)" +#~ msgstr "列印時間（秒）" + # AI Translated #~ msgid "Open actions speed dial" #~ msgstr "開啟操作快捷選單" diff --git a/resources/profiles/Anker/machine/fdm_marlin_common.json b/resources/profiles/Anker/machine/fdm_marlin_common.json index 4db7d1aef0..23dd8ea7c5 100644 --- a/resources/profiles/Anker/machine/fdm_marlin_common.json +++ b/resources/profiles/Anker/machine/fdm_marlin_common.json @@ -6,6 +6,7 @@ "instantiation": "false", "gcode_flavor": "marlin2", "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\nG92 E0.0\n;[layer_z]\n\n", + "file_start_gcode": ";TIME:{print_time_sec}s", "machine_start_gcode": "M4899 T3 ; Enable v3 jerk and S-curve acceleration \nM104 S150 ; Set hotend temp to 150 degrees to prevent ooze\nM190 S{first_layer_bed_temperature[0]} ; set and wait for bed temp to stabilize\nM109 S{first_layer_temperature[0]} ; set final nozzle temp to stabilize\nG28 ;Home\n;LAYER_COUNT:{total_layer_count}", "machine_end_gcode": "M104 S0\nM140 S0\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM18", "change_filament_gcode": "M600", diff --git a/resources/profiles/Anycubic.json b/resources/profiles/Anycubic.json index 85dce20a81..bb0eedbd91 100644 --- a/resources/profiles/Anycubic.json +++ b/resources/profiles/Anycubic.json @@ -1,6 +1,6 @@ { "name": "Anycubic", - "version": "02.04.00.05", + "version": "02.04.00.07", "force_update": "0", "description": "Anycubic configurations", "machine_model_list": [ @@ -48,6 +48,10 @@ "name": "Anycubic Kobra 3 Max", "sub_path": "machine/Anycubic Kobra 3 Max.json" }, + { + "name": "Anycubic Kobra 3 V2", + "sub_path": "machine/Anycubic Kobra 3 V2.json" + }, { "name": "Anycubic Kobra Max", "sub_path": "machine/Anycubic Kobra Max.json" @@ -102,6 +106,10 @@ "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 3 V2 0.4 nozzle", + "sub_path": "process/0.08mm Standard @Anycubic Kobra 3 V2 0.4 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" @@ -118,6 +126,10 @@ "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.10mm Standard @Anycubic Kobra 3 V2 0.2 nozzle", + "sub_path": "process/0.10mm Standard @Anycubic Kobra 3 V2 0.2 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" @@ -142,6 +154,10 @@ "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 3 V2 0.4 nozzle", + "sub_path": "process/0.12mm Standard @Anycubic Kobra 3 V2 0.4 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" @@ -214,6 +230,10 @@ "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 3 V2 0.4 nozzle", + "sub_path": "process/0.16mm Standard @Anycubic Kobra 3 V2 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" @@ -286,6 +306,10 @@ "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 3 V2 0.4 nozzle", + "sub_path": "process/0.20mm Standard @Anycubic Kobra 3 V2 0.4 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" @@ -342,6 +366,10 @@ "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 3 V2 0.4 nozzle", + "sub_path": "process/0.24mm Standard @Anycubic Kobra 3 V2 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" @@ -370,6 +398,10 @@ "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 3 V2 0.4 nozzle", + "sub_path": "process/0.28mm Standard @Anycubic Kobra 3 V2 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" @@ -426,6 +458,10 @@ "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.30mm Standard @Anycubic Kobra 3 V2 0.6 nozzle", + "sub_path": "process/0.30mm Standard @Anycubic Kobra 3 V2 0.6 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" @@ -454,6 +490,10 @@ "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.40mm Standard @Anycubic Kobra 3 V2 0.8 nozzle", + "sub_path": "process/0.40mm Standard @Anycubic Kobra 3 V2 0.8 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" @@ -477,6 +517,34 @@ { "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" + }, + { + "name": "0.12mm High Quality @Anycubic Kobra 3 V2 0.4 nozzle", + "sub_path": "process/0.12mm High Quality @Anycubic Kobra 3 V2 0.4 nozzle.json" + }, + { + "name": "0.16mm High Quality @Anycubic Kobra 3 V2 0.4 nozzle", + "sub_path": "process/0.16mm High Quality @Anycubic Kobra 3 V2 0.4 nozzle.json" + }, + { + "name": "0.20mm High Quality @Anycubic Kobra 3 V2 0.4 nozzle", + "sub_path": "process/0.20mm High Quality @Anycubic Kobra 3 V2 0.4 nozzle.json" + }, + { + "name": "0.24mm Standard @Anycubic Kobra 3 V2 0.6 nozzle", + "sub_path": "process/0.24mm Standard @Anycubic Kobra 3 V2 0.6 nozzle.json" + }, + { + "name": "0.36mm Standard @Anycubic Kobra 3 V2 0.6 nozzle", + "sub_path": "process/0.36mm Standard @Anycubic Kobra 3 V2 0.6 nozzle.json" + }, + { + "name": "0.32mm Standard @Anycubic Kobra 3 V2 0.8 nozzle", + "sub_path": "process/0.32mm Standard @Anycubic Kobra 3 V2 0.8 nozzle.json" + }, + { + "name": "0.48mm Standard @Anycubic Kobra 3 V2 0.8 nozzle", + "sub_path": "process/0.48mm Standard @Anycubic Kobra 3 V2 0.8 nozzle.json" } ], "filament_list": [ @@ -528,6 +596,10 @@ "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 3 V2 0.4 nozzle", + "sub_path": "filament/Anycubic ABS @Anycubic Kobra 3 V2 0.4 nozzle.json" + }, { "name": "Anycubic ABS @Anycubic Kobra S1 0.4 nozzle", "sub_path": "filament/Anycubic ABS @Anycubic Kobra S1 0.4 nozzle.json" @@ -564,6 +636,10 @@ "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 3 V2 0.4 nozzle", + "sub_path": "filament/Anycubic ASA @Anycubic Kobra 3 V2 0.4 nozzle.json" + }, { "name": "Anycubic ASA @Anycubic Kobra S1 0.4 nozzle", "sub_path": "filament/Anycubic ASA @Anycubic Kobra S1 0.4 nozzle.json" @@ -704,6 +780,10 @@ "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 3 V2 0.4 nozzle", + "sub_path": "filament/Anycubic PETG @Anycubic Kobra 3 V2 0.4 nozzle.json" + }, { "name": "Anycubic PETG @Anycubic Kobra S1 0.4 nozzle", "sub_path": "filament/Anycubic PETG @Anycubic Kobra S1 0.4 nozzle.json" @@ -768,6 +848,22 @@ "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 3 V2 0.2 nozzle", + "sub_path": "filament/Anycubic PLA @Anycubic Kobra 3 V2 0.2 nozzle.json" + }, + { + "name": "Anycubic PLA @Anycubic Kobra 3 V2 0.4 nozzle", + "sub_path": "filament/Anycubic PLA @Anycubic Kobra 3 V2 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA @Anycubic Kobra 3 V2 0.6 nozzle", + "sub_path": "filament/Anycubic PLA @Anycubic Kobra 3 V2 0.6 nozzle.json" + }, + { + "name": "Anycubic PLA @Anycubic Kobra 3 V2 0.8 nozzle", + "sub_path": "filament/Anycubic PLA @Anycubic Kobra 3 V2 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" @@ -792,6 +888,22 @@ "name": "Anycubic PLA @Anycubic Kobra X 0.4 nozzle", "sub_path": "filament/Anycubic PLA @Anycubic Kobra X 0.4 nozzle.json" }, + { + "name": "Anycubic PLA Galaxy @Anycubic Kobra 3 V2 0.4 nozzle", + "sub_path": "filament/Anycubic PLA Galaxy @Anycubic Kobra 3 V2 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA Galaxy @Anycubic Kobra 3 V2 0.6 nozzle", + "sub_path": "filament/Anycubic PLA Galaxy @Anycubic Kobra 3 V2 0.6 nozzle.json" + }, + { + "name": "Anycubic PLA Galaxy @Anycubic Kobra 3 V2 0.8 nozzle", + "sub_path": "filament/Anycubic PLA Galaxy @Anycubic Kobra 3 V2 0.8 nozzle.json" + }, + { + "name": "Anycubic PLA Glow @Anycubic Kobra 3 V2 0.4 nozzle", + "sub_path": "filament/Anycubic PLA Glow @Anycubic Kobra 3 V2 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" @@ -800,6 +912,10 @@ "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 3 V2 0.4 nozzle", + "sub_path": "filament/Anycubic PLA High Speed @Anycubic Kobra 3 V2 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" @@ -824,10 +940,26 @@ "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 Marble @Anycubic Kobra 3 V2 0.4 nozzle", + "sub_path": "filament/Anycubic PLA Marble @Anycubic Kobra 3 V2 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA Marble @Anycubic Kobra 3 V2 0.6 nozzle", + "sub_path": "filament/Anycubic PLA Marble @Anycubic Kobra 3 V2 0.6 nozzle.json" + }, + { + "name": "Anycubic PLA Marble @Anycubic Kobra 3 V2 0.8 nozzle", + "sub_path": "filament/Anycubic PLA Marble @Anycubic Kobra 3 V2 0.8 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 3 V2 0.4 nozzle", + "sub_path": "filament/Anycubic PLA Matte @Anycubic Kobra 3 V2 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" @@ -844,10 +976,30 @@ "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 Metal @Anycubic Kobra 3 V2 0.4 nozzle", + "sub_path": "filament/Anycubic PLA Metal @Anycubic Kobra 3 V2 0.4 nozzle.json" + }, + { + "name": "Anycubic PLA Metal @Anycubic Kobra 3 V2 0.6 nozzle", + "sub_path": "filament/Anycubic PLA Metal @Anycubic Kobra 3 V2 0.6 nozzle.json" + }, + { + "name": "Anycubic PLA Metal @Anycubic Kobra 3 V2 0.8 nozzle", + "sub_path": "filament/Anycubic PLA Metal @Anycubic Kobra 3 V2 0.8 nozzle.json" + }, + { + "name": "Anycubic PLA SE @Anycubic Kobra 3 V2 0.4 nozzle", + "sub_path": "filament/Anycubic PLA SE @Anycubic Kobra 3 V2 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 3 V2 0.4 nozzle", + "sub_path": "filament/Anycubic PLA Silk @Anycubic Kobra 3 V2 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" @@ -868,6 +1020,10 @@ "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 Translucent @Anycubic Kobra 3 V2 0.4 nozzle", + "sub_path": "filament/Anycubic PLA Translucent @Anycubic Kobra 3 V2 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" @@ -980,6 +1136,10 @@ "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 3 V2 0.4 nozzle", + "sub_path": "filament/Anycubic TPU @Anycubic Kobra 3 V2 0.4 nozzle.json" + }, { "name": "Anycubic TPU @Anycubic Kobra S1 0.4 nozzle", "sub_path": "filament/Anycubic TPU @Anycubic Kobra S1 0.4 nozzle.json" @@ -1016,6 +1176,22 @@ "name": "Anycubic PETG @Anycubic Kobra 3 0.4 nozzle", "sub_path": "filament/Anycubic PETG @Anycubic Kobra 3 0.4 nozzle.json" }, + { + "name": "Anycubic PETG @Anycubic Kobra 3 V2 0.6 nozzle", + "sub_path": "filament/Anycubic PETG @Anycubic Kobra 3 V2 0.6 nozzle.json" + }, + { + "name": "Anycubic PLA Silk @Anycubic Kobra 3 V2 0.6 nozzle", + "sub_path": "filament/Anycubic PLA Silk @Anycubic Kobra 3 V2 0.6 nozzle.json" + }, + { + "name": "Anycubic PETG @Anycubic Kobra 3 V2 0.8 nozzle", + "sub_path": "filament/Anycubic PETG @Anycubic Kobra 3 V2 0.8 nozzle.json" + }, + { + "name": "Anycubic PLA Silk @Anycubic Kobra 3 V2 0.8 nozzle", + "sub_path": "filament/Anycubic PLA Silk @Anycubic Kobra 3 V2 0.8 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" @@ -1174,6 +1350,22 @@ "name": "Anycubic Kobra 3 Max 0.8 nozzle", "sub_path": "machine/Anycubic Kobra 3 Max 0.8 nozzle.json" }, + { + "name": "Anycubic Kobra 3 V2 0.2 nozzle", + "sub_path": "machine/Anycubic Kobra 3 V2 0.2 nozzle.json" + }, + { + "name": "Anycubic Kobra 3 V2 0.4 nozzle", + "sub_path": "machine/Anycubic Kobra 3 V2 0.4 nozzle.json" + }, + { + "name": "Anycubic Kobra 3 V2 0.6 nozzle", + "sub_path": "machine/Anycubic Kobra 3 V2 0.6 nozzle.json" + }, + { + "name": "Anycubic Kobra 3 V2 0.8 nozzle", + "sub_path": "machine/Anycubic Kobra 3 V2 0.8 nozzle.json" + }, { "name": "Anycubic Kobra Max 0.4 nozzle", "sub_path": "machine/Anycubic Kobra Max 0.4 nozzle.json" diff --git a/resources/profiles/Anycubic/Anycubic Kobra 3 Max_buildplate_model.stl b/resources/profiles/Anycubic/Anycubic Kobra 3 Max_buildplate_model.stl index 3360c21b00..3fd5c5a4d8 100644 Binary files a/resources/profiles/Anycubic/Anycubic Kobra 3 Max_buildplate_model.stl and b/resources/profiles/Anycubic/Anycubic Kobra 3 Max_buildplate_model.stl differ diff --git a/resources/profiles/Anycubic/Anycubic Kobra 3 Max_cover.png b/resources/profiles/Anycubic/Anycubic Kobra 3 Max_cover.png index 91fc0d2b51..b2d2f30993 100644 Binary files a/resources/profiles/Anycubic/Anycubic Kobra 3 Max_cover.png and b/resources/profiles/Anycubic/Anycubic Kobra 3 Max_cover.png differ diff --git a/resources/profiles/Anycubic/Anycubic Kobra 3 V2_buildplate_model.stl b/resources/profiles/Anycubic/Anycubic Kobra 3 V2_buildplate_model.stl new file mode 100644 index 0000000000..12b2e0b5cc Binary files /dev/null and b/resources/profiles/Anycubic/Anycubic Kobra 3 V2_buildplate_model.stl differ diff --git a/resources/profiles/Anycubic/Anycubic Kobra 3 V2_buildplate_texture.svg b/resources/profiles/Anycubic/Anycubic Kobra 3 V2_buildplate_texture.svg new file mode 100644 index 0000000000..906abf59da --- /dev/null +++ b/resources/profiles/Anycubic/Anycubic Kobra 3 V2_buildplate_texture.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/profiles/Anycubic/Anycubic Kobra 3 V2_cover.png b/resources/profiles/Anycubic/Anycubic Kobra 3 V2_cover.png new file mode 100644 index 0000000000..a1700488ca Binary files /dev/null and b/resources/profiles/Anycubic/Anycubic Kobra 3 V2_cover.png differ diff --git a/resources/profiles/Anycubic/Anycubic Kobra S1 Max_cover.png b/resources/profiles/Anycubic/Anycubic Kobra S1 Max_cover.png index 9a6079ae9b..3b391c89cc 100644 Binary files a/resources/profiles/Anycubic/Anycubic Kobra S1 Max_cover.png and b/resources/profiles/Anycubic/Anycubic Kobra S1 Max_cover.png differ diff --git a/resources/profiles/Anycubic/Anycubic Kobra X_cover.png b/resources/profiles/Anycubic/Anycubic Kobra X_cover.png index 112d7c4015..1adfef896a 100644 Binary files a/resources/profiles/Anycubic/Anycubic Kobra X_cover.png and b/resources/profiles/Anycubic/Anycubic Kobra X_cover.png differ diff --git a/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra 3 V2 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra 3 V2 0.4 nozzle.json new file mode 100644 index 0000000000..0c138787fb --- /dev/null +++ b/resources/profiles/Anycubic/filament/Anycubic ABS @Anycubic Kobra 3 V2 0.4 nozzle.json @@ -0,0 +1,255 @@ +{ + "type": "filament", + "name": "Anycubic ABS @Anycubic Kobra 3 V2 0.4 nozzle", + "inherits": "fdm_filament_abs", + "from": "system", + "setting_id": "LXkKhWH9YcYPr3IT", + "filament_id": "OF223rZv", + "instantiation": "true", + "filament_vendor": [ + "Anycubic" + ], + "filament_settings_id": [ + "Anycubic ABS @Anycubic Kobra 3 V2 0.4 nozzle" + ], + "filament_type": [ + "ABS" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "5" + ], + "nozzle_temperature": [ + "250" + ], + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.4 nozzle" + ], + "activate_air_filtration": [ + "0" + ], + "activate_chamber_temp_control": [ + "0" + ], + "additional_cooling_fan_speed": [ + "0" + ], + "bed_type": [ + "High Temp Plate" + ], + "chamber_temperature": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "5" + ], + "compatible_printers_condition": "", + "compatible_prints": [], + "compatible_prints_condition": "", + "complete_print_exhaust_fan_speed": [ + "80" + ], + "cool_plate_temp": [ + "35" + ], + "cool_plate_temp_initial_layer": [ + "35" + ], + "default_filament_colour": [ + "" + ], + "during_print_exhaust_fan_speed": [ + "60" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "enable_pressure_advance": [ + "0" + ], + "eng_plate_temp": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "fan_cooling_layer_time": [ + "20" + ], + "fan_max_speed": [ + "15" + ], + "fan_min_speed": [ + "1" + ], + "filament_cooling_final_speed": [ + "0" + ], + "filament_cooling_initial_speed": [ + "0" + ], + "filament_cooling_moves": [ + "0" + ], + "filament_cost": [ + "0" + ], + "filament_density": [ + "1.05" + ], + "filament_deretraction_speed": [ + "80" + ], + "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": [ + "70%" + ], + "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": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "nil" + ], + "filament_retraction_length": [ + "2" + ], + "filament_retraction_minimum_travel": [ + "1" + ], + "filament_retraction_speed": [ + "80" + ], + "filament_shrink": [ + "100%" + ], + "filament_soluble": [ + "0" + ], + "filament_start_gcode": [ + "; filament start gcode" + ], + "filament_toolchange_delay": [ + "0" + ], + "filament_unloading_speed": [ + "0" + ], + "filament_unloading_speed_start": [ + "0" + ], + "filament_wipe": [ + "1" + ], + "filament_wipe_distance": [ + "nil" + ], + "filament_z_hop": [ + "nil" + ], + "filament_z_hop_types": [ + "nil" + ], + "full_fan_speed_layer": [ + "100" + ], + "hot_plate_temp": [ + "90" + ], + "hot_plate_temp_initial_layer": [ + "90" + ], + "nozzle_temperature_initial_layer": [ + "250" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "overhang_fan_speed": [ + "15" + ], + "overhang_fan_threshold": [ + "50%" + ], + "pressure_advance": [ + "0.05" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "required_nozzle_HRC": [ + "0" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "16" + ], + "slow_down_min_speed": [ + "25" + ], + "support_material_interface_fan_speed": [ + "-1" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "90" + ], + "textured_plate_temp_initial_layer": [ + "90" + ] +} diff --git a/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra 3 V2 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra 3 V2 0.4 nozzle.json new file mode 100644 index 0000000000..5d0fa038b1 --- /dev/null +++ b/resources/profiles/Anycubic/filament/Anycubic ASA @Anycubic Kobra 3 V2 0.4 nozzle.json @@ -0,0 +1,255 @@ +{ + "type": "filament", + "name": "Anycubic ASA @Anycubic Kobra 3 V2 0.4 nozzle", + "inherits": "fdm_filament_asa", + "from": "system", + "setting_id": "cWBQa7XzDl3czIOs", + "filament_id": "OF0yFLkY", + "instantiation": "true", + "filament_vendor": [ + "Anycubic" + ], + "filament_settings_id": [ + "Anycubic ASA @Anycubic Kobra 3 V2 0.4 nozzle" + ], + "filament_type": [ + "ASA" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "nozzle_temperature": [ + "270" + ], + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.4 nozzle" + ], + "activate_air_filtration": [ + "0" + ], + "activate_chamber_temp_control": [ + "0" + ], + "additional_cooling_fan_speed": [ + "0" + ], + "bed_type": [ + "High Temp Plate" + ], + "chamber_temperature": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "5" + ], + "compatible_printers_condition": "", + "compatible_prints": [], + "compatible_prints_condition": "", + "complete_print_exhaust_fan_speed": [ + "80" + ], + "cool_plate_temp": [ + "35" + ], + "cool_plate_temp_initial_layer": [ + "35" + ], + "default_filament_colour": [ + "" + ], + "during_print_exhaust_fan_speed": [ + "60" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "enable_pressure_advance": [ + "0" + ], + "eng_plate_temp": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "fan_cooling_layer_time": [ + "20" + ], + "fan_max_speed": [ + "15" + ], + "fan_min_speed": [ + "1" + ], + "filament_cooling_final_speed": [ + "0" + ], + "filament_cooling_initial_speed": [ + "0" + ], + "filament_cooling_moves": [ + "0" + ], + "filament_cost": [ + "30" + ], + "filament_density": [ + "1.04" + ], + "filament_deretraction_speed": [ + "80" + ], + "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": [ + "70%" + ], + "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": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "nil" + ], + "filament_retraction_length": [ + "2" + ], + "filament_retraction_minimum_travel": [ + "1" + ], + "filament_retraction_speed": [ + "80" + ], + "filament_shrink": [ + "100%" + ], + "filament_soluble": [ + "0" + ], + "filament_start_gcode": [ + "; filament start gcode" + ], + "filament_toolchange_delay": [ + "0" + ], + "filament_unloading_speed": [ + "0" + ], + "filament_unloading_speed_start": [ + "0" + ], + "filament_wipe": [ + "1" + ], + "filament_wipe_distance": [ + "nil" + ], + "filament_z_hop": [ + "nil" + ], + "filament_z_hop_types": [ + "nil" + ], + "full_fan_speed_layer": [ + "100" + ], + "hot_plate_temp": [ + "100" + ], + "hot_plate_temp_initial_layer": [ + "100" + ], + "nozzle_temperature_initial_layer": [ + "270" + ], + "nozzle_temperature_range_high": [ + "280" + ], + "nozzle_temperature_range_low": [ + "240" + ], + "overhang_fan_speed": [ + "15" + ], + "overhang_fan_threshold": [ + "50%" + ], + "pressure_advance": [ + "0.05" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "required_nozzle_HRC": [ + "0" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "16" + ], + "slow_down_min_speed": [ + "20" + ], + "support_material_interface_fan_speed": [ + "-1" + ], + "temperature_vitrification": [ + "110" + ], + "textured_plate_temp": [ + "100" + ], + "textured_plate_temp_initial_layer": [ + "100" + ] +} diff --git a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 V2 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 V2 0.4 nozzle.json new file mode 100644 index 0000000000..90af3ce5d6 --- /dev/null +++ b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 V2 0.4 nozzle.json @@ -0,0 +1,255 @@ +{ + "type": "filament", + "name": "Anycubic PETG @Anycubic Kobra 3 V2 0.4 nozzle", + "inherits": "fdm_filament_pet", + "from": "system", + "setting_id": "suyxKj9qKLtpBhhU", + "filament_id": "OFo6n2pB", + "instantiation": "true", + "filament_vendor": [ + "Anycubic" + ], + "filament_settings_id": [ + "Anycubic PETG @Anycubic Kobra 3 V2 0.4 nozzle" + ], + "filament_type": [ + "PETG" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "nozzle_temperature": [ + "230" + ], + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.4 nozzle" + ], + "activate_air_filtration": [ + "0" + ], + "activate_chamber_temp_control": [ + "0" + ], + "additional_cooling_fan_speed": [ + "0" + ], + "bed_type": [ + "High Temp Plate" + ], + "chamber_temperature": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "5" + ], + "compatible_printers_condition": "", + "compatible_prints": [], + "compatible_prints_condition": "", + "complete_print_exhaust_fan_speed": [ + "80" + ], + "cool_plate_temp": [ + "35" + ], + "cool_plate_temp_initial_layer": [ + "35" + ], + "default_filament_colour": [ + "" + ], + "during_print_exhaust_fan_speed": [ + "60" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "enable_pressure_advance": [ + "0" + ], + "eng_plate_temp": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "fan_cooling_layer_time": [ + "20" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "15" + ], + "filament_cooling_final_speed": [ + "0" + ], + "filament_cooling_initial_speed": [ + "0" + ], + "filament_cooling_moves": [ + "0" + ], + "filament_cost": [ + "0" + ], + "filament_density": [ + "1.23" + ], + "filament_deretraction_speed": [ + "80" + ], + "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": [ + "80%" + ], + "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": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "nil" + ], + "filament_retraction_length": [ + "2" + ], + "filament_retraction_minimum_travel": [ + "1" + ], + "filament_retraction_speed": [ + "80" + ], + "filament_shrink": [ + "100%" + ], + "filament_soluble": [ + "0" + ], + "filament_start_gcode": [ + "; filament start gcode" + ], + "filament_toolchange_delay": [ + "0" + ], + "filament_unloading_speed": [ + "0" + ], + "filament_unloading_speed_start": [ + "0" + ], + "filament_wipe": [ + "1" + ], + "filament_wipe_distance": [ + "nil" + ], + "filament_z_hop": [ + "nil" + ], + "filament_z_hop_types": [ + "nil" + ], + "full_fan_speed_layer": [ + "6" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "nozzle_temperature_initial_layer": [ + "230" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "50%" + ], + "pressure_advance": [ + "0.05" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "required_nozzle_HRC": [ + "0" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "10" + ], + "slow_down_min_speed": [ + "25" + ], + "support_material_interface_fan_speed": [ + "-1" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ] +} diff --git a/resources/profiles/Sovol/filament/Sovol Zero PETG HS Nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 V2 0.6 nozzle.json similarity index 55% rename from resources/profiles/Sovol/filament/Sovol Zero PETG HS Nozzle.json rename to resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 V2 0.6 nozzle.json index ce68719ba9..a1986b5403 100644 --- a/resources/profiles/Sovol/filament/Sovol Zero PETG HS Nozzle.json +++ b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 V2 0.6 nozzle.json @@ -1,77 +1,69 @@ { "type": "filament", - "name": "Sovol Zero PETG HS Nozzle", - "inherits": "Generic PETG @System", + "name": "Anycubic PETG @Anycubic Kobra 3 V2 0.6 nozzle", + "inherits": "Anycubic PLA @Anycubic Kobra 3 V2 0.6 nozzle", "from": "system", - "setting_id": "AfxHmpdOkMDJa2fk", - "filament_id": "OFymnal9", + "setting_id": "0uOqeEk5YgyZH4Yy", + "filament_id": "OFo6n2pB", "instantiation": "true", + "filament_settings_id": [ + "Anycubic PETG @Anycubic Kobra 3 V2 0.6 nozzle" + ], + "filament_type": [ + "PETG" + ], + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.6 nozzle" + ], "filament_flow_ratio": [ - "0.98" + "0.96" ], - "enable_pressure_advance": "1", - "pressure_advance": "0.048", "filament_max_volumetric_speed": [ - "15" - ], - "nozzle_temperature_initial_layer": [ - "265" + "8" ], "nozzle_temperature": [ - "250" - ], - "nozzle_temperature_range_low": [ "230" ], - "nozzle_temperature_range_high": [ - "280" + "close_fan_the_first_x_layers": [ + "3" ], - "hot_plate_temp": [ - "85" - ], - "hot_plate_temp_initial_layer": [ - "85" + "fan_cooling_layer_time": [ + "30" ], "fan_min_speed": [ "10" ], - "fan_max_speed": [ - "40" - ], - "fan_cooling_layer_time": [ - "50" + "filament_density": [ + "1.23" ], "full_fan_speed_layer": [ - "3" + "0" ], - "slow_down_layer_time": [ - "10" + "hot_plate_temp": [ + "75" ], - "slow_down_min_speed": [ - "10" + "hot_plate_temp_initial_layer": [ + "75" + ], + "nozzle_temperature_initial_layer": [ + "230" + ], + "nozzle_temperature_range_high": [ + "260" + ], + "nozzle_temperature_range_low": [ + "210" ], "overhang_fan_speed": [ - "70" + "80" ], "overhang_fan_threshold": [ "10%" ], + "slow_down_layer_time": [ + "10" + ], "temperature_vitrification": [ - "60" - ], - "close_fan_the_first_x_layers": [ - "1" - ], - "filament_retraction_length": [ - "0.5" - ], - "filament_z_hop": [ - "0.4" - ], - "activate_air_filtration": "1", - "during_print_exhaust_fan_speed": "50", - "complete_print_exhaust_fan_speed": "50", - "compatible_printers": [ - "Sovol Zero 0.4 nozzle" + "70" ] } diff --git a/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 V2 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 V2 0.8 nozzle.json new file mode 100644 index 0000000000..3d0a4b9bd5 --- /dev/null +++ b/resources/profiles/Anycubic/filament/Anycubic PETG @Anycubic Kobra 3 V2 0.8 nozzle.json @@ -0,0 +1,42 @@ +{ + "type": "filament", + "name": "Anycubic PETG @Anycubic Kobra 3 V2 0.8 nozzle", + "inherits": "Anycubic PLA @Anycubic Kobra 3 V2 0.8 nozzle", + "from": "system", + "setting_id": "OOOjWFMFhP1fMhFf", + "filament_id": "OFo6n2pB", + "instantiation": "true", + "filament_settings_id": [ + "Anycubic PETG @Anycubic Kobra 3 V2 0.8 nozzle" + ], + "filament_vendor": [ + "Anycubic" + ], + "filament_type": [ + "PETG" + ], + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.8 nozzle" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "nozzle_temperature": [ + "220" + ], + "filament_retraction_length": [ + "0.8" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "nozzle_temperature_initial_layer": [ + "220" + ] +} diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 V2 0.2 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 V2 0.2 nozzle.json new file mode 100644 index 0000000000..5b61836862 --- /dev/null +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 V2 0.2 nozzle.json @@ -0,0 +1,255 @@ +{ + "type": "filament", + "name": "Anycubic PLA @Anycubic Kobra 3 V2 0.2 nozzle", + "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "uJRZr6orTVm79FeE", + "filament_id": "OFmjN2bc", + "instantiation": "true", + "filament_vendor": [ + "Anycubic" + ], + "filament_settings_id": [ + "Anycubic PLA @Anycubic Kobra 3 V2 0.2 nozzle" + ], + "filament_type": [ + "PLA" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "1.6" + ], + "nozzle_temperature": [ + "230" + ], + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.2 nozzle" + ], + "activate_air_filtration": [ + "0" + ], + "activate_chamber_temp_control": [ + "0" + ], + "additional_cooling_fan_speed": [ + "0" + ], + "bed_type": [ + "High Temp Plate" + ], + "chamber_temperature": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "compatible_printers_condition": "", + "compatible_prints": [], + "compatible_prints_condition": "", + "complete_print_exhaust_fan_speed": [ + "80" + ], + "cool_plate_temp": [ + "35" + ], + "cool_plate_temp_initial_layer": [ + "35" + ], + "default_filament_colour": [ + "" + ], + "during_print_exhaust_fan_speed": [ + "60" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "enable_pressure_advance": [ + "0" + ], + "eng_plate_temp": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "fan_cooling_layer_time": [ + "100" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "80" + ], + "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_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_soluble": [ + "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": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature_initial_layer": [ + "230" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "pressure_advance": [ + "0.05" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "required_nozzle_HRC": [ + "0" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_min_speed": [ + "20" + ], + "support_material_interface_fan_speed": [ + "-1" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 V2 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 V2 0.4 nozzle.json new file mode 100644 index 0000000000..7410bbfeba --- /dev/null +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 V2 0.4 nozzle.json @@ -0,0 +1,255 @@ +{ + "type": "filament", + "name": "Anycubic PLA @Anycubic Kobra 3 V2 0.4 nozzle", + "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "udLvkeYZ9Av7GkDz", + "filament_id": "OFmjN2bc", + "instantiation": "true", + "filament_vendor": [ + "Anycubic" + ], + "filament_settings_id": [ + "Anycubic PLA @Anycubic Kobra 3 V2 0.4 nozzle" + ], + "filament_type": [ + "PLA" + ], + "filament_flow_ratio": [ + "0.96" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "nozzle_temperature": [ + "210" + ], + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.4 nozzle" + ], + "activate_air_filtration": [ + "0" + ], + "activate_chamber_temp_control": [ + "0" + ], + "additional_cooling_fan_speed": [ + "0" + ], + "bed_type": [ + "High Temp Plate" + ], + "chamber_temperature": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "compatible_printers_condition": "", + "compatible_prints": [], + "compatible_prints_condition": "", + "complete_print_exhaust_fan_speed": [ + "80" + ], + "cool_plate_temp": [ + "35" + ], + "cool_plate_temp_initial_layer": [ + "35" + ], + "default_filament_colour": [ + "" + ], + "during_print_exhaust_fan_speed": [ + "60" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "enable_pressure_advance": [ + "0" + ], + "eng_plate_temp": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "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_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_soluble": [ + "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": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "pressure_advance": [ + "0.05" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "required_nozzle_HRC": [ + "0" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_min_speed": [ + "20" + ], + "support_material_interface_fan_speed": [ + "-1" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 V2 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 V2 0.6 nozzle.json new file mode 100644 index 0000000000..0d66e734c8 --- /dev/null +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 V2 0.6 nozzle.json @@ -0,0 +1,255 @@ +{ + "type": "filament", + "name": "Anycubic PLA @Anycubic Kobra 3 V2 0.6 nozzle", + "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "W69H1Vca3f74FfYj", + "filament_id": "OFmjN2bc", + "instantiation": "true", + "filament_settings_id": [ + "Anycubic PLA @Anycubic Kobra 3 V2 0.6 nozzle" + ], + "filament_vendor": [ + "Anycubic" + ], + "filament_type": [ + "PLA" + ], + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.6 nozzle" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "nozzle_temperature": [ + "220" + ], + "activate_air_filtration": [ + "0" + ], + "activate_chamber_temp_control": [ + "0" + ], + "additional_cooling_fan_speed": [ + "0" + ], + "bed_type": [ + "High Temp Plate" + ], + "chamber_temperature": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "compatible_printers_condition": "", + "compatible_prints": [], + "compatible_prints_condition": "", + "complete_print_exhaust_fan_speed": [ + "80" + ], + "cool_plate_temp": [ + "35" + ], + "cool_plate_temp_initial_layer": [ + "35" + ], + "default_filament_colour": [ + "" + ], + "during_print_exhaust_fan_speed": [ + "60" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "enable_pressure_advance": [ + "0" + ], + "eng_plate_temp": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "fan_cooling_layer_time": [ + "100" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "80" + ], + "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_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_soluble": [ + "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": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "pressure_advance": [ + "0.05" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "required_nozzle_HRC": [ + "0" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_min_speed": [ + "20" + ], + "support_material_interface_fan_speed": [ + "-1" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ] +} diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 V2 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 V2 0.8 nozzle.json new file mode 100644 index 0000000000..606dd8226e --- /dev/null +++ b/resources/profiles/Anycubic/filament/Anycubic PLA @Anycubic Kobra 3 V2 0.8 nozzle.json @@ -0,0 +1,255 @@ +{ + "type": "filament", + "name": "Anycubic PLA @Anycubic Kobra 3 V2 0.8 nozzle", + "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "TR27JCwXxHeVhVHN", + "filament_id": "OFmjN2bc", + "instantiation": "true", + "filament_settings_id": [ + "Anycubic PLA @Anycubic Kobra 3 V2 0.8 nozzle" + ], + "filament_vendor": [ + "Anycubic" + ], + "filament_type": [ + "PLA" + ], + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.8 nozzle" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "nozzle_temperature": [ + "205" + ], + "activate_air_filtration": [ + "0" + ], + "activate_chamber_temp_control": [ + "0" + ], + "additional_cooling_fan_speed": [ + "0" + ], + "bed_type": [ + "High Temp Plate" + ], + "chamber_temperature": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "compatible_printers_condition": "", + "compatible_prints": [], + "compatible_prints_condition": "", + "complete_print_exhaust_fan_speed": [ + "80" + ], + "cool_plate_temp": [ + "35" + ], + "cool_plate_temp_initial_layer": [ + "35" + ], + "default_filament_colour": [ + "" + ], + "during_print_exhaust_fan_speed": [ + "60" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "enable_pressure_advance": [ + "0" + ], + "eng_plate_temp": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "60" + ], + "fan_min_speed": [ + "80" + ], + "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_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": [ + "0.6" + ], + "filament_retraction_minimum_travel": [ + "nil" + ], + "filament_retraction_speed": [ + "60" + ], + "filament_shrink": [ + "100%" + ], + "filament_soluble": [ + "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": [ + "3" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature_initial_layer": [ + "215" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "pressure_advance": [ + "0.05" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "required_nozzle_HRC": [ + "0" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_min_speed": [ + "20" + ], + "support_material_interface_fan_speed": [ + "-1" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Galaxy @Anycubic Kobra 3 V2 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Galaxy @Anycubic Kobra 3 V2 0.4 nozzle.json new file mode 100644 index 0000000000..3dfec3c3bc --- /dev/null +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Galaxy @Anycubic Kobra 3 V2 0.4 nozzle.json @@ -0,0 +1,255 @@ +{ + "type": "filament", + "name": "Anycubic PLA Galaxy @Anycubic Kobra 3 V2 0.4 nozzle", + "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "i0FTxiH68CKHiLLT", + "filament_id": "OF80Qbpq", + "instantiation": "true", + "filament_settings_id": [ + "Anycubic PLA Galaxy @Anycubic Kobra 3 V2 0.4 nozzle" + ], + "filament_vendor": [ + "Anycubic" + ], + "filament_type": [ + "PLA" + ], + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.4 nozzle" + ], + "filament_flow_ratio": [ + "0.96" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "activate_air_filtration": [ + "0" + ], + "activate_chamber_temp_control": [ + "0" + ], + "additional_cooling_fan_speed": [ + "0" + ], + "bed_type": [ + "High Temp Plate" + ], + "chamber_temperature": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "compatible_printers_condition": "", + "compatible_prints": [], + "compatible_prints_condition": "", + "complete_print_exhaust_fan_speed": [ + "80" + ], + "cool_plate_temp": [ + "35" + ], + "cool_plate_temp_initial_layer": [ + "35" + ], + "default_filament_colour": [ + "" + ], + "during_print_exhaust_fan_speed": [ + "60" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "enable_pressure_advance": [ + "0" + ], + "eng_plate_temp": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "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_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_soluble": [ + "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": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature": [ + "210" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "pressure_advance": [ + "0.05" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "required_nozzle_HRC": [ + "0" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_min_speed": [ + "20" + ], + "support_material_interface_fan_speed": [ + "-1" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Galaxy @Anycubic Kobra 3 V2 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Galaxy @Anycubic Kobra 3 V2 0.6 nozzle.json new file mode 100644 index 0000000000..65679ac989 --- /dev/null +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Galaxy @Anycubic Kobra 3 V2 0.6 nozzle.json @@ -0,0 +1,258 @@ +{ + "type": "filament", + "name": "Anycubic PLA Galaxy @Anycubic Kobra 3 V2 0.6 nozzle", + "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "XHa1HSjh0RjAo0nz", + "filament_id": "OF80Qbpq", + "instantiation": "true", + "filament_settings_id": [ + "Anycubic PLA Galaxy @Anycubic Kobra 3 V2 0.6 nozzle" + ], + "filament_vendor": [ + "Anycubic" + ], + "filament_type": [ + "PLA" + ], + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.6 nozzle" + ], + "filament_flow_ratio": [ + "0.94" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "activate_air_filtration": [ + "0" + ], + "activate_chamber_temp_control": [ + "0" + ], + "additional_cooling_fan_speed": [ + "0" + ], + "bed_type": [ + "High Temp Plate" + ], + "chamber_temperature": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "compatible_printers_condition": "", + "compatible_prints": [], + "compatible_prints_condition": "", + "complete_print_exhaust_fan_speed": [ + "80" + ], + "cool_plate_temp": [ + "35" + ], + "cool_plate_temp_initial_layer": [ + "35" + ], + "default_filament_colour": [ + "" + ], + "during_print_exhaust_fan_speed": [ + "60" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "enable_pressure_advance": [ + "0" + ], + "eng_plate_temp": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "fan_cooling_layer_time": [ + "100" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "80" + ], + "filament_cooling_final_speed": [ + "0" + ], + "filament_cooling_initial_speed": [ + "0" + ], + "filament_cooling_moves": [ + "0" + ], + "filament_cost": [ + "20" + ], + "filament_density": [ + "1.24" + ], + "filament_deretraction_speed": [ + "40" + ], + "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": [ + "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": [ + "1.5" + ], + "filament_retraction_minimum_travel": [ + "nil" + ], + "filament_retraction_speed": [ + "40" + ], + "filament_shrink": [ + "100%" + ], + "filament_soluble": [ + "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": [ + "Slope Lift" + ], + "full_fan_speed_layer": [ + "0" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "nozzle_temperature": [ + "210" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "pressure_advance": [ + "0.05" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "required_nozzle_HRC": [ + "0" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_layer_time_BRASS": [ + "10" + ], + "slow_down_min_speed": [ + "20" + ], + "support_material_interface_fan_speed": [ + "-1" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ] +} diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Galaxy @Anycubic Kobra 3 V2 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Galaxy @Anycubic Kobra 3 V2 0.8 nozzle.json new file mode 100644 index 0000000000..08e21b72e0 --- /dev/null +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Galaxy @Anycubic Kobra 3 V2 0.8 nozzle.json @@ -0,0 +1,261 @@ +{ + "type": "filament", + "name": "Anycubic PLA Galaxy @Anycubic Kobra 3 V2 0.8 nozzle", + "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "iRVPFxNMEfkCDnMh", + "filament_id": "OF80Qbpq", + "instantiation": "true", + "filament_settings_id": [ + "Anycubic PLA Galaxy @Anycubic Kobra 3 V2 0.8 nozzle" + ], + "filament_vendor": [ + "Anycubic" + ], + "filament_type": [ + "PLA" + ], + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.8 nozzle" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "activate_air_filtration": [ + "0" + ], + "activate_chamber_temp_control": [ + "0" + ], + "additional_cooling_fan_speed": [ + "0" + ], + "bed_type": [ + "High Temp Plate" + ], + "chamber_temperature": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "compatible_printers_condition": "", + "compatible_prints": [], + "compatible_prints_condition": "", + "complete_print_exhaust_fan_speed": [ + "80" + ], + "cool_plate_temp": [ + "35" + ], + "cool_plate_temp_initial_layer": [ + "35" + ], + "default_filament_colour": [ + "" + ], + "during_print_exhaust_fan_speed": [ + "60" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "enable_pressure_advance": [ + "0" + ], + "eng_plate_temp": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "60" + ], + "fan_max_speed_BRASS": [ + "100" + ], + "fan_min_speed": [ + "80" + ], + "fan_min_speed_BRASS": [ + "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": [ + "40" + ], + "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": [ + "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": [ + "1.5" + ], + "filament_retraction_minimum_travel": [ + "nil" + ], + "filament_retraction_speed": [ + "40" + ], + "filament_shrink": [ + "100%" + ], + "filament_soluble": [ + "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": [ + "3" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature": [ + "205" + ], + "nozzle_temperature_initial_layer": [ + "215" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "pressure_advance": [ + "0.05" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "required_nozzle_HRC": [ + "0" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_min_speed": [ + "20" + ], + "support_material_interface_fan_speed": [ + "-1" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra 3 V2 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra 3 V2 0.4 nozzle.json new file mode 100644 index 0000000000..66cf8a05c9 --- /dev/null +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Glow @Anycubic Kobra 3 V2 0.4 nozzle.json @@ -0,0 +1,255 @@ +{ + "type": "filament", + "name": "Anycubic PLA Glow @Anycubic Kobra 3 V2 0.4 nozzle", + "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "itTckVFabfsVbNBK", + "filament_id": "OF5PtjTp", + "instantiation": "true", + "filament_vendor": [ + "Anycubic" + ], + "filament_settings_id": [ + "Anycubic PLA Glow @Anycubic Kobra 3 V2 0.4 nozzle" + ], + "filament_type": [ + "PLA" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "7.2" + ], + "nozzle_temperature": [ + "210" + ], + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.4 nozzle" + ], + "activate_air_filtration": [ + "0" + ], + "activate_chamber_temp_control": [ + "0" + ], + "additional_cooling_fan_speed": [ + "0" + ], + "bed_type": [ + "High Temp Plate" + ], + "chamber_temperature": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "compatible_printers_condition": "", + "compatible_prints": [], + "compatible_prints_condition": "", + "complete_print_exhaust_fan_speed": [ + "80" + ], + "cool_plate_temp": [ + "35" + ], + "cool_plate_temp_initial_layer": [ + "35" + ], + "default_filament_colour": [ + "" + ], + "during_print_exhaust_fan_speed": [ + "60" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "enable_pressure_advance": [ + "0" + ], + "eng_plate_temp": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "fan_cooling_layer_time": [ + "100" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "80" + ], + "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": [ + "40" + ], + "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": [ + "nil" + ], + "filament_retract_lift_below": [ + "nil" + ], + "filament_retract_lift_enforce": [ + "nil" + ], + "filament_retract_restart_extra": [ + "nil" + ], + "filament_retract_when_changing_layer": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "nil" + ], + "filament_retraction_length": [ + "0.8" + ], + "filament_retraction_minimum_travel": [ + "2" + ], + "filament_retraction_speed": [ + "60" + ], + "filament_shrink": [ + "100%" + ], + "filament_soluble": [ + "0" + ], + "filament_start_gcode": [ + "; filament start gcode" + ], + "filament_toolchange_delay": [ + "0" + ], + "filament_unloading_speed": [ + "0" + ], + "filament_unloading_speed_start": [ + "0" + ], + "filament_wipe": [ + "1" + ], + "filament_wipe_distance": [ + "2" + ], + "filament_z_hop": [ + "0.4" + ], + "filament_z_hop_types": [ + "Auto Lift" + ], + "full_fan_speed_layer": [ + "3" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "pressure_advance": [ + "0.05" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "required_nozzle_HRC": [ + "0" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "9" + ], + "slow_down_min_speed": [ + "20" + ], + "support_material_interface_fan_speed": [ + "-1" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra 3 V2 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra 3 V2 0.4 nozzle.json new file mode 100644 index 0000000000..2b60cad961 --- /dev/null +++ b/resources/profiles/Anycubic/filament/Anycubic PLA High Speed @Anycubic Kobra 3 V2 0.4 nozzle.json @@ -0,0 +1,255 @@ +{ + "type": "filament", + "name": "Anycubic PLA High Speed @Anycubic Kobra 3 V2 0.4 nozzle", + "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "YLxoiuRDXBWLQYw4", + "filament_id": "OFjVOWfJ", + "instantiation": "true", + "filament_vendor": [ + "Anycubic" + ], + "filament_settings_id": [ + "Anycubic PLA High Speed @Anycubic Kobra 3 V2 0.4 nozzle" + ], + "filament_type": [ + "PLA" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "18" + ], + "nozzle_temperature": [ + "205" + ], + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.4 nozzle" + ], + "activate_air_filtration": [ + "0" + ], + "activate_chamber_temp_control": [ + "0" + ], + "additional_cooling_fan_speed": [ + "0" + ], + "bed_type": [ + "High Temp Plate" + ], + "chamber_temperature": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "compatible_printers_condition": "", + "compatible_prints": [], + "compatible_prints_condition": "", + "complete_print_exhaust_fan_speed": [ + "80" + ], + "cool_plate_temp": [ + "35" + ], + "cool_plate_temp_initial_layer": [ + "35" + ], + "default_filament_colour": [ + "" + ], + "during_print_exhaust_fan_speed": [ + "60" + ], + "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_max_speed": [ + "100" + ], + "fan_min_speed": [ + "80" + ], + "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_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_soluble": [ + "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": [ + "2" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature_initial_layer": [ + "210" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "pressure_advance": [ + "0.035" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "required_nozzle_HRC": [ + "0" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "7" + ], + "slow_down_min_speed": [ + "20" + ], + "support_material_interface_fan_speed": [ + "-1" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Marble @Anycubic Kobra 3 V2 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Marble @Anycubic Kobra 3 V2 0.4 nozzle.json new file mode 100644 index 0000000000..3986f89867 --- /dev/null +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Marble @Anycubic Kobra 3 V2 0.4 nozzle.json @@ -0,0 +1,255 @@ +{ + "type": "filament", + "name": "Anycubic PLA Marble @Anycubic Kobra 3 V2 0.4 nozzle", + "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "JwcCfY4XVCRJaDeS", + "filament_id": "OFCSyK66", + "instantiation": "true", + "filament_settings_id": [ + "Anycubic PLA Marble @Anycubic Kobra 3 V2 0.4 nozzle" + ], + "filament_vendor": [ + "Anycubic" + ], + "filament_type": [ + "PLA" + ], + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.4 nozzle" + ], + "filament_flow_ratio": [ + "0.96" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "activate_air_filtration": [ + "0" + ], + "activate_chamber_temp_control": [ + "0" + ], + "additional_cooling_fan_speed": [ + "0" + ], + "bed_type": [ + "High Temp Plate" + ], + "chamber_temperature": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "compatible_printers_condition": "", + "compatible_prints": [], + "compatible_prints_condition": "", + "complete_print_exhaust_fan_speed": [ + "80" + ], + "cool_plate_temp": [ + "35" + ], + "cool_plate_temp_initial_layer": [ + "35" + ], + "default_filament_colour": [ + "" + ], + "during_print_exhaust_fan_speed": [ + "60" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "enable_pressure_advance": [ + "0" + ], + "eng_plate_temp": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "80" + ], + "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_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": [ + "1.2" + ], + "filament_retraction_minimum_travel": [ + "nil" + ], + "filament_retraction_speed": [ + "nil" + ], + "filament_shrink": [ + "100%" + ], + "filament_soluble": [ + "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": [ + "Slope Lift" + ], + "full_fan_speed_layer": [ + "0" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature": [ + "210" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "pressure_advance": [ + "0.05" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "required_nozzle_HRC": [ + "0" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_min_speed": [ + "20" + ], + "support_material_interface_fan_speed": [ + "-1" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Marble @Anycubic Kobra 3 V2 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Marble @Anycubic Kobra 3 V2 0.6 nozzle.json new file mode 100644 index 0000000000..785c0dfd4d --- /dev/null +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Marble @Anycubic Kobra 3 V2 0.6 nozzle.json @@ -0,0 +1,255 @@ +{ + "type": "filament", + "name": "Anycubic PLA Marble @Anycubic Kobra 3 V2 0.6 nozzle", + "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "Sjw7irNgwCZMfWS3", + "filament_id": "OFCSyK66", + "instantiation": "true", + "filament_settings_id": [ + "Anycubic PLA Marble @Anycubic Kobra 3 V2 0.6 nozzle" + ], + "filament_vendor": [ + "Anycubic" + ], + "filament_type": [ + "PLA" + ], + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.6 nozzle" + ], + "filament_flow_ratio": [ + "0.94" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "activate_air_filtration": [ + "0" + ], + "activate_chamber_temp_control": [ + "0" + ], + "additional_cooling_fan_speed": [ + "0" + ], + "bed_type": [ + "High Temp Plate" + ], + "chamber_temperature": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "compatible_printers_condition": "", + "compatible_prints": [], + "compatible_prints_condition": "", + "complete_print_exhaust_fan_speed": [ + "80" + ], + "cool_plate_temp": [ + "35" + ], + "cool_plate_temp_initial_layer": [ + "35" + ], + "default_filament_colour": [ + "" + ], + "during_print_exhaust_fan_speed": [ + "60" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "enable_pressure_advance": [ + "0" + ], + "eng_plate_temp": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "fan_cooling_layer_time": [ + "100" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "80" + ], + "filament_cooling_final_speed": [ + "0" + ], + "filament_cooling_initial_speed": [ + "0" + ], + "filament_cooling_moves": [ + "0" + ], + "filament_cost": [ + "20" + ], + "filament_density": [ + "1.24" + ], + "filament_deretraction_speed": [ + "50" + ], + "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": [ + "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": [ + "1.2" + ], + "filament_retraction_minimum_travel": [ + "nil" + ], + "filament_retraction_speed": [ + "40" + ], + "filament_shrink": [ + "100%" + ], + "filament_soluble": [ + "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": [ + "Slope Lift" + ], + "full_fan_speed_layer": [ + "0" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "nozzle_temperature": [ + "210" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "pressure_advance": [ + "0.05" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "required_nozzle_HRC": [ + "0" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_min_speed": [ + "20" + ], + "support_material_interface_fan_speed": [ + "-1" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ] +} diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Marble @Anycubic Kobra 3 V2 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Marble @Anycubic Kobra 3 V2 0.8 nozzle.json new file mode 100644 index 0000000000..58d6fe6a48 --- /dev/null +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Marble @Anycubic Kobra 3 V2 0.8 nozzle.json @@ -0,0 +1,255 @@ +{ + "type": "filament", + "name": "Anycubic PLA Marble @Anycubic Kobra 3 V2 0.8 nozzle", + "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "HeQwxU4T2W1V0LM3", + "filament_id": "OFCSyK66", + "instantiation": "true", + "filament_settings_id": [ + "Anycubic PLA Marble @Anycubic Kobra 3 V2 0.8 nozzle" + ], + "filament_vendor": [ + "Anycubic" + ], + "filament_type": [ + "PLA" + ], + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.8 nozzle" + ], + "filament_flow_ratio": [ + "0.96" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "activate_air_filtration": [ + "0" + ], + "activate_chamber_temp_control": [ + "0" + ], + "additional_cooling_fan_speed": [ + "0" + ], + "bed_type": [ + "High Temp Plate" + ], + "chamber_temperature": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "compatible_printers_condition": "", + "compatible_prints": [], + "compatible_prints_condition": "", + "complete_print_exhaust_fan_speed": [ + "80" + ], + "cool_plate_temp": [ + "35" + ], + "cool_plate_temp_initial_layer": [ + "35" + ], + "default_filament_colour": [ + "" + ], + "during_print_exhaust_fan_speed": [ + "60" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "enable_pressure_advance": [ + "1" + ], + "eng_plate_temp": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "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": [ + "40" + ], + "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": [ + "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": [ + "1.5" + ], + "filament_retraction_minimum_travel": [ + "nil" + ], + "filament_retraction_speed": [ + "40" + ], + "filament_shrink": [ + "100%" + ], + "filament_soluble": [ + "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": [ + "Slope Lift" + ], + "full_fan_speed_layer": [ + "3" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature": [ + "205" + ], + "nozzle_temperature_initial_layer": [ + "210" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "pressure_advance": [ + "0.035" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "required_nozzle_HRC": [ + "0" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_min_speed": [ + "20" + ], + "support_material_interface_fan_speed": [ + "-1" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra 3 V2 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra 3 V2 0.4 nozzle.json new file mode 100644 index 0000000000..f776c75f34 --- /dev/null +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Matte @Anycubic Kobra 3 V2 0.4 nozzle.json @@ -0,0 +1,255 @@ +{ + "type": "filament", + "name": "Anycubic PLA Matte @Anycubic Kobra 3 V2 0.4 nozzle", + "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "H3PIqeTzjvtFQXYv", + "filament_id": "OFIE3vOf", + "instantiation": "true", + "filament_vendor": [ + "Anycubic" + ], + "filament_settings_id": [ + "Anycubic PLA Matte @Anycubic Kobra 3 V2 0.4 nozzle" + ], + "filament_type": [ + "PLA" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "9" + ], + "nozzle_temperature": [ + "210" + ], + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.4 nozzle" + ], + "activate_air_filtration": [ + "0" + ], + "activate_chamber_temp_control": [ + "0" + ], + "additional_cooling_fan_speed": [ + "0" + ], + "bed_type": [ + "High Temp Plate" + ], + "chamber_temperature": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "compatible_printers_condition": "", + "compatible_prints": [], + "compatible_prints_condition": "", + "complete_print_exhaust_fan_speed": [ + "80" + ], + "cool_plate_temp": [ + "35" + ], + "cool_plate_temp_initial_layer": [ + "35" + ], + "default_filament_colour": [ + "" + ], + "during_print_exhaust_fan_speed": [ + "60" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "enable_pressure_advance": [ + "0" + ], + "eng_plate_temp": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "fan_cooling_layer_time": [ + "100" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "80" + ], + "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": [ + "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.8" + ], + "filament_retraction_minimum_travel": [ + "nil" + ], + "filament_retraction_speed": [ + "30" + ], + "filament_shrink": [ + "100%" + ], + "filament_soluble": [ + "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": [ + "3" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "pressure_advance": [ + "0.05" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "required_nozzle_HRC": [ + "0" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "10" + ], + "slow_down_min_speed": [ + "20" + ], + "support_material_interface_fan_speed": [ + "-1" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ] +} diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Metal @Anycubic Kobra 3 V2 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Metal @Anycubic Kobra 3 V2 0.4 nozzle.json new file mode 100644 index 0000000000..4dd266e868 --- /dev/null +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Metal @Anycubic Kobra 3 V2 0.4 nozzle.json @@ -0,0 +1,255 @@ +{ + "type": "filament", + "name": "Anycubic PLA Metal @Anycubic Kobra 3 V2 0.4 nozzle", + "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "4zmGMIi6jHJhU4c6", + "filament_id": "OF5F0S66", + "instantiation": "true", + "filament_settings_id": [ + "Anycubic PLA Metal @Anycubic Kobra 3 V2 0.4 nozzle" + ], + "filament_vendor": [ + "Anycubic" + ], + "filament_type": [ + "PLA" + ], + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.4 nozzle" + ], + "filament_flow_ratio": [ + "0.97" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "activate_air_filtration": [ + "0" + ], + "activate_chamber_temp_control": [ + "0" + ], + "additional_cooling_fan_speed": [ + "0" + ], + "bed_type": [ + "High Temp Plate" + ], + "chamber_temperature": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "compatible_printers_condition": "", + "compatible_prints": [], + "compatible_prints_condition": "", + "complete_print_exhaust_fan_speed": [ + "80" + ], + "cool_plate_temp": [ + "35" + ], + "cool_plate_temp_initial_layer": [ + "35" + ], + "default_filament_colour": [ + "" + ], + "during_print_exhaust_fan_speed": [ + "60" + ], + "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_max_speed": [ + "100" + ], + "fan_min_speed": [ + "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": [ + "40" + ], + "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": [ + "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.8" + ], + "filament_retraction_minimum_travel": [ + "nil" + ], + "filament_retraction_speed": [ + "30" + ], + "filament_shrink": [ + "100%" + ], + "filament_soluble": [ + "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": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature": [ + "210" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "pressure_advance": [ + "0.05" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "required_nozzle_HRC": [ + "0" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_min_speed": [ + "20" + ], + "support_material_interface_fan_speed": [ + "-1" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Metal @Anycubic Kobra 3 V2 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Metal @Anycubic Kobra 3 V2 0.6 nozzle.json new file mode 100644 index 0000000000..465eb87b45 --- /dev/null +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Metal @Anycubic Kobra 3 V2 0.6 nozzle.json @@ -0,0 +1,255 @@ +{ + "type": "filament", + "name": "Anycubic PLA Metal @Anycubic Kobra 3 V2 0.6 nozzle", + "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "wLkJ1CJgdWnT4NoJ", + "filament_id": "OF5F0S66", + "instantiation": "true", + "filament_settings_id": [ + "Anycubic PLA Metal @Anycubic Kobra 3 V2 0.6 nozzle" + ], + "filament_vendor": [ + "Anycubic" + ], + "filament_type": [ + "PLA" + ], + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.6 nozzle" + ], + "filament_flow_ratio": [ + "0.94" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "activate_air_filtration": [ + "0" + ], + "activate_chamber_temp_control": [ + "0" + ], + "additional_cooling_fan_speed": [ + "0" + ], + "bed_type": [ + "High Temp Plate" + ], + "chamber_temperature": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "compatible_printers_condition": "", + "compatible_prints": [], + "compatible_prints_condition": "", + "complete_print_exhaust_fan_speed": [ + "80" + ], + "cool_plate_temp": [ + "35" + ], + "cool_plate_temp_initial_layer": [ + "35" + ], + "default_filament_colour": [ + "" + ], + "during_print_exhaust_fan_speed": [ + "60" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "enable_pressure_advance": [ + "0" + ], + "eng_plate_temp": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "fan_cooling_layer_time": [ + "100" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "80" + ], + "filament_cooling_final_speed": [ + "0" + ], + "filament_cooling_initial_speed": [ + "0" + ], + "filament_cooling_moves": [ + "0" + ], + "filament_cost": [ + "20" + ], + "filament_density": [ + "1.24" + ], + "filament_deretraction_speed": [ + "50" + ], + "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": [ + "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": [ + "1.2" + ], + "filament_retraction_minimum_travel": [ + "nil" + ], + "filament_retraction_speed": [ + "40" + ], + "filament_shrink": [ + "100%" + ], + "filament_soluble": [ + "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": [ + "Slope Lift" + ], + "full_fan_speed_layer": [ + "0" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "nozzle_temperature": [ + "210" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "pressure_advance": [ + "0.05" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "required_nozzle_HRC": [ + "0" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_min_speed": [ + "20" + ], + "support_material_interface_fan_speed": [ + "-1" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ] +} diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Metal @Anycubic Kobra 3 V2 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Metal @Anycubic Kobra 3 V2 0.8 nozzle.json new file mode 100644 index 0000000000..51f0cb0fc1 --- /dev/null +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Metal @Anycubic Kobra 3 V2 0.8 nozzle.json @@ -0,0 +1,255 @@ +{ + "type": "filament", + "name": "Anycubic PLA Metal @Anycubic Kobra 3 V2 0.8 nozzle", + "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "kkcDxmDe6F9fwhoJ", + "filament_id": "OF5F0S66", + "instantiation": "true", + "filament_settings_id": [ + "Anycubic PLA Metal @Anycubic Kobra 3 V2 0.8 nozzle" + ], + "filament_vendor": [ + "Anycubic" + ], + "filament_type": [ + "PLA" + ], + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.8 nozzle" + ], + "filament_flow_ratio": [ + "0.96" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "activate_air_filtration": [ + "0" + ], + "activate_chamber_temp_control": [ + "0" + ], + "additional_cooling_fan_speed": [ + "0" + ], + "bed_type": [ + "High Temp Plate" + ], + "chamber_temperature": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "compatible_printers_condition": "", + "compatible_prints": [], + "compatible_prints_condition": "", + "complete_print_exhaust_fan_speed": [ + "80" + ], + "cool_plate_temp": [ + "35" + ], + "cool_plate_temp_initial_layer": [ + "35" + ], + "default_filament_colour": [ + "" + ], + "during_print_exhaust_fan_speed": [ + "60" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "enable_pressure_advance": [ + "1" + ], + "eng_plate_temp": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "60" + ], + "fan_min_speed": [ + "80" + ], + "filament_cooling_final_speed": [ + "0" + ], + "filament_cooling_initial_speed": [ + "0" + ], + "filament_cooling_moves": [ + "0" + ], + "filament_cost": [ + "20" + ], + "filament_density": [ + "1.24" + ], + "filament_deretraction_speed": [ + "40" + ], + "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": [ + "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": [ + "1.5" + ], + "filament_retraction_minimum_travel": [ + "nil" + ], + "filament_retraction_speed": [ + "40" + ], + "filament_shrink": [ + "100%" + ], + "filament_soluble": [ + "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": [ + "Slope Lift" + ], + "full_fan_speed_layer": [ + "3" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature": [ + "205" + ], + "nozzle_temperature_initial_layer": [ + "215" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "pressure_advance": [ + "0.035" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "required_nozzle_HRC": [ + "0" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_min_speed": [ + "20" + ], + "support_material_interface_fan_speed": [ + "-1" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA SE @Anycubic Kobra 3 V2 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA SE @Anycubic Kobra 3 V2 0.4 nozzle.json new file mode 100644 index 0000000000..78bd6c1b49 --- /dev/null +++ b/resources/profiles/Anycubic/filament/Anycubic PLA SE @Anycubic Kobra 3 V2 0.4 nozzle.json @@ -0,0 +1,255 @@ +{ + "type": "filament", + "name": "Anycubic PLA SE @Anycubic Kobra 3 V2 0.4 nozzle", + "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "QRl3zpmacQ8D8aNX", + "filament_id": "OFCp3Bgo", + "instantiation": "true", + "filament_vendor": [ + "Anycubic" + ], + "filament_settings_id": [ + "Anycubic PLA SE @Anycubic Kobra 3 V2 0.4 nozzle" + ], + "filament_type": [ + "PLA" + ], + "filament_flow_ratio": [ + "0.97" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "nozzle_temperature": [ + "210" + ], + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.4 nozzle" + ], + "activate_air_filtration": [ + "0" + ], + "activate_chamber_temp_control": [ + "0" + ], + "additional_cooling_fan_speed": [ + "0" + ], + "bed_type": [ + "High Temp Plate" + ], + "chamber_temperature": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "compatible_printers_condition": "", + "compatible_prints": [], + "compatible_prints_condition": "", + "complete_print_exhaust_fan_speed": [ + "80" + ], + "cool_plate_temp": [ + "35" + ], + "cool_plate_temp_initial_layer": [ + "35" + ], + "default_filament_colour": [ + "" + ], + "during_print_exhaust_fan_speed": [ + "60" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "enable_pressure_advance": [ + "0" + ], + "eng_plate_temp": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "fan_cooling_layer_time": [ + "100" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "80" + ], + "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_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": [ + "0.8" + ], + "filament_retraction_minimum_travel": [ + "nil" + ], + "filament_retraction_speed": [ + "30" + ], + "filament_shrink": [ + "100%" + ], + "filament_soluble": [ + "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": [ + "3" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "pressure_advance": [ + "0.05" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "required_nozzle_HRC": [ + "0" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "14" + ], + "slow_down_min_speed": [ + "20" + ], + "support_material_interface_fan_speed": [ + "-1" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ] +} diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra 3 V2 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra 3 V2 0.4 nozzle.json new file mode 100644 index 0000000000..2459b95221 --- /dev/null +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra 3 V2 0.4 nozzle.json @@ -0,0 +1,255 @@ +{ + "type": "filament", + "name": "Anycubic PLA Silk @Anycubic Kobra 3 V2 0.4 nozzle", + "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "qF5SGZKoINokZfx2", + "filament_id": "OFFwJWea", + "instantiation": "true", + "filament_vendor": [ + "Anycubic" + ], + "filament_settings_id": [ + "Anycubic PLA Silk @Anycubic Kobra 3 V2 0.4 nozzle" + ], + "filament_type": [ + "PLA" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "7.2" + ], + "nozzle_temperature": [ + "220" + ], + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.4 nozzle" + ], + "activate_air_filtration": [ + "0" + ], + "activate_chamber_temp_control": [ + "0" + ], + "additional_cooling_fan_speed": [ + "0" + ], + "bed_type": [ + "High Temp Plate" + ], + "chamber_temperature": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "compatible_printers_condition": "", + "compatible_prints": [], + "compatible_prints_condition": "", + "complete_print_exhaust_fan_speed": [ + "80" + ], + "cool_plate_temp": [ + "35" + ], + "cool_plate_temp_initial_layer": [ + "35" + ], + "default_filament_colour": [ + "" + ], + "during_print_exhaust_fan_speed": [ + "60" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "enable_pressure_advance": [ + "0" + ], + "eng_plate_temp": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "fan_cooling_layer_time": [ + "100" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "80" + ], + "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_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": [ + "0.5" + ], + "filament_retraction_minimum_travel": [ + "nil" + ], + "filament_retraction_speed": [ + "30" + ], + "filament_shrink": [ + "100%" + ], + "filament_soluble": [ + "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": [ + "3" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "nozzle_temperature_initial_layer": [ + "230" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "pressure_advance": [ + "0.05" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "required_nozzle_HRC": [ + "0" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "10" + ], + "slow_down_min_speed": [ + "20" + ], + "support_material_interface_fan_speed": [ + "-1" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ] +} diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra 3 V2 0.6 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra 3 V2 0.6 nozzle.json new file mode 100644 index 0000000000..f338aff0d4 --- /dev/null +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra 3 V2 0.6 nozzle.json @@ -0,0 +1,51 @@ +{ + "type": "filament", + "name": "Anycubic PLA Silk @Anycubic Kobra 3 V2 0.6 nozzle", + "inherits": "Anycubic PLA @Anycubic Kobra 3 V2 0.6 nozzle", + "from": "system", + "setting_id": "6aUrszW2Dj8CNYIp", + "filament_id": "OFFwJWea", + "instantiation": "true", + "filament_settings_id": [ + "Anycubic PLA Silk @Anycubic Kobra 3 V2 0.6 nozzle" + ], + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.6 nozzle" + ], + "filament_flow_ratio": [ + "0.96" + ], + "filament_max_volumetric_speed": [ + "7.2" + ], + "nozzle_temperature": [ + "220" + ], + "enable_pressure_advance": [ + "1" + ], + "fan_cooling_layer_time": [ + "100" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "80" + ], + "filament_retraction_length": [ + "1.2" + ], + "filament_retraction_speed": [ + "60" + ], + "nozzle_temperature_initial_layer": [ + "230" + ], + "pressure_advance": [ + "0.025" + ], + "slow_down_layer_time": [ + "10" + ] +} diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra 3 V2 0.8 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra 3 V2 0.8 nozzle.json new file mode 100644 index 0000000000..5bc5216bc0 --- /dev/null +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Silk @Anycubic Kobra 3 V2 0.8 nozzle.json @@ -0,0 +1,51 @@ +{ + "type": "filament", + "name": "Anycubic PLA Silk @Anycubic Kobra 3 V2 0.8 nozzle", + "inherits": "Anycubic PLA @Anycubic Kobra 3 V2 0.8 nozzle", + "from": "system", + "setting_id": "f8K19ebfxiXji84y", + "filament_id": "OFFwJWea", + "instantiation": "true", + "filament_settings_id": [ + "Anycubic PLA Silk @Anycubic Kobra 3 V2 0.8 nozzle" + ], + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.8 nozzle" + ], + "filament_flow_ratio": [ + "0.96" + ], + "filament_max_volumetric_speed": [ + "7.2" + ], + "nozzle_temperature": [ + "220" + ], + "enable_pressure_advance": [ + "1" + ], + "fan_cooling_layer_time": [ + "100" + ], + "fan_max_speed": [ + "100" + ], + "filament_retraction_length": [ + "1.2" + ], + "filament_retraction_speed": [ + "80" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "nozzle_temperature_initial_layer": [ + "230" + ], + "pressure_advance": [ + "0.025" + ] +} diff --git a/resources/profiles/Anycubic/filament/Anycubic PLA Translucent @Anycubic Kobra 3 V2 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic PLA Translucent @Anycubic Kobra 3 V2 0.4 nozzle.json new file mode 100644 index 0000000000..6899156d04 --- /dev/null +++ b/resources/profiles/Anycubic/filament/Anycubic PLA Translucent @Anycubic Kobra 3 V2 0.4 nozzle.json @@ -0,0 +1,273 @@ +{ + "type": "filament", + "name": "Anycubic PLA Translucent @Anycubic Kobra 3 V2 0.4 nozzle", + "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "NTs7c6NqAudTl9wk", + "filament_id": "OF7c9fln", + "instantiation": "true", + "filament_settings_id": [ + "Anycubic PLA Translucent @Anycubic Kobra 3 V2 0.4 nozzle" + ], + "filament_vendor": [ + "Anycubic" + ], + "filament_type": [ + "PLA" + ], + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.4 nozzle" + ], + "filament_flow_ratio": [ + "0.96" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "activate_air_filtration": [ + "0" + ], + "activate_chamber_temp_control": [ + "0" + ], + "additional_cooling_fan_speed": [ + "0" + ], + "bed_type": [ + "High Temp Plate" + ], + "chamber_temperature": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "compatible_printers_condition": "", + "compatible_prints": [], + "compatible_prints_condition": "", + "complete_print_exhaust_fan_speed": [ + "80" + ], + "cool_plate_temp": [ + "35" + ], + "cool_plate_temp_initial_layer": [ + "35" + ], + "default_filament_colour": [ + "" + ], + "dont_slow_down_outer_wall": [ + "1" + ], + "during_print_exhaust_fan_speed": [ + "60" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "enable_pressure_advance": [ + "0" + ], + "eng_plate_temp": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "fan_cooling_layer_time": [ + "80" + ], + "fan_cooling_layer_time_BRASS": [ + "100" + ], + "fan_max_speed": [ + "80" + ], + "fan_max_speed_BRASS": [ + "100" + ], + "fan_min_speed": [ + "60" + ], + "fan_min_speed_BRASS": [ + "70" + ], + "filament_cooling_final_speed": [ + "0" + ], + "filament_cooling_initial_speed": [ + "0" + ], + "filament_cooling_moves": [ + "0" + ], + "filament_cost": [ + "20" + ], + "filament_density": [ + "1.24" + ], + "filament_deretraction_speed": [ + "40" + ], + "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": [ + "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": [ + "1.2" + ], + "filament_retraction_minimum_travel": [ + "nil" + ], + "filament_retraction_speed": [ + "40" + ], + "filament_shrink": [ + "100%" + ], + "filament_soluble": [ + "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": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature": [ + "210" + ], + "nozzle_temperature_BRASS": [ + "205" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "pressure_advance": [ + "0.05" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "required_nozzle_HRC": [ + "0" + ], + "slow_down_for_layer_cooling": [ + "0" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_layer_time_BRASS": [ + "10" + ], + "slow_down_min_speed": [ + "20" + ], + "support_material_interface_fan_speed": [ + "-1" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra 3 V2 0.4 nozzle.json b/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra 3 V2 0.4 nozzle.json new file mode 100644 index 0000000000..b2748a9149 --- /dev/null +++ b/resources/profiles/Anycubic/filament/Anycubic TPU @Anycubic Kobra 3 V2 0.4 nozzle.json @@ -0,0 +1,255 @@ +{ + "type": "filament", + "name": "Anycubic TPU @Anycubic Kobra 3 V2 0.4 nozzle", + "inherits": "fdm_filament_tpu", + "from": "system", + "setting_id": "oSWtTJpng3ERixPJ", + "filament_id": "OFMsDGbs", + "instantiation": "true", + "filament_vendor": [ + "Anycubic" + ], + "filament_settings_id": [ + "Anycubic TPU @Anycubic Kobra 3 V2 0.4 nozzle" + ], + "filament_type": [ + "TPU" + ], + "filament_flow_ratio": [ + "1" + ], + "filament_max_volumetric_speed": [ + "3.2" + ], + "nozzle_temperature": [ + "210" + ], + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.4 nozzle" + ], + "activate_air_filtration": [ + "0" + ], + "activate_chamber_temp_control": [ + "0" + ], + "additional_cooling_fan_speed": [ + "0" + ], + "bed_type": [ + "High Temp Plate" + ], + "chamber_temperature": [ + "0" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "compatible_printers_condition": "", + "compatible_prints": [], + "compatible_prints_condition": "", + "complete_print_exhaust_fan_speed": [ + "80" + ], + "cool_plate_temp": [ + "35" + ], + "cool_plate_temp_initial_layer": [ + "35" + ], + "default_filament_colour": [ + "" + ], + "during_print_exhaust_fan_speed": [ + "60" + ], + "enable_overhang_bridge_fan": [ + "1" + ], + "enable_pressure_advance": [ + "0" + ], + "eng_plate_temp": [ + "0" + ], + "eng_plate_temp_initial_layer": [ + "0" + ], + "fan_cooling_layer_time": [ + "100" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "80" + ], + "filament_cooling_final_speed": [ + "0" + ], + "filament_cooling_initial_speed": [ + "0" + ], + "filament_cooling_moves": [ + "0" + ], + "filament_cost": [ + "0" + ], + "filament_density": [ + "1.23" + ], + "filament_deretraction_speed": [ + "25" + ], + "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": [ + "nil" + ], + "filament_retract_lift_below": [ + "nil" + ], + "filament_retract_lift_enforce": [ + "nil" + ], + "filament_retract_restart_extra": [ + "nil" + ], + "filament_retract_when_changing_layer": [ + "1" + ], + "filament_retraction_distances_when_cut": [ + "nil" + ], + "filament_retraction_length": [ + "2" + ], + "filament_retraction_minimum_travel": [ + "1" + ], + "filament_retraction_speed": [ + "35" + ], + "filament_shrink": [ + "100%" + ], + "filament_soluble": [ + "0" + ], + "filament_start_gcode": [ + "; filament start gcode" + ], + "filament_toolchange_delay": [ + "0" + ], + "filament_unloading_speed": [ + "0" + ], + "filament_unloading_speed_start": [ + "0" + ], + "filament_wipe": [ + "1" + ], + "filament_wipe_distance": [ + "nil" + ], + "filament_z_hop": [ + "nil" + ], + "filament_z_hop_types": [ + "nil" + ], + "full_fan_speed_layer": [ + "3" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature_initial_layer": [ + "230" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "95%" + ], + "pressure_advance": [ + "0.05" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "required_nozzle_HRC": [ + "0" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_min_speed": [ + "20" + ], + "support_material_interface_fan_speed": [ + "-1" + ], + "temperature_vitrification": [ + "60" + ], + "textured_plate_temp": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2 0.2 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2 0.2 nozzle.json new file mode 100644 index 0000000000..676b43000d --- /dev/null +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2 0.2 nozzle.json @@ -0,0 +1,255 @@ +{ + "type": "machine", + "name": "Anycubic Kobra 3 V2 0.2 nozzle", + "inherits": "fdm_machine_common", + "from": "system", + "setting_id": "gaQ37xRo6J467j1y", + "instantiation": "true", + "printer_technology": "FFF", + "printer_settings_id": "Anycubic Kobra 3 V2 0.2 nozzle", + "printer_model": "Anycubic Kobra 3 V2", + "printer_variant": "0.2", + "nozzle_diameter": [ + "0.2" + ], + "default_print_profile": "0.10mm Standard @Anycubic Kobra 3 V2 0.2 nozzle", + "default_filament_profile": [ + "Anycubic PLA @Anycubic Kobra 3 V2 0.2 nozzle" + ], + "disable_m73": "0", + "gcode_flavor": "klipper", + "printable_area": [ + "0x0", + "255x0", + "255x255", + "0x255" + ], + "printable_height": "260", + "thumbnails": [ + "230x110" + ], + "thumbnails_format": "PNG", + "thumbnails_internal": [ + "512x512/PNG/top" + ], + "thumbnails_internal_switch": "1", + "adaptive_bed_mesh_margin": "0", + "auxiliary_fan": "0", + "bbl_use_printhost": "0", + "bed_custom_model": "", + "bed_custom_texture": "", + "bed_exclude_area": [], + "bed_mesh_max": "0,0", + "bed_mesh_min": "0,0", + "bed_mesh_probe_distance": "0,0", + "before_layer_change_gcode": "; BEFORE_LAYER_CHANGE [layer_num] @ [layer_z]mm", + "best_object_pos": "0.5,0.5", + "change_extrusion_role_gcode": "", + "change_filament_gcode": "; FLUSH_START\n;;; M400 P0\nT[next_extruder] ; change extruder\n; 1\n;;; G1 E-2 F2400\n;;; G1 Z{max(toolchange_z+0.6, 5.0)} F600\n;;; G1 X271.5 F12000\n;;; G1 E-5 F600\n;;; G1 X278 F600\n;;; M400 P3530\n;;; G1 E-1 F600\n;;; G1 Z{max(toolchange_z+2.6, 7.0)} F600\n;;; G1 X278 F18000\n;;; G1 X271.5 F1200\n;;; G1 E2 F300\n;;; M400 P31050\n;;; M400 P17510\n; 2\n;;; G1 X278 F18000\n;;; G1 X271.5 F1200\n;;; G1 E2 F300\n;;; M400 P0\n;;; G1 X250 F1200\n;;; M400 P0\n;;; G1 X278 F18000\n;;; G1 X271.5 F1200\n;;; G1 E2 F300\n;;; M400 P0\n; 3.1\n;;; M106 S255\n;;; G1 X36 Y260 Z-0.8 F9600\n;;; G1 X50 Y260 Z1 F9600\n;;; G1 X86 Y260 Z1 F9600\n;;; G1 X90 Y260 Z-0.8 F9600\n;;; G1 X90 Y259 Z-0.8 F9600\n;;; G1 X86 Y259 Z1 F9600\n;;; G1 X50 Y259 Z1 F9600\n;;; G1 X36 Y259 Z-0.8 F9600\n; 3.2\n;;; G1 X36 Y260 Z-0.8 F9600\n;;; G1 X50 Y260 Z1 F9600\n;;; G1 X86 Y260 Z1 F9600\n;;; G1 X90 Y260 Z-0.8 F9600\n;;; G1 X90 Y259 Z-0.8 F9600\n;;; G1 X86 Y259 Z1 F9600\n;;; G1 X50 Y259 Z1 F9600\n;;; G1 X36 Y259 Z-0.8 F9600\n; 3.3\n;;; G1 X36 Y260 Z-0.8 F9600\n;;; G1 X50 Y260 Z1 F9600\n;;; G1 X86 Y260 Z1 F9600\n;;; G1 X90 Y260 Z-0.8 F9600\n;;; G1 X90 Y259 Z-0.8 F9600\n;;; G1 X86 Y259 Z1 F9600\n;;; G1 X50 Y259 Z1 F9600\n;;; G1 X36 Y259 Z-0.8 F9600\n;;; G1 Z{toolchange_z}\n;;; M400 P0\n; FLUSH_END", + "cooling_tube_length": "0", + "cooling_tube_retraction": "0", + "deretraction_speed": [ + "40" + ], + "emit_machine_limits_to_gcode": "1", + "enable_filament_ramming": "0", + "enable_long_retraction_when_cut": "0", + "extra_loading_move": "0", + "extruder_clearance_height_to_lid": "250", + "extruder_clearance_height_to_rod": "20", + "extruder_clearance_radius": "65", + "extruder_colour": [ + "FF4D4F" + ], + "extruder_offset": [ + "0x0" + ], + "fan_kickstart": "0", + "fan_speedup_overhangs": "1", + "fan_speedup_time": "0", + "head_wrap_detect_zone": [], + "high_current_on_filament_swap": "0", + "host_type": "octoprint", + "layer_change_gcode": "; AFTER_LAYER_CHANGE [layer_num] @ [layer_z]mm", + "long_retractions_when_cut": [ + "0" + ], + "machine_end_gcode": "G92 E0\nG1 E-2 F3600\n{if max_layer_z < max_print_height-1}G1 Z{max_layer_z+2} F900 ; Move print head further up{endif}\nG1 X250 Y220 F12000 ; present print\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107;turn off fan\nM84; disable motors\n; disable stepper motors\n\n", + "machine_load_filament_time": "42", + "machine_max_acceleration_e": [ + "20000", + "20000", + "20000" + ], + "machine_max_acceleration_extruding": [ + "20000", + "20000", + "20000" + ], + "machine_max_acceleration_retracting": [ + "20000", + "20000", + "20000" + ], + "machine_max_acceleration_travel": [ + "20000", + "20000", + "20000" + ], + "machine_max_acceleration_x": [ + "20000", + "20000", + "20000" + ], + "machine_max_acceleration_y": [ + "20000", + "20000", + "20000" + ], + "machine_max_acceleration_z": [ + "1000", + "1000", + "1000" + ], + "machine_max_jerk_e": [ + "20", + "20", + "20" + ], + "machine_max_jerk_x": [ + "20", + "20", + "20" + ], + "machine_max_jerk_y": [ + "20", + "20", + "20" + ], + "machine_max_jerk_z": [ + "20", + "20", + "20" + ], + "machine_max_speed_e": [ + "600", + "300", + "780" + ], + "machine_max_speed_x": [ + "600", + "300", + "780" + ], + "machine_max_speed_y": [ + "600", + "300", + "780" + ], + "machine_max_speed_z": [ + "15", + "10", + "26" + ], + "machine_min_extruding_rate": [ + "0", + "0", + "0" + ], + "machine_min_travel_rate": [ + "0", + "0", + "0" + ], + "machine_pause_gcode": "M600", + "machine_start_gcode": "G9111 bedTemp=[first_layer_bed_temperature] extruderTemp=[first_layer_temperature[initial_tool]]\nM117\nM900 K0.051\n; print_bed_min = {print_bed_min[0]},{print_bed_min[1]}\n; print_bed_max = {print_bed_max[0]},{print_bed_max[1]}\n; print_bed_size = {print_bed_size[0]},{print_bed_size[1]}\n; first_layer_print_min = {first_layer_print_min[0]},{first_layer_print_min[1]}\n; first_layer_print_max = {first_layer_print_max[0]},{first_layer_print_max[1]}\n; first_layer_print_size = {first_layer_print_size[0]},{first_layer_print_size[1]}", + "machine_tool_change_time": "0", + "machine_unload_filament_time": "0", + "manual_filament_change": "0", + "max_layer_height": [ + "0.14" + ], + "min_layer_height": [ + "0.08" + ], + "nozzle_height": "4", + "nozzle_hrc": "0", + "nozzle_type": "brass", + "nozzle_volume": "107", + "parking_pos_retraction": "0", + "pellet_modded_printer": "0", + "preferred_orientation": "0", + "printer_flush_multiplier": "1", + "printer_notes": "", + "printer_structure": "i3", + "printhost_authorization_type": "key", + "printhost_ssl_ignore_revoke": "0", + "printing_by_object_gcode": "", + "purge_in_prime_tower": "0", + "retract_before_wipe": [ + "0%" + ], + "retract_length_toolchange": [ + "0" + ], + "retract_lift_above": [ + "0.3" + ], + "retract_lift_below": [ + "258" + ], + "retract_lift_enforce": [ + "All Surfaces" + ], + "retract_on_top_layer": [ + "1" + ], + "retract_restart_extra": [ + "0" + ], + "retract_restart_extra_toolchange": [ + "0" + ], + "retract_when_changing_layer": [ + "1" + ], + "retraction_distances_when_cut": [ + "0" + ], + "retraction_length": [ + "0.8" + ], + "retraction_minimum_travel": [ + "0" + ], + "retraction_speed": [ + "40" + ], + "scan_first_layer": "0", + "single_extruder_multi_material": "1", + "support_air_filtration": "1", + "support_chamber_temp_control": "1", + "support_multi_bed_types": "1", + "template_custom_gcode": "", + "time_cost": "0", + "time_lapse_gcode": "", + "travel_slope": [ + "3" + ], + "upward_compatible_machine": [], + "use_firmware_retraction": "0", + "use_relative_e_distances": "1", + "wipe": [ + "1" + ], + "wipe_distance": [ + "1" + ], + "z_hop": [ + "0.4" + ], + "z_hop_types": [ + "Auto Lift" + ], + "z_offset": "0" +} diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2 0.4 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2 0.4 nozzle.json new file mode 100644 index 0000000000..8f265955c8 --- /dev/null +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2 0.4 nozzle.json @@ -0,0 +1,251 @@ +{ + "type": "machine", + "name": "Anycubic Kobra 3 V2 0.4 nozzle", + "inherits": "fdm_machine_common", + "from": "system", + "setting_id": "l49qdfdrHYEO04bV", + "instantiation": "true", + "printer_technology": "FFF", + "printer_settings_id": "Anycubic Kobra 3 V2 0.4 nozzle", + "printer_model": "Anycubic Kobra 3 V2", + "printer_variant": "0.4", + "nozzle_diameter": [ + "0.4" + ], + "default_print_profile": "0.20mm Standard @Anycubic Kobra 3 V2 0.4 nozzle", + "default_filament_profile": [ + "Anycubic PLA @Anycubic Kobra 3 V2 0.4 nozzle" + ], + "disable_m73": "0", + "gcode_flavor": "klipper", + "printable_area": [ + "0x0", + "255x0", + "255x255", + "0x255" + ], + "printable_height": "260", + "thumbnails": "230x110/PNG", + "thumbnails_format": "PNG", + "thumbnails_internal": "512x512/PNG/top", + "thumbnails_internal_switch": "1", + "adaptive_bed_mesh_margin": "0", + "auxiliary_fan": "0", + "bbl_use_printhost": "0", + "bed_custom_model": "", + "bed_custom_texture": "", + "bed_exclude_area": [], + "bed_mesh_max": "0,0", + "bed_mesh_min": "0,0", + "bed_mesh_probe_distance": "0,0", + "before_layer_change_gcode": "; BEFORE_LAYER_CHANGE [layer_num] @ [layer_z]mm", + "best_object_pos": "0.5,0.5", + "change_extrusion_role_gcode": "", + "change_filament_gcode": "; FLUSH_START\n;;; M400 P0\nT[next_extruder] ; change extruder\n; 1\n;;; G1 E-2 F2400\n;;; G1 Z{max(toolchange_z+0.6, 5.0)} F600\n;;; G1 X271.5 F12000\n;;; G1 E-5 F600\n;;; G1 X278 F600\n;;; M400 P3530\n;;; G1 E-1 F600\n;;; G1 Z{max(toolchange_z+2.6, 7.0)} F600\n;;; G1 X278 F18000\n;;; G1 X271.5 F1200\n;;; G1 E2 F300\n;;; M400 P31050\n;;; M400 P17510\n; 2\n;;; G1 X278 F18000\n;;; G1 X271.5 F1200\n;;; G1 E2 F300\n;;; M400 P0\n;;; G1 X250 F1200\n;;; M400 P0\n;;; G1 X278 F18000\n;;; G1 X271.5 F1200\n;;; G1 E2 F300\n;;; M400 P0\n; 3.1\n;;; M106 S255\n;;; G1 X36 Y260 Z-0.8 F9600\n;;; G1 X50 Y260 Z1 F9600\n;;; G1 X86 Y260 Z1 F9600\n;;; G1 X90 Y260 Z-0.8 F9600\n;;; G1 X90 Y259 Z-0.8 F9600\n;;; G1 X86 Y259 Z1 F9600\n;;; G1 X50 Y259 Z1 F9600\n;;; G1 X36 Y259 Z-0.8 F9600\n; 3.2\n;;; G1 X36 Y260 Z-0.8 F9600\n;;; G1 X50 Y260 Z1 F9600\n;;; G1 X86 Y260 Z1 F9600\n;;; G1 X90 Y260 Z-0.8 F9600\n;;; G1 X90 Y259 Z-0.8 F9600\n;;; G1 X86 Y259 Z1 F9600\n;;; G1 X50 Y259 Z1 F9600\n;;; G1 X36 Y259 Z-0.8 F9600\n; 3.3\n;;; G1 X36 Y260 Z-0.8 F9600\n;;; G1 X50 Y260 Z1 F9600\n;;; G1 X86 Y260 Z1 F9600\n;;; G1 X90 Y260 Z-0.8 F9600\n;;; G1 X90 Y259 Z-0.8 F9600\n;;; G1 X86 Y259 Z1 F9600\n;;; G1 X50 Y259 Z1 F9600\n;;; G1 X36 Y259 Z-0.8 F9600\n;;; G1 Z{toolchange_z}\n;;; M400 P0\n; FLUSH_END", + "cooling_tube_length": "0", + "cooling_tube_retraction": "0", + "deretraction_speed": [ + "60" + ], + "emit_machine_limits_to_gcode": "1", + "enable_filament_ramming": "0", + "enable_long_retraction_when_cut": "0", + "extra_loading_move": "0", + "extruder_clearance_height_to_lid": "250", + "extruder_clearance_height_to_rod": "20", + "extruder_clearance_radius": "65", + "extruder_colour": [ + "FF4D4F" + ], + "extruder_offset": [ + "0x0" + ], + "fan_kickstart": "0", + "fan_speedup_overhangs": "1", + "fan_speedup_time": "0", + "head_wrap_detect_zone": [], + "high_current_on_filament_swap": "0", + "host_type": "octoprint", + "layer_change_gcode": "; AFTER_LAYER_CHANGE [layer_num] @ [layer_z]mm", + "long_retractions_when_cut": [ + "0" + ], + "machine_end_gcode": "M400\nG92 E0 ; zero the extruder\nG1 E-2 F3600\n{if max_layer_z < max_print_height-1}G1 Z{max_layer_z+2} F900 ; Move print head further up{endif}\nG1 X250 Y220 F12000 ; present print\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107;turn off fan\nM84; disable motors\n; disable stepper motors", + "machine_load_filament_time": "42", + "machine_max_acceleration_e": [ + "20000", + "20000", + "20000" + ], + "machine_max_acceleration_extruding": [ + "20000", + "20000", + "20000" + ], + "machine_max_acceleration_retracting": [ + "20000", + "20000", + "20000" + ], + "machine_max_acceleration_travel": [ + "20000", + "20000", + "20000" + ], + "machine_max_acceleration_x": [ + "20000", + "20000", + "20000" + ], + "machine_max_acceleration_y": [ + "20000", + "20000", + "20000" + ], + "machine_max_acceleration_z": [ + "1000", + "1000", + "1000" + ], + "machine_max_jerk_e": [ + "20", + "20", + "20" + ], + "machine_max_jerk_x": [ + "20", + "20", + "20" + ], + "machine_max_jerk_y": [ + "20", + "20", + "20" + ], + "machine_max_jerk_z": [ + "20", + "20", + "20" + ], + "machine_max_speed_e": [ + "600", + "300", + "780" + ], + "machine_max_speed_x": [ + "600", + "300", + "780" + ], + "machine_max_speed_y": [ + "600", + "300", + "780" + ], + "machine_max_speed_z": [ + "15", + "10", + "26" + ], + "machine_min_extruding_rate": [ + "0", + "0", + "0" + ], + "machine_min_travel_rate": [ + "0", + "0", + "0" + ], + "machine_pause_gcode": "M600", + "machine_start_gcode": "G9111 bedTemp=[first_layer_bed_temperature] extruderTemp=[first_layer_temperature[initial_tool]]\nM117\nM900 K0.051\n; print_bed_min = {print_bed_min[0]},{print_bed_min[1]}\n; print_bed_max = {print_bed_max[0]},{print_bed_max[1]}\n; print_bed_size = {print_bed_size[0]},{print_bed_size[1]}\n; first_layer_print_min = {first_layer_print_min[0]},{first_layer_print_min[1]}\n; first_layer_print_max = {first_layer_print_max[0]},{first_layer_print_max[1]}\n; first_layer_print_size = {first_layer_print_size[0]},{first_layer_print_size[1]}", + "machine_tool_change_time": "0", + "machine_unload_filament_time": "0", + "manual_filament_change": "0", + "max_layer_height": [ + "0.28" + ], + "min_layer_height": [ + "0.08" + ], + "nozzle_height": "4", + "nozzle_hrc": "0", + "nozzle_type": "brass", + "nozzle_volume": "107", + "parking_pos_retraction": "0", + "pellet_modded_printer": "0", + "preferred_orientation": "0", + "printer_flush_multiplier": "1", + "printer_notes": "", + "printer_structure": "i3", + "printhost_authorization_type": "key", + "printhost_ssl_ignore_revoke": "0", + "printing_by_object_gcode": "", + "purge_in_prime_tower": "0", + "retract_before_wipe": [ + "0%" + ], + "retract_length_toolchange": [ + "0" + ], + "retract_lift_above": [ + "0" + ], + "retract_lift_below": [ + "259" + ], + "retract_lift_enforce": [ + "All Surfaces" + ], + "retract_on_top_layer": [ + "1" + ], + "retract_restart_extra": [ + "0" + ], + "retract_restart_extra_toolchange": [ + "0" + ], + "retract_when_changing_layer": [ + "1" + ], + "retraction_distances_when_cut": [ + "0" + ], + "retraction_length": [ + "1" + ], + "retraction_minimum_travel": [ + "1" + ], + "retraction_speed": [ + "60" + ], + "scan_first_layer": "0", + "single_extruder_multi_material": "1", + "support_air_filtration": "0", + "support_chamber_temp_control": "0", + "support_multi_bed_types": "1", + "template_custom_gcode": "", + "time_cost": "0", + "time_lapse_gcode": "", + "travel_slope": [ + "3" + ], + "upward_compatible_machine": [], + "use_firmware_retraction": "0", + "use_relative_e_distances": "1", + "wipe": [ + "1" + ], + "wipe_distance": [ + "2" + ], + "z_hop": [ + "0.4" + ], + "z_hop_types": [ + "Slope Lift" + ], + "z_offset": "0" +} diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2 0.6 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2 0.6 nozzle.json new file mode 100644 index 0000000000..b8271d0d74 --- /dev/null +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2 0.6 nozzle.json @@ -0,0 +1,251 @@ +{ + "type": "machine", + "name": "Anycubic Kobra 3 V2 0.6 nozzle", + "inherits": "fdm_machine_common", + "from": "system", + "setting_id": "hQQgQT5HeCVGpBAL", + "instantiation": "true", + "printer_technology": "FFF", + "printer_settings_id": "Anycubic Kobra 3 V2 0.6 nozzle", + "printer_model": "Anycubic Kobra 3 V2", + "printer_variant": "0.6", + "nozzle_diameter": [ + "0.6" + ], + "default_print_profile": "0.30mm Standard @Anycubic Kobra 3 V2 0.6 nozzle", + "default_filament_profile": [ + "Anycubic PLA @Anycubic Kobra 3 V2 0.6 nozzle" + ], + "disable_m73": "0", + "gcode_flavor": "klipper", + "printable_area": [ + "0x0", + "255x0", + "255x255", + "0x255" + ], + "printable_height": "260", + "thumbnails": "230x110/PNG", + "thumbnails_format": "PNG", + "thumbnails_internal": "512x512/PNG/top", + "thumbnails_internal_switch": "1", + "adaptive_bed_mesh_margin": "0", + "auxiliary_fan": "0", + "bbl_use_printhost": "0", + "bed_custom_model": "", + "bed_custom_texture": "", + "bed_exclude_area": [], + "bed_mesh_max": "0,0", + "bed_mesh_min": "0,0", + "bed_mesh_probe_distance": "0,0", + "before_layer_change_gcode": "; BEFORE_LAYER_CHANGE [layer_num] @ [layer_z]mm", + "best_object_pos": "0.5,0.5", + "change_extrusion_role_gcode": "", + "change_filament_gcode": "; FLUSH_START\n;;; M400 P0\nT[next_extruder] ; change extruder\n; 1\n;;; G1 E-2 F2400\n;;; G1 Z{max(toolchange_z+0.6, 5.0)} F600\n;;; G1 X271.5 F12000\n;;; G1 E-5 F600\n;;; G1 X278 F600\n;;; M400 P3530\n;;; G1 E-1 F600\n;;; G1 Z{max(toolchange_z+2.6, 7.0)} F600\n;;; G1 X278 F18000\n;;; G1 X271.5 F1200\n;;; G1 E2 F300\n;;; M400 P31050\n;;; M400 P17510\n; 2\n;;; G1 X278 F18000\n;;; G1 X271.5 F1200\n;;; G1 E2 F300\n;;; M400 P0\n;;; G1 X250 F1200\n;;; M400 P0\n;;; G1 X278 F18000\n;;; G1 X271.5 F1200\n;;; G1 E2 F300\n;;; M400 P0\n; 3.1\n;;; M106 S255\n;;; G1 X36 Y260 Z-0.8 F9600\n;;; G1 X50 Y260 Z1 F9600\n;;; G1 X86 Y260 Z1 F9600\n;;; G1 X90 Y260 Z-0.8 F9600\n;;; G1 X90 Y259 Z-0.8 F9600\n;;; G1 X86 Y259 Z1 F9600\n;;; G1 X50 Y259 Z1 F9600\n;;; G1 X36 Y259 Z-0.8 F9600\n; 3.2\n;;; G1 X36 Y260 Z-0.8 F9600\n;;; G1 X50 Y260 Z1 F9600\n;;; G1 X86 Y260 Z1 F9600\n;;; G1 X90 Y260 Z-0.8 F9600\n;;; G1 X90 Y259 Z-0.8 F9600\n;;; G1 X86 Y259 Z1 F9600\n;;; G1 X50 Y259 Z1 F9600\n;;; G1 X36 Y259 Z-0.8 F9600\n; 3.3\n;;; G1 X36 Y260 Z-0.8 F9600\n;;; G1 X50 Y260 Z1 F9600\n;;; G1 X86 Y260 Z1 F9600\n;;; G1 X90 Y260 Z-0.8 F9600\n;;; G1 X90 Y259 Z-0.8 F9600\n;;; G1 X86 Y259 Z1 F9600\n;;; G1 X50 Y259 Z1 F9600\n;;; G1 X36 Y259 Z-0.8 F9600\n;;; G1 Z{toolchange_z}\n;;; M400 P0\n; FLUSH_END", + "cooling_tube_length": "0", + "cooling_tube_retraction": "0", + "deretraction_speed": [ + "30" + ], + "emit_machine_limits_to_gcode": "1", + "enable_filament_ramming": "0", + "enable_long_retraction_when_cut": "0", + "extra_loading_move": "0", + "extruder_clearance_height_to_lid": "250", + "extruder_clearance_height_to_rod": "20", + "extruder_clearance_radius": "65", + "extruder_colour": [ + "FF4D4F" + ], + "extruder_offset": [ + "0x0" + ], + "fan_kickstart": "0", + "fan_speedup_overhangs": "1", + "fan_speedup_time": "0", + "head_wrap_detect_zone": [], + "high_current_on_filament_swap": "0", + "host_type": "octoprint", + "layer_change_gcode": "; AFTER_LAYER_CHANGE [layer_num] @ [layer_z]mm", + "long_retractions_when_cut": [ + "0" + ], + "machine_end_gcode": "M400 ; wait for buffer to clear\nG92 E0 ; zero the extruder\nG1 E-1 F3600 ; retract\n{if max_layer_z < max_print_height-1}G1 Z{max_layer_z+2} F600 ; Move print head further up{endif}\nG1 X250 Y220 F12000 ; present print\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107;turn off fan\nM84; disable motors\n; disable stepper motors\n\n", + "machine_load_filament_time": "42", + "machine_max_acceleration_e": [ + "20000", + "20000", + "20000" + ], + "machine_max_acceleration_extruding": [ + "20000", + "20000", + "20000" + ], + "machine_max_acceleration_retracting": [ + "20000", + "20000", + "20000" + ], + "machine_max_acceleration_travel": [ + "20000", + "20000", + "20000" + ], + "machine_max_acceleration_x": [ + "20000", + "20000", + "20000" + ], + "machine_max_acceleration_y": [ + "20000", + "20000", + "20000" + ], + "machine_max_acceleration_z": [ + "1000", + "1000", + "1000" + ], + "machine_max_jerk_e": [ + "20", + "20", + "20" + ], + "machine_max_jerk_x": [ + "20", + "20", + "20" + ], + "machine_max_jerk_y": [ + "20", + "20", + "20" + ], + "machine_max_jerk_z": [ + "20", + "20", + "20" + ], + "machine_max_speed_e": [ + "600", + "300", + "780" + ], + "machine_max_speed_x": [ + "600", + "300", + "780" + ], + "machine_max_speed_y": [ + "600", + "300", + "780" + ], + "machine_max_speed_z": [ + "15", + "10", + "26" + ], + "machine_min_extruding_rate": [ + "0", + "0", + "0" + ], + "machine_min_travel_rate": [ + "0", + "0", + "0" + ], + "machine_pause_gcode": "M600", + "machine_start_gcode": "G9111 bedTemp=[first_layer_bed_temperature] extruderTemp=[first_layer_temperature[initial_tool]]\nM117\nM900 K0.05\n; print_bed_min = {print_bed_min[0]},{print_bed_min[1]}\n; print_bed_max = {print_bed_max[0]},{print_bed_max[1]}\n; print_bed_size = {print_bed_size[0]},{print_bed_size[1]}\n; first_layer_print_min = {first_layer_print_min[0]},{first_layer_print_min[1]}\n; first_layer_print_max = {first_layer_print_max[0]},{first_layer_print_max[1]}\n; first_layer_print_size = {first_layer_print_size[0]},{first_layer_print_size[1]}", + "machine_tool_change_time": "0", + "machine_unload_filament_time": "0", + "manual_filament_change": "0", + "max_layer_height": [ + "0.42" + ], + "min_layer_height": [ + "0.12" + ], + "nozzle_height": "4", + "nozzle_hrc": "0", + "nozzle_type": "brass", + "nozzle_volume": "107", + "parking_pos_retraction": "0", + "pellet_modded_printer": "0", + "preferred_orientation": "0", + "printer_flush_multiplier": "1", + "printer_notes": "", + "printer_structure": "i3", + "printhost_authorization_type": "key", + "printhost_ssl_ignore_revoke": "0", + "printing_by_object_gcode": "", + "purge_in_prime_tower": "0", + "retract_before_wipe": [ + "0%" + ], + "retract_length_toolchange": [ + "0" + ], + "retract_lift_above": [ + "0" + ], + "retract_lift_below": [ + "259" + ], + "retract_lift_enforce": [ + "All Surfaces" + ], + "retract_on_top_layer": [ + "1" + ], + "retract_restart_extra": [ + "0" + ], + "retract_restart_extra_toolchange": [ + "0" + ], + "retract_when_changing_layer": [ + "1" + ], + "retraction_distances_when_cut": [ + "0" + ], + "retraction_length": [ + "0.8" + ], + "retraction_minimum_travel": [ + "1" + ], + "retraction_speed": [ + "30" + ], + "scan_first_layer": "0", + "single_extruder_multi_material": "1", + "support_air_filtration": "1", + "support_chamber_temp_control": "1", + "support_multi_bed_types": "1", + "template_custom_gcode": "", + "time_cost": "0", + "time_lapse_gcode": "", + "travel_slope": [ + "3" + ], + "upward_compatible_machine": [], + "use_firmware_retraction": "0", + "use_relative_e_distances": "1", + "wipe": [ + "1" + ], + "wipe_distance": [ + "2" + ], + "z_hop": [ + "0.4" + ], + "z_hop_types": [ + "Auto Lift" + ], + "z_offset": "0" +} diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2 0.8 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2 0.8 nozzle.json new file mode 100644 index 0000000000..11565051e6 --- /dev/null +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2 0.8 nozzle.json @@ -0,0 +1,255 @@ +{ + "type": "machine", + "name": "Anycubic Kobra 3 V2 0.8 nozzle", + "inherits": "fdm_machine_common", + "from": "system", + "setting_id": "LBhbohm7o4jW6OYw", + "instantiation": "true", + "printer_technology": "FFF", + "printer_settings_id": "Anycubic Kobra 3 V2 0.8 nozzle", + "printer_model": "Anycubic Kobra 3 V2", + "printer_variant": "0.8", + "nozzle_diameter": [ + "0.8" + ], + "default_print_profile": "0.40mm Standard @Anycubic Kobra 3 V2 0.8 nozzle", + "default_filament_profile": [ + "Anycubic PLA @Anycubic Kobra 3 V2 0.8 nozzle" + ], + "disable_m73": "0", + "gcode_flavor": "klipper", + "printable_area": [ + "0x0", + "255x0", + "255x255", + "0x255" + ], + "printable_height": "260", + "thumbnails": [ + "230x110" + ], + "thumbnails_format": "PNG", + "thumbnails_internal": [ + "512x512/PNG/top" + ], + "thumbnails_internal_switch": "1", + "adaptive_bed_mesh_margin": "0", + "auxiliary_fan": "0", + "bbl_use_printhost": "0", + "bed_custom_model": "", + "bed_custom_texture": "", + "bed_exclude_area": [], + "bed_mesh_max": "0,0", + "bed_mesh_min": "0,0", + "bed_mesh_probe_distance": "0,0", + "before_layer_change_gcode": "; BEFORE_LAYER_CHANGE [layer_num] @ [layer_z]mm", + "best_object_pos": "0.5,0.5", + "change_extrusion_role_gcode": "", + "change_filament_gcode": "; FLUSH_START\n;;; M400 P0\nT[next_extruder] ; change extruder\n; 1\n;;; G1 E-2 F2400\n;;; G1 Z{max(toolchange_z+0.6, 5.0)} F600\n;;; G1 X271.5 F12000\n;;; G1 E-5 F600\n;;; G1 X278 F600\n;;; M400 P3530\n;;; G1 E-1 F600\n;;; G1 Z{max(toolchange_z+2.6, 7.0)} F600\n;;; G1 X278 F18000\n;;; G1 X271.5 F1200\n;;; G1 E2 F300\n;;; M400 P31050\n;;; M400 P17510\n; 2\n;;; G1 X278 F18000\n;;; G1 X271.5 F1200\n;;; G1 E2 F300\n;;; M400 P0\n;;; G1 X250 F1200\n;;; M400 P0\n;;; G1 X278 F18000\n;;; G1 X271.5 F1200\n;;; G1 E2 F300\n;;; M400 P0\n; 3.1\n;;; M106 S255\n;;; G1 X36 Y260 Z-0.8 F9600\n;;; G1 X50 Y260 Z1 F9600\n;;; G1 X86 Y260 Z1 F9600\n;;; G1 X90 Y260 Z-0.8 F9600\n;;; G1 X90 Y259 Z-0.8 F9600\n;;; G1 X86 Y259 Z1 F9600\n;;; G1 X50 Y259 Z1 F9600\n;;; G1 X36 Y259 Z-0.8 F9600\n; 3.2\n;;; G1 X36 Y260 Z-0.8 F9600\n;;; G1 X50 Y260 Z1 F9600\n;;; G1 X86 Y260 Z1 F9600\n;;; G1 X90 Y260 Z-0.8 F9600\n;;; G1 X90 Y259 Z-0.8 F9600\n;;; G1 X86 Y259 Z1 F9600\n;;; G1 X50 Y259 Z1 F9600\n;;; G1 X36 Y259 Z-0.8 F9600\n; 3.3\n;;; G1 X36 Y260 Z-0.8 F9600\n;;; G1 X50 Y260 Z1 F9600\n;;; G1 X86 Y260 Z1 F9600\n;;; G1 X90 Y260 Z-0.8 F9600\n;;; G1 X90 Y259 Z-0.8 F9600\n;;; G1 X86 Y259 Z1 F9600\n;;; G1 X50 Y259 Z1 F9600\n;;; G1 X36 Y259 Z-0.8 F9600\n;;; G1 Z{toolchange_z}\n;;; M400 P0\n; FLUSH_END", + "cooling_tube_length": "0", + "cooling_tube_retraction": "0", + "deretraction_speed": [ + "0" + ], + "emit_machine_limits_to_gcode": "1", + "enable_filament_ramming": "0", + "enable_long_retraction_when_cut": "0", + "extra_loading_move": "0", + "extruder_clearance_height_to_lid": "250", + "extruder_clearance_height_to_rod": "20", + "extruder_clearance_radius": "65", + "extruder_colour": [ + "FF4D4F" + ], + "extruder_offset": [ + "0x0" + ], + "fan_kickstart": "0", + "fan_speedup_overhangs": "1", + "fan_speedup_time": "0", + "head_wrap_detect_zone": [], + "high_current_on_filament_swap": "0", + "host_type": "octoprint", + "layer_change_gcode": "; AFTER_LAYER_CHANGE [layer_num] @ [layer_z]mm", + "long_retractions_when_cut": [ + "0" + ], + "machine_end_gcode": "M400 ; wait for buffer to clear\nG92 E0 ; zero the extruder\nG1 E-2 F3000 ; retract\n{if max_layer_z < max_print_height-1}G1 Z{max_layer_z+2} F600 ; Move print head further up{endif}\nG1 X250 Y220 F12000 ; present print\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107;turn off fan\nM84; disable motors\n; disable stepper motors\n\n", + "machine_load_filament_time": "42", + "machine_max_acceleration_e": [ + "20000", + "20000", + "20000" + ], + "machine_max_acceleration_extruding": [ + "20000", + "20000", + "20000" + ], + "machine_max_acceleration_retracting": [ + "20000", + "20000", + "20000" + ], + "machine_max_acceleration_travel": [ + "20000", + "20000", + "20000" + ], + "machine_max_acceleration_x": [ + "20000", + "20000", + "20000" + ], + "machine_max_acceleration_y": [ + "20000", + "20000", + "20000" + ], + "machine_max_acceleration_z": [ + "1000", + "1000", + "1000" + ], + "machine_max_jerk_e": [ + "20", + "20", + "20" + ], + "machine_max_jerk_x": [ + "20", + "20", + "20" + ], + "machine_max_jerk_y": [ + "20", + "20", + "20" + ], + "machine_max_jerk_z": [ + "20", + "20", + "20" + ], + "machine_max_speed_e": [ + "600", + "300", + "780" + ], + "machine_max_speed_x": [ + "600", + "300", + "780" + ], + "machine_max_speed_y": [ + "600", + "300", + "780" + ], + "machine_max_speed_z": [ + "15", + "10", + "26" + ], + "machine_min_extruding_rate": [ + "0", + "0", + "0" + ], + "machine_min_travel_rate": [ + "0", + "0", + "0" + ], + "machine_pause_gcode": "M600", + "machine_start_gcode": "G9111 bedTemp=[first_layer_bed_temperature] extruderTemp=[first_layer_temperature[initial_tool]]\nM117\nM900 K0.051\n; print_bed_min = {print_bed_min[0]},{print_bed_min[1]}\n; print_bed_max = {print_bed_max[0]},{print_bed_max[1]}\n; print_bed_size = {print_bed_size[0]},{print_bed_size[1]}\n; first_layer_print_min = {first_layer_print_min[0]},{first_layer_print_min[1]}\n; first_layer_print_max = {first_layer_print_max[0]},{first_layer_print_max[1]}\n; first_layer_print_size = {first_layer_print_size[0]},{first_layer_print_size[1]}", + "machine_tool_change_time": "0", + "machine_unload_filament_time": "0", + "manual_filament_change": "0", + "max_layer_height": [ + "0.56" + ], + "min_layer_height": [ + "0.16" + ], + "nozzle_height": "4", + "nozzle_hrc": "0", + "nozzle_type": "brass", + "nozzle_volume": "107", + "parking_pos_retraction": "0", + "pellet_modded_printer": "0", + "preferred_orientation": "0", + "printer_flush_multiplier": "1", + "printer_notes": "", + "printer_structure": "i3", + "printhost_authorization_type": "key", + "printhost_ssl_ignore_revoke": "0", + "printing_by_object_gcode": "", + "purge_in_prime_tower": "0", + "retract_before_wipe": [ + "0%" + ], + "retract_length_toolchange": [ + "0" + ], + "retract_lift_above": [ + "0.3" + ], + "retract_lift_below": [ + "259.6" + ], + "retract_lift_enforce": [ + "All Surfaces" + ], + "retract_on_top_layer": [ + "1" + ], + "retract_restart_extra": [ + "0" + ], + "retract_restart_extra_toolchange": [ + "0" + ], + "retract_when_changing_layer": [ + "1" + ], + "retraction_distances_when_cut": [ + "0" + ], + "retraction_length": [ + "1" + ], + "retraction_minimum_travel": [ + "1" + ], + "retraction_speed": [ + "40" + ], + "scan_first_layer": "0", + "single_extruder_multi_material": "1", + "support_air_filtration": "1", + "support_chamber_temp_control": "1", + "support_multi_bed_types": "1", + "template_custom_gcode": "", + "time_cost": "0", + "time_lapse_gcode": "", + "travel_slope": [ + "3" + ], + "upward_compatible_machine": [], + "use_firmware_retraction": "0", + "use_relative_e_distances": "1", + "wipe": [ + "1" + ], + "wipe_distance": [ + "2" + ], + "z_hop": [ + "0.4" + ], + "z_hop_types": [ + "Auto Lift" + ], + "z_offset": "0" +} diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2.json b/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2.json new file mode 100644 index 0000000000..84651d79de --- /dev/null +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra 3 V2.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "machine_tech": "FFF", + "family": "Anycubic", + "name": "Anycubic Kobra 3 V2", + "model_id": "Anycubic Kobra 3 V2", + "nozzle_diameter": "0.4;0.2;0.6;0.8", + "bed_model": "Anycubic Kobra 3 V2_buildplate_model.stl", + "bed_texture": "Anycubic Kobra 3 V2_buildplate_texture.svg", + "hotend_model": "", + "default_materials": "Anycubic PLA @Anycubic Kobra 3 V2 0.2 nozzle;Anycubic PLA @Anycubic Kobra 3 V2 0.4 nozzle;Anycubic PLA @Anycubic Kobra 3 V2 0.6 nozzle;Anycubic PLA @Anycubic Kobra 3 V2 0.8 nozzle" +} diff --git a/resources/profiles/Anycubic/process/0.08mm Standard @Anycubic Kobra 3 V2 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.08mm Standard @Anycubic Kobra 3 V2 0.4 nozzle.json new file mode 100644 index 0000000000..511a72b1ad --- /dev/null +++ b/resources/profiles/Anycubic/process/0.08mm Standard @Anycubic Kobra 3 V2 0.4 nozzle.json @@ -0,0 +1,289 @@ +{ + "type": "process", + "name": "0.08mm Standard @Anycubic Kobra 3 V2 0.4 nozzle", + "inherits": "fdm_process_common", + "from": "system", + "setting_id": "9yiDozcVDSxKkz4V", + "instantiation": "true", + "print_settings_id": "0.08mm Standard @Anycubic Kobra 3 V2 0.4 nozzle", + "layer_height": "0.08", + "filename_format": "{timestamp}-{if plate_name==\"\" then input_filename_base+\"_plate\" else plate_name endif}{\"(\"+plate_number+\")\"}_{filament_type[initial_tool]}_{layer_height}_{print_time}.gcode", + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.4 nozzle" + ], + "accel_to_decel_enable": "1", + "accel_to_decel_factor": "50%", + "alternate_extra_wall": "0", + "bottom_shell_layers": "7", + "bottom_shell_thickness": "0", + "bottom_solid_infill_flow_ratio": "1", + "bottom_surface_pattern": "monotonic", + "bridge_acceleration": "5000", + "bridge_angle": "0", + "bridge_density": "100%", + "bridge_flow": "1", + "bridge_no_support": "0", + "bridge_speed": "30", + "brim_ears_detection_length": "1", + "brim_ears_max_angle": "125", + "brim_object_gap": "0.15", + "brim_type": "auto_brim", + "brim_width": "5", + "compatible_printers_condition": "", + "counterbore_hole_bridging": "none", + "default_acceleration": "10000", + "default_jerk": "9", + "detect_narrow_internal_solid_infill": "1", + "detect_overhang_wall": "1", + "detect_thin_wall": "0", + "dont_filter_internal_bridges": "disabled", + "draft_shield": "disabled", + "elefant_foot_compensation": "0.1", + "elefant_foot_compensation_layers": "1", + "enable_arc_fitting": "0", + "enable_overhang_speed": "1", + "enable_prime_tower": "1", + "enable_support": "0", + "enforce_support_layers": "0", + "ensure_vertical_shell_thickness": "ensure_all", + "exclude_object": "1", + "extra_perimeters_on_overhangs": "1", + "filter_out_gap_fill": "0", + "flush_into_infill": "0", + "flush_into_objects": "0", + "flush_into_support": "1", + "fuzzy_skin": "none", + "fuzzy_skin_first_layer": "0", + "fuzzy_skin_point_distance": "0.8", + "fuzzy_skin_thickness": "0.3", + "gap_fill_target": "topbottom", + "gap_infill_speed": "250", + "gcode_add_line_number": "0", + "gcode_comments": "0", + "gcode_label_objects": "1", + "hole_to_polyhole": "0", + "hole_to_polyhole_threshold": "0.01", + "hole_to_polyhole_twisted": "1", + "independent_support_layer_height": "1", + "infill_anchor": "400", + "infill_anchor_max": "20", + "infill_combination": "0", + "infill_direction": "45", + "infill_jerk": "9", + "infill_wall_overlap": "15%", + "initial_layer_acceleration": "500", + "initial_layer_infill_speed": "45", + "initial_layer_jerk": "9", + "initial_layer_line_width": "0.5", + "initial_layer_min_bead_width": "85%", + "initial_layer_print_height": "0.2", + "initial_layer_speed": "45", + "initial_layer_travel_speed": "100%", + "inner_wall_acceleration": "6000", + "inner_wall_jerk": "9", + "inner_wall_line_width": "0.45", + "inner_wall_speed": "350", + "interface_shells": "0", + "internal_bridge_flow": "1", + "internal_bridge_speed": "150%", + "internal_solid_infill_acceleration": "5000", + "internal_solid_infill_line_width": "0.42", + "internal_solid_infill_pattern": "zig-zag", + "internal_solid_infill_speed": "200", + "ironing_angle": "-1", + "ironing_flow": "8%", + "ironing_pattern": "zig-zag", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "ironing_type": "no ironing", + "is_infill_first": "0", + "line_width": "0.42", + "make_overhang_printable": "0", + "make_overhang_printable_angle": "55", + "make_overhang_printable_hole_size": "0", + "max_bridge_length": "10", + "max_travel_detour_distance": "0", + "max_volumetric_extrusion_rate_slope": "0", + "max_volumetric_extrusion_rate_slope_segment_length": "3", + "min_bead_width": "85%", + "min_feature_size": "25%", + "min_length_factor": "0.5", + "min_width_top_surface": "300%", + "minimum_sparse_infill_area": "15", + "mmu_segmented_region_interlocking_depth": "0", + "mmu_segmented_region_max_width": "0", + "notes": "", + "only_one_wall_first_layer": "0", + "only_one_wall_top": "1", + "ooze_prevention": "0", + "outer_wall_acceleration": "5000", + "outer_wall_jerk": "9", + "outer_wall_line_width": "0.42", + "outer_wall_speed": "200", + "overhang_1_4_speed": "60", + "overhang_2_4_speed": "30", + "overhang_3_4_speed": "10", + "overhang_4_4_speed": "10", + "overhang_reverse": "0", + "overhang_reverse_internal_only": "0", + "overhang_reverse_threshold": "50%", + "post_process": [], + "precise_outer_wall": "0", + "precise_z_height": "0", + "prime_tower_brim_width": "5", + "prime_tower_width": "35", + "prime_volume": "20", + "print_flow_ratio": "1", + "print_order": "default", + "print_sequence": "by layer", + "raft_contact_distance": "0.1", + "raft_expansion": "1.5", + "raft_first_layer_density": "90%", + "raft_first_layer_expansion": "5", + "raft_layers": "0", + "reduce_crossing_wall": "0", + "reduce_infill_retraction": "1", + "resolution": "0.012", + "role_based_wipe_speed": "1", + "rotate_solid_infill_direction": "1", + "scarf_angle_threshold": "155", + "scarf_joint_flow_ratio": "1", + "scarf_joint_speed": "30", + "scarf_overhang_threshold": "40%", + "seam_gap": "10%", + "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_entire_loop": "0", + "seam_slope_inner_walls": "1", + "seam_slope_min_length": "10", + "seam_slope_start_height": "10%", + "seam_slope_steps": "10", + "seam_slope_type": "none", + "single_extruder_multi_material_priming": "0", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "0", + "skirt_speed": "50", + "slice_closing_radius": "0.049", + "slicing_mode": "regular", + "slow_down_layers": "1", + "slowdown_for_curled_perimeters": "0", + "small_area_infill_flow_compensation": "0", + "small_area_infill_flow_compensation_model": [ + "0,0", + "\n0.2,0.4444", + "\n0.4,0.6145", + "\n0.6,0.7059", + "\n0.8,0.7619", + "\n1.5,0.8571", + "\n2,0.8889", + "\n3,0.9231", + "\n5,0.9520", + "\n10,1" + ], + "small_perimeter_speed": "50%", + "small_perimeter_threshold": "0", + "solid_infill_direction": "45", + "solid_infill_filament": "1", + "sparse_infill_acceleration": "10000", + "sparse_infill_density": "15%", + "sparse_infill_filament": "1", + "sparse_infill_line_width": "0.45", + "sparse_infill_pattern": "grid", + "sparse_infill_speed": "450", + "spiral_mode": "0", + "spiral_mode_max_xy_smoothing": "200%", + "spiral_mode_smooth": "0", + "staggered_inner_seams": "0", + "standby_temperature_delta": "0", + "support_angle": "0", + "support_base_pattern": "default", + "support_base_pattern_spacing": "0.2", + "support_bottom_interface_spacing": "0.5", + "support_bottom_z_distance": "0.08", + "support_critical_regions_only": "0", + "support_expansion": "0", + "support_filament": "0", + "support_interface_bottom_layers": "-1", + "support_interface_filament": "0", + "support_interface_loop_pattern": "0", + "support_interface_not_for_body": "1", + "support_interface_pattern": "auto", + "support_interface_spacing": "0.2", + "support_interface_speed": "100%", + "support_interface_top_layers": "2", + "support_line_width": "0.42", + "support_object_xy_distance": "60%", + "support_on_build_plate_only": "1", + "support_remove_small_overhang": "1", + "support_speed": "100", + "support_style": "default", + "support_threshold_angle": "15", + "support_top_z_distance": "0.08", + "support_type": "tree(auto)", + "thick_bridges": "0", + "thick_internal_bridges": "1", + "timelapse_type": "0", + "top_bottom_infill_wall_overlap": "15%", + "top_shell_layers": "9", + "top_shell_thickness": "0.8", + "top_solid_infill_flow_ratio": "0.97", + "top_surface_acceleration": "2000", + "top_surface_jerk": "9", + "top_surface_line_width": "0.42", + "top_surface_pattern": "monotonicline", + "top_surface_speed": "200", + "travel_acceleration": "10000", + "travel_jerk": "9", + "travel_speed": "350", + "travel_speed_z": "0", + "tree_support_adaptive_layer_height": "1", + "tree_support_angle_slow": "25", + "tree_support_auto_brim": "1", + "tree_support_branch_angle": "40", + "tree_support_branch_angle_organic": "40", + "tree_support_branch_diameter": "5", + "tree_support_branch_diameter_angle": "5", + "tree_support_branch_diameter_double_wall": "3", + "tree_support_branch_diameter_organic": "2", + "tree_support_branch_distance": "5", + "tree_support_branch_distance_organic": "1", + "tree_support_brim_width": "3", + "tree_support_tip_diameter": "0.8", + "tree_support_top_rate": "30%", + "tree_support_wall_count": "0", + "wall_direction": "auto", + "wall_distribution_count": "1", + "wall_filament": "1", + "wall_generator": "classic", + "wall_infill_order": "inner wall/outer wall/infill", + "wall_loops": "2", + "wall_sequence": "inner wall/outer wall", + "wall_transition_angle": "10", + "wall_transition_filter_deviation": "25%", + "wall_transition_length": "100%", + "wipe_before_external_loop": "0", + "wipe_on_loops": "0", + "wipe_speed": "80%", + "wipe_tower_bridging": "10", + "wipe_tower_cone_angle": "15", + "wipe_tower_extra_spacing": "120%", + "wipe_tower_extruder": "0", + "wipe_tower_max_purge_speed": "90", + "wipe_tower_no_sparse_layers": "0", + "wipe_tower_rotation_angle": "0", + "wiping_volumes_extruders": [ + "70", + "70", + "70", + "70", + "70", + "70", + "70", + "70", + "70", + "70" + ], + "xy_contour_compensation": "0", + "xy_hole_compensation": "0" +} diff --git a/resources/profiles/Anycubic/process/0.10mm Standard @Anycubic Kobra 3 V2 0.2 nozzle.json b/resources/profiles/Anycubic/process/0.10mm Standard @Anycubic Kobra 3 V2 0.2 nozzle.json new file mode 100644 index 0000000000..7a92f74fc1 --- /dev/null +++ b/resources/profiles/Anycubic/process/0.10mm Standard @Anycubic Kobra 3 V2 0.2 nozzle.json @@ -0,0 +1,289 @@ +{ + "type": "process", + "name": "0.10mm Standard @Anycubic Kobra 3 V2 0.2 nozzle", + "inherits": "fdm_process_common", + "from": "system", + "setting_id": "eSyZsnWMuOyokoLr", + "instantiation": "true", + "print_settings_id": "0.10mm Standard @Anycubic Kobra 3 V2 0.2 nozzle", + "layer_height": "0.1", + "filename_format": "{timestamp}-{if plate_name==\"\" then input_filename_base+\"_plate\" else plate_name endif}{\"(\"+plate_number+\")\"}_{filament_type[initial_tool]}_{layer_height}_{print_time}.gcode", + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.2 nozzle" + ], + "accel_to_decel_enable": "1", + "accel_to_decel_factor": "50%", + "alternate_extra_wall": "0", + "bottom_shell_layers": "5", + "bottom_shell_thickness": "0", + "bottom_solid_infill_flow_ratio": "1", + "bottom_surface_pattern": "monotonic", + "bridge_acceleration": "50%", + "bridge_angle": "0", + "bridge_density": "100%", + "bridge_flow": "0.9", + "bridge_no_support": "0", + "bridge_speed": "30", + "brim_ears_detection_length": "1", + "brim_ears_max_angle": "125", + "brim_object_gap": "0.15", + "brim_type": "outer_only", + "brim_width": "5", + "compatible_printers_condition": "", + "counterbore_hole_bridging": "none", + "default_acceleration": "10000", + "default_jerk": "10", + "detect_narrow_internal_solid_infill": "1", + "detect_overhang_wall": "1", + "detect_thin_wall": "0", + "dont_filter_internal_bridges": "disabled", + "draft_shield": "disabled", + "elefant_foot_compensation": "0.075", + "elefant_foot_compensation_layers": "1", + "enable_arc_fitting": "0", + "enable_overhang_speed": "1", + "enable_prime_tower": "1", + "enable_support": "0", + "enforce_support_layers": "0", + "ensure_vertical_shell_thickness": "ensure_all", + "exclude_object": "1", + "extra_perimeters_on_overhangs": "1", + "filter_out_gap_fill": "0", + "flush_into_infill": "0", + "flush_into_objects": "0", + "flush_into_support": "0", + "fuzzy_skin": "none", + "fuzzy_skin_first_layer": "0", + "fuzzy_skin_point_distance": "0.8", + "fuzzy_skin_thickness": "0.3", + "gap_fill_target": "topbottom", + "gap_infill_speed": "100", + "gcode_add_line_number": "0", + "gcode_comments": "0", + "gcode_label_objects": "1", + "hole_to_polyhole": "0", + "hole_to_polyhole_threshold": "0.01", + "hole_to_polyhole_twisted": "1", + "independent_support_layer_height": "1", + "infill_anchor": "400", + "infill_anchor_max": "10", + "infill_combination": "0", + "infill_direction": "45", + "infill_jerk": "9", + "infill_wall_overlap": "15%", + "initial_layer_acceleration": "500", + "initial_layer_infill_speed": "30", + "initial_layer_jerk": "9", + "initial_layer_line_width": "0.25", + "initial_layer_min_bead_width": "85%", + "initial_layer_print_height": "0.1", + "initial_layer_speed": "30", + "initial_layer_travel_speed": "100%", + "inner_wall_acceleration": "6000", + "inner_wall_jerk": "10", + "inner_wall_line_width": "0.22", + "inner_wall_speed": "150", + "interface_shells": "0", + "internal_bridge_flow": "1", + "internal_bridge_speed": "150%", + "internal_solid_infill_acceleration": "100%", + "internal_solid_infill_line_width": "0.22", + "internal_solid_infill_pattern": "zig-zag", + "internal_solid_infill_speed": "120", + "ironing_angle": "-1", + "ironing_flow": "15%", + "ironing_pattern": "zig-zag", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "ironing_type": "no ironing", + "is_infill_first": "0", + "line_width": "0.22", + "make_overhang_printable": "0", + "make_overhang_printable_angle": "55", + "make_overhang_printable_hole_size": "0", + "max_bridge_length": "10", + "max_travel_detour_distance": "0", + "max_volumetric_extrusion_rate_slope": "0", + "max_volumetric_extrusion_rate_slope_segment_length": "5", + "min_bead_width": "85%", + "min_feature_size": "25%", + "min_length_factor": "0.5", + "min_width_top_surface": "300%", + "minimum_sparse_infill_area": "15", + "mmu_segmented_region_interlocking_depth": "0", + "mmu_segmented_region_max_width": "0", + "notes": "", + "only_one_wall_first_layer": "0", + "only_one_wall_top": "1", + "ooze_prevention": "0", + "outer_wall_acceleration": "5000", + "outer_wall_jerk": "10", + "outer_wall_line_width": "0.22", + "outer_wall_speed": "80", + "overhang_1_4_speed": "60", + "overhang_2_4_speed": "50", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "10", + "overhang_reverse": "0", + "overhang_reverse_internal_only": "0", + "overhang_reverse_threshold": "50%", + "post_process": [], + "precise_outer_wall": "0", + "precise_z_height": "0", + "prime_tower_brim_width": "5", + "prime_tower_width": "35", + "prime_volume": "20", + "print_flow_ratio": "1", + "print_order": "default", + "print_sequence": "by layer", + "raft_contact_distance": "0.1", + "raft_expansion": "1.5", + "raft_first_layer_density": "90%", + "raft_first_layer_expansion": "2", + "raft_layers": "0", + "reduce_crossing_wall": "0", + "reduce_infill_retraction": "1", + "resolution": "0.012", + "role_based_wipe_speed": "1", + "rotate_solid_infill_direction": "1", + "scarf_angle_threshold": "155", + "scarf_joint_flow_ratio": "1", + "scarf_joint_speed": "100%", + "scarf_overhang_threshold": "40%", + "seam_gap": "10%", + "seam_position": "aligned", + "seam_slope_conditional": "0", + "seam_slope_entire_loop": "0", + "seam_slope_inner_walls": "0", + "seam_slope_min_length": "20", + "seam_slope_start_height": "0", + "seam_slope_steps": "10", + "seam_slope_type": "none", + "single_extruder_multi_material_priming": "0", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "0", + "skirt_speed": "50", + "slice_closing_radius": "0.049", + "slicing_mode": "regular", + "slow_down_layers": "1", + "slowdown_for_curled_perimeters": "0", + "small_area_infill_flow_compensation": "0", + "small_area_infill_flow_compensation_model": [ + "0,0", + "\n0.2,0.4444", + "\n0.4,0.6145", + "\n0.6,0.7059", + "\n0.8,0.7619", + "\n1.5,0.8571", + "\n2,0.8889", + "\n3,0.9231", + "\n5,0.9520", + "\n10,1" + ], + "small_perimeter_speed": "50%", + "small_perimeter_threshold": "0", + "solid_infill_direction": "45", + "solid_infill_filament": "1", + "sparse_infill_acceleration": "100%", + "sparse_infill_density": "15%", + "sparse_infill_filament": "1", + "sparse_infill_line_width": "0.22", + "sparse_infill_pattern": "3dhoneycomb", + "sparse_infill_speed": "150", + "spiral_mode": "0", + "spiral_mode_max_xy_smoothing": "200%", + "spiral_mode_smooth": "0", + "staggered_inner_seams": "0", + "standby_temperature_delta": "0", + "support_angle": "0", + "support_base_pattern": "default", + "support_base_pattern_spacing": "0.2", + "support_bottom_interface_spacing": "0.5", + "support_bottom_z_distance": "0.1", + "support_critical_regions_only": "0", + "support_expansion": "0", + "support_filament": "0", + "support_interface_bottom_layers": "-1", + "support_interface_filament": "0", + "support_interface_loop_pattern": "0", + "support_interface_not_for_body": "1", + "support_interface_pattern": "auto", + "support_interface_spacing": "0.5", + "support_interface_speed": "80", + "support_interface_top_layers": "2", + "support_line_width": "0.22", + "support_object_xy_distance": "0.35", + "support_on_build_plate_only": "1", + "support_remove_small_overhang": "1", + "support_speed": "100", + "support_style": "default", + "support_threshold_angle": "40", + "support_top_z_distance": "0.1", + "support_type": "tree(auto)", + "thick_bridges": "0", + "thick_internal_bridges": "1", + "timelapse_type": "0", + "top_bottom_infill_wall_overlap": "25%", + "top_shell_layers": "7", + "top_shell_thickness": "0.8", + "top_solid_infill_flow_ratio": "0.97", + "top_surface_acceleration": "2000", + "top_surface_jerk": "9", + "top_surface_line_width": "0.22", + "top_surface_pattern": "monotonicline", + "top_surface_speed": "120", + "travel_acceleration": "15000", + "travel_jerk": "12", + "travel_speed": "350", + "travel_speed_z": "0", + "tree_support_adaptive_layer_height": "1", + "tree_support_angle_slow": "25", + "tree_support_auto_brim": "1", + "tree_support_branch_angle": "40", + "tree_support_branch_angle_organic": "40", + "tree_support_branch_diameter": "5", + "tree_support_branch_diameter_angle": "5", + "tree_support_branch_diameter_double_wall": "3", + "tree_support_branch_diameter_organic": "2", + "tree_support_branch_distance": "5", + "tree_support_branch_distance_organic": "1", + "tree_support_brim_width": "3", + "tree_support_tip_diameter": "0.8", + "tree_support_top_rate": "30%", + "tree_support_wall_count": "0", + "wall_direction": "auto", + "wall_distribution_count": "1", + "wall_filament": "1", + "wall_generator": "classic", + "wall_infill_order": "inner wall/outer wall/infill", + "wall_loops": "4", + "wall_sequence": "inner wall/outer wall", + "wall_transition_angle": "10", + "wall_transition_filter_deviation": "25%", + "wall_transition_length": "100%", + "wipe_before_external_loop": "0", + "wipe_on_loops": "0", + "wipe_speed": "80%", + "wipe_tower_bridging": "10", + "wipe_tower_cone_angle": "15", + "wipe_tower_extra_spacing": "120%", + "wipe_tower_extruder": "0", + "wipe_tower_max_purge_speed": "90", + "wipe_tower_no_sparse_layers": "0", + "wipe_tower_rotation_angle": "0", + "wiping_volumes_extruders": [ + "70", + "70", + "70", + "70", + "70", + "70", + "70", + "70", + "70", + "70" + ], + "xy_contour_compensation": "0", + "xy_hole_compensation": "0" +} diff --git a/resources/profiles/Anycubic/process/0.12mm High Quality @Anycubic Kobra 3 V2 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.12mm High Quality @Anycubic Kobra 3 V2 0.4 nozzle.json new file mode 100644 index 0000000000..7e4f2c0a00 --- /dev/null +++ b/resources/profiles/Anycubic/process/0.12mm High Quality @Anycubic Kobra 3 V2 0.4 nozzle.json @@ -0,0 +1,58 @@ +{ + "type": "process", + "name": "0.12mm High Quality @Anycubic Kobra 3 V2 0.4 nozzle", + "inherits": "0.12mm Standard @Anycubic Kobra 3 V2 0.4 nozzle", + "from": "system", + "setting_id": "HqXRokM0mAA691LV", + "instantiation": "true", + "print_settings_id": "0.12mm High Quality @Anycubic Kobra 3 V2 0.4 nozzle", + "layer_height": "0.12", + "filename_format": "{timestamp}-{if plate_name==\"\" then input_filename_base+\"_plate\" else plate_name endif}{\"(\"+plate_number+\")\"}_{filament_type[initial_tool]}_{layer_height}_{print_time}.gcode", + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.4 nozzle" + ], + "bottom_shell_thickness": "0", + "bridge_acceleration": "2000", + "bridge_speed": "30", + "brim_type": "auto_brim", + "default_acceleration": "5000", + "default_jerk": "9", + "gap_infill_speed": "180", + "initial_layer_infill_speed": "50", + "initial_layer_speed": "50", + "inner_wall_acceleration": "4000", + "inner_wall_jerk": "9", + "inner_wall_speed": "150", + "internal_solid_infill_acceleration": "5000", + "internal_solid_infill_speed": "180", + "ironing_flow": "10%", + "outer_wall_acceleration": "2000", + "outer_wall_jerk": "9", + "outer_wall_speed": "60", + "overhang_1_4_speed": "60", + "overhang_2_4_speed": "30", + "overhang_3_4_speed": "10", + "overhang_4_4_speed": "10", + "prime_tower_width": "35", + "raft_first_layer_expansion": "5", + "scarf_joint_flow_ratio": "1", + "scarf_joint_speed": "30", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_min_length": "10", + "seam_slope_start_height": "10%", + "small_perimeter_speed": "50%", + "sparse_infill_acceleration": "5000", + "sparse_infill_speed": "180", + "support_interface_top_layers": "2", + "support_threshold_angle": "20", + "top_bottom_infill_wall_overlap": "15%", + "top_solid_infill_flow_ratio": "0.97", + "top_surface_speed": "150", + "travel_acceleration": "5000", + "travel_jerk": "9", + "wall_loops": "2", + "wall_sequence": "inner wall/outer wall", + "wipe_on_loops": "0", + "wipe_tower_extra_spacing": "120%" +} diff --git a/resources/profiles/Anycubic/process/0.12mm Standard @Anycubic Kobra 3 V2 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.12mm Standard @Anycubic Kobra 3 V2 0.4 nozzle.json new file mode 100644 index 0000000000..0cb9844f79 --- /dev/null +++ b/resources/profiles/Anycubic/process/0.12mm Standard @Anycubic Kobra 3 V2 0.4 nozzle.json @@ -0,0 +1,289 @@ +{ + "type": "process", + "name": "0.12mm Standard @Anycubic Kobra 3 V2 0.4 nozzle", + "inherits": "fdm_process_common", + "from": "system", + "setting_id": "NCKx6glFcaEOhqZC", + "instantiation": "true", + "print_settings_id": "0.12mm Standard @Anycubic Kobra 3 V2 0.4 nozzle", + "layer_height": "0.12", + "filename_format": "{timestamp}-{if plate_name==\"\" then input_filename_base+\"_plate\" else plate_name endif}{\"(\"+plate_number+\")\"}_{filament_type[initial_tool]}_{layer_height}_{print_time}.gcode", + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.4 nozzle" + ], + "accel_to_decel_enable": "1", + "accel_to_decel_factor": "50%", + "alternate_extra_wall": "0", + "bottom_shell_layers": "5", + "bottom_shell_thickness": "0", + "bottom_solid_infill_flow_ratio": "1", + "bottom_surface_pattern": "monotonic", + "bridge_acceleration": "5000", + "bridge_angle": "0", + "bridge_density": "100%", + "bridge_flow": "0.9", + "bridge_no_support": "0", + "bridge_speed": "30", + "brim_ears_detection_length": "1", + "brim_ears_max_angle": "125", + "brim_object_gap": "0.15", + "brim_type": "auto_brim", + "brim_width": "5", + "compatible_printers_condition": "", + "counterbore_hole_bridging": "none", + "default_acceleration": "10000", + "default_jerk": "9", + "detect_narrow_internal_solid_infill": "1", + "detect_overhang_wall": "1", + "detect_thin_wall": "0", + "dont_filter_internal_bridges": "disabled", + "draft_shield": "disabled", + "elefant_foot_compensation": "0.1", + "elefant_foot_compensation_layers": "1", + "enable_arc_fitting": "0", + "enable_overhang_speed": "1", + "enable_prime_tower": "1", + "enable_support": "0", + "enforce_support_layers": "0", + "ensure_vertical_shell_thickness": "ensure_all", + "exclude_object": "1", + "extra_perimeters_on_overhangs": "1", + "filter_out_gap_fill": "0", + "flush_into_infill": "0", + "flush_into_objects": "0", + "flush_into_support": "1", + "fuzzy_skin": "none", + "fuzzy_skin_first_layer": "0", + "fuzzy_skin_point_distance": "0.8", + "fuzzy_skin_thickness": "0.3", + "gap_fill_target": "topbottom", + "gap_infill_speed": "350", + "gcode_add_line_number": "0", + "gcode_comments": "0", + "gcode_label_objects": "1", + "hole_to_polyhole": "0", + "hole_to_polyhole_threshold": "0.01", + "hole_to_polyhole_twisted": "1", + "independent_support_layer_height": "1", + "infill_anchor": "400", + "infill_anchor_max": "20", + "infill_combination": "0", + "infill_direction": "45", + "infill_jerk": "9", + "infill_wall_overlap": "15%", + "initial_layer_acceleration": "500", + "initial_layer_infill_speed": "45", + "initial_layer_jerk": "9", + "initial_layer_line_width": "0.5", + "initial_layer_min_bead_width": "85%", + "initial_layer_print_height": "0.2", + "initial_layer_speed": "45", + "initial_layer_travel_speed": "100%", + "inner_wall_acceleration": "6000", + "inner_wall_jerk": "9", + "inner_wall_line_width": "0.45", + "inner_wall_speed": "300", + "interface_shells": "0", + "internal_bridge_flow": "1", + "internal_bridge_speed": "150%", + "internal_solid_infill_acceleration": "5000", + "internal_solid_infill_line_width": "0.42", + "internal_solid_infill_pattern": "zig-zag", + "internal_solid_infill_speed": "200", + "ironing_angle": "-1", + "ironing_flow": "10%", + "ironing_pattern": "zig-zag", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "ironing_type": "no ironing", + "is_infill_first": "0", + "line_width": "0.42", + "make_overhang_printable": "0", + "make_overhang_printable_angle": "55", + "make_overhang_printable_hole_size": "0", + "max_bridge_length": "10", + "max_travel_detour_distance": "0", + "max_volumetric_extrusion_rate_slope": "0", + "max_volumetric_extrusion_rate_slope_segment_length": "5", + "min_bead_width": "85%", + "min_feature_size": "25%", + "min_length_factor": "0.5", + "min_width_top_surface": "300%", + "minimum_sparse_infill_area": "15", + "mmu_segmented_region_interlocking_depth": "0", + "mmu_segmented_region_max_width": "0", + "notes": "", + "only_one_wall_first_layer": "0", + "only_one_wall_top": "1", + "ooze_prevention": "0", + "outer_wall_acceleration": "5000", + "outer_wall_jerk": "9", + "outer_wall_line_width": "0.42", + "outer_wall_speed": "130", + "overhang_1_4_speed": "60", + "overhang_2_4_speed": "30", + "overhang_3_4_speed": "10", + "overhang_4_4_speed": "10", + "overhang_reverse": "0", + "overhang_reverse_internal_only": "0", + "overhang_reverse_threshold": "50%", + "post_process": [], + "precise_outer_wall": "0", + "precise_z_height": "0", + "prime_tower_brim_width": "5", + "prime_tower_width": "35", + "prime_volume": "20", + "print_flow_ratio": "1", + "print_order": "default", + "print_sequence": "by layer", + "raft_contact_distance": "0.1", + "raft_expansion": "1.5", + "raft_first_layer_density": "90%", + "raft_first_layer_expansion": "5", + "raft_layers": "0", + "reduce_crossing_wall": "0", + "reduce_infill_retraction": "1", + "resolution": "0.012", + "role_based_wipe_speed": "1", + "rotate_solid_infill_direction": "1", + "scarf_angle_threshold": "155", + "scarf_joint_flow_ratio": "1", + "scarf_joint_speed": "30", + "scarf_overhang_threshold": "40%", + "seam_gap": "10%", + "seam_position": "aligned", + "seam_slope_conditional": "0", + "seam_slope_entire_loop": "0", + "seam_slope_inner_walls": "1", + "seam_slope_min_length": "10", + "seam_slope_start_height": "10%", + "seam_slope_steps": "10", + "seam_slope_type": "none", + "single_extruder_multi_material_priming": "0", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "0", + "skirt_speed": "50", + "slice_closing_radius": "0.049", + "slicing_mode": "regular", + "slow_down_layers": "1", + "slowdown_for_curled_perimeters": "0", + "small_area_infill_flow_compensation": "0", + "small_area_infill_flow_compensation_model": [ + "0,0", + "\n0.2,0.4444", + "\n0.4,0.6145", + "\n0.6,0.7059", + "\n0.8,0.7619", + "\n1.5,0.8571", + "\n2,0.8889", + "\n3,0.9231", + "\n5,0.9520", + "\n10,1" + ], + "small_perimeter_speed": "30%", + "small_perimeter_threshold": "0", + "solid_infill_direction": "45", + "solid_infill_filament": "1", + "sparse_infill_acceleration": "10000", + "sparse_infill_density": "15%", + "sparse_infill_filament": "1", + "sparse_infill_line_width": "0.45", + "sparse_infill_pattern": "3dhoneycomb", + "sparse_infill_speed": "430", + "spiral_mode": "0", + "spiral_mode_max_xy_smoothing": "200%", + "spiral_mode_smooth": "0", + "staggered_inner_seams": "0", + "standby_temperature_delta": "0", + "support_angle": "0", + "support_base_pattern": "default", + "support_base_pattern_spacing": "0.2", + "support_bottom_interface_spacing": "0.5", + "support_bottom_z_distance": "0.12", + "support_critical_regions_only": "0", + "support_expansion": "0", + "support_filament": "0", + "support_interface_bottom_layers": "-1", + "support_interface_filament": "0", + "support_interface_loop_pattern": "0", + "support_interface_not_for_body": "1", + "support_interface_pattern": "auto", + "support_interface_spacing": "0.2", + "support_interface_speed": "100%", + "support_interface_top_layers": "3", + "support_line_width": "0.42", + "support_object_xy_distance": "60%", + "support_on_build_plate_only": "1", + "support_remove_small_overhang": "1", + "support_speed": "100", + "support_style": "default", + "support_threshold_angle": "20", + "support_top_z_distance": "0.12", + "support_type": "tree(auto)", + "thick_bridges": "0", + "thick_internal_bridges": "1", + "timelapse_type": "0", + "top_bottom_infill_wall_overlap": "15%", + "top_shell_layers": "5", + "top_shell_thickness": "0.6", + "top_solid_infill_flow_ratio": "0.97", + "top_surface_acceleration": "2000", + "top_surface_jerk": "9", + "top_surface_line_width": "0.42", + "top_surface_pattern": "monotonicline", + "top_surface_speed": "200", + "travel_acceleration": "10000", + "travel_jerk": "9", + "travel_speed": "350", + "travel_speed_z": "0", + "tree_support_adaptive_layer_height": "1", + "tree_support_angle_slow": "25", + "tree_support_auto_brim": "1", + "tree_support_branch_angle": "40", + "tree_support_branch_angle_organic": "40", + "tree_support_branch_diameter": "5", + "tree_support_branch_diameter_angle": "5", + "tree_support_branch_diameter_double_wall": "3", + "tree_support_branch_diameter_organic": "2", + "tree_support_branch_distance": "5", + "tree_support_branch_distance_organic": "1", + "tree_support_brim_width": "3", + "tree_support_tip_diameter": "0.8", + "tree_support_top_rate": "30%", + "tree_support_wall_count": "0", + "wall_direction": "auto", + "wall_distribution_count": "1", + "wall_filament": "1", + "wall_generator": "classic", + "wall_infill_order": "inner wall/outer wall/infill", + "wall_loops": "2", + "wall_sequence": "inner wall/outer wall", + "wall_transition_angle": "10", + "wall_transition_filter_deviation": "25%", + "wall_transition_length": "100%", + "wipe_before_external_loop": "0", + "wipe_on_loops": "0", + "wipe_speed": "80%", + "wipe_tower_bridging": "10", + "wipe_tower_cone_angle": "15", + "wipe_tower_extra_spacing": "120%", + "wipe_tower_extruder": "0", + "wipe_tower_max_purge_speed": "90", + "wipe_tower_no_sparse_layers": "0", + "wipe_tower_rotation_angle": "0", + "wiping_volumes_extruders": [ + "70", + "70", + "70", + "70", + "70", + "70", + "70", + "70", + "70", + "70" + ], + "xy_contour_compensation": "0", + "xy_hole_compensation": "0" +} diff --git a/resources/profiles/Anycubic/process/0.16mm High Quality @Anycubic Kobra 3 V2 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.16mm High Quality @Anycubic Kobra 3 V2 0.4 nozzle.json new file mode 100644 index 0000000000..8927b82909 --- /dev/null +++ b/resources/profiles/Anycubic/process/0.16mm High Quality @Anycubic Kobra 3 V2 0.4 nozzle.json @@ -0,0 +1,51 @@ +{ + "type": "process", + "name": "0.16mm High Quality @Anycubic Kobra 3 V2 0.4 nozzle", + "inherits": "0.16mm Standard @Anycubic Kobra 3 V2 0.4 nozzle", + "from": "system", + "setting_id": "mVDCX89vYKfBA57g", + "instantiation": "true", + "print_settings_id": "0.16mm High Quality @Anycubic Kobra 3 V2 0.4 nozzle", + "layer_height": "0.16", + "filename_format": "{timestamp}-{if plate_name==\"\" then input_filename_base+\"_plate\" else plate_name endif}{\"(\"+plate_number+\")\"}_{filament_type[initial_tool]}_{layer_height}_{print_time}.gcode", + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.4 nozzle" + ], + "bottom_shell_thickness": "0", + "bridge_acceleration": "2000", + "default_acceleration": "4000", + "default_jerk": "9", + "infill_anchor_max": "20", + "initial_layer_infill_speed": "50", + "initial_layer_speed": "50", + "inner_wall_acceleration": "4000", + "inner_wall_jerk": "9", + "internal_solid_infill_acceleration": "4000", + "internal_solid_infill_speed": "200", + "outer_wall_acceleration": "2000", + "outer_wall_jerk": "9", + "outer_wall_speed": "150", + "overhang_1_4_speed": "60", + "overhang_3_4_speed": "10", + "overhang_4_4_speed": "10", + "prime_tower_width": "30", + "raft_first_layer_expansion": "5", + "scarf_joint_flow_ratio": "1", + "scarf_joint_speed": "30", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_min_length": "10", + "seam_slope_start_height": "10%", + "small_perimeter_speed": "50%", + "sparse_infill_acceleration": "4000", + "sparse_infill_speed": "200", + "support_line_width": "0.42", + "support_threshold_angle": "25", + "top_bottom_infill_wall_overlap": "15%", + "travel_acceleration": "4000", + "travel_jerk": "9", + "wall_loops": "2", + "wall_sequence": "inner wall/outer wall", + "wipe_on_loops": "0", + "wipe_tower_extra_spacing": "120%" +} diff --git a/resources/profiles/Anycubic/process/0.16mm Standard @Anycubic Kobra 3 V2 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.16mm Standard @Anycubic Kobra 3 V2 0.4 nozzle.json new file mode 100644 index 0000000000..d63e7aef13 --- /dev/null +++ b/resources/profiles/Anycubic/process/0.16mm Standard @Anycubic Kobra 3 V2 0.4 nozzle.json @@ -0,0 +1,289 @@ +{ + "type": "process", + "name": "0.16mm Standard @Anycubic Kobra 3 V2 0.4 nozzle", + "inherits": "fdm_process_common", + "from": "system", + "setting_id": "ut3FZjM7h3doFjRg", + "instantiation": "true", + "print_settings_id": "0.16mm Standard @Anycubic Kobra 3 V2 0.4 nozzle", + "layer_height": "0.16", + "filename_format": "{timestamp}-{if plate_name==\"\" then input_filename_base+\"_plate\" else plate_name endif}{\"(\"+plate_number+\")\"}_{filament_type[initial_tool]}_{layer_height}_{print_time}.gcode", + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.4 nozzle" + ], + "accel_to_decel_enable": "1", + "accel_to_decel_factor": "50%", + "alternate_extra_wall": "0", + "bottom_shell_layers": "4", + "bottom_shell_thickness": "0", + "bottom_solid_infill_flow_ratio": "1", + "bottom_surface_pattern": "monotonic", + "bridge_acceleration": "5000", + "bridge_angle": "0", + "bridge_density": "100%", + "bridge_flow": "0.9", + "bridge_no_support": "0", + "bridge_speed": "30", + "brim_ears_detection_length": "1", + "brim_ears_max_angle": "125", + "brim_object_gap": "0.15", + "brim_type": "auto_brim", + "brim_width": "5", + "compatible_printers_condition": "", + "counterbore_hole_bridging": "none", + "default_acceleration": "10000", + "default_jerk": "9", + "detect_narrow_internal_solid_infill": "1", + "detect_overhang_wall": "1", + "detect_thin_wall": "0", + "dont_filter_internal_bridges": "disabled", + "draft_shield": "disabled", + "elefant_foot_compensation": "0.1", + "elefant_foot_compensation_layers": "1", + "enable_arc_fitting": "0", + "enable_overhang_speed": "1", + "enable_prime_tower": "1", + "enable_support": "0", + "enforce_support_layers": "0", + "ensure_vertical_shell_thickness": "ensure_all", + "exclude_object": "1", + "extra_perimeters_on_overhangs": "1", + "filter_out_gap_fill": "0", + "flush_into_infill": "0", + "flush_into_objects": "0", + "flush_into_support": "1", + "fuzzy_skin": "none", + "fuzzy_skin_first_layer": "0", + "fuzzy_skin_point_distance": "0.8", + "fuzzy_skin_thickness": "0.3", + "gap_fill_target": "topbottom", + "gap_infill_speed": "250", + "gcode_add_line_number": "0", + "gcode_comments": "0", + "gcode_label_objects": "1", + "hole_to_polyhole": "0", + "hole_to_polyhole_threshold": "0.01", + "hole_to_polyhole_twisted": "1", + "independent_support_layer_height": "1", + "infill_anchor": "400", + "infill_anchor_max": "20", + "infill_combination": "0", + "infill_direction": "45", + "infill_jerk": "9", + "infill_wall_overlap": "15%", + "initial_layer_acceleration": "500", + "initial_layer_infill_speed": "45", + "initial_layer_jerk": "9", + "initial_layer_line_width": "0.5", + "initial_layer_min_bead_width": "85%", + "initial_layer_print_height": "0.2", + "initial_layer_speed": "45", + "initial_layer_travel_speed": "100%", + "inner_wall_acceleration": "6000", + "inner_wall_jerk": "9", + "inner_wall_line_width": "0.45", + "inner_wall_speed": "200", + "interface_shells": "0", + "internal_bridge_flow": "1", + "internal_bridge_speed": "150%", + "internal_solid_infill_acceleration": "10000", + "internal_solid_infill_line_width": "0.42", + "internal_solid_infill_pattern": "zig-zag", + "internal_solid_infill_speed": "150", + "ironing_angle": "-1", + "ironing_flow": "10%", + "ironing_pattern": "zig-zag", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "ironing_type": "no ironing", + "is_infill_first": "0", + "line_width": "0.42", + "make_overhang_printable": "0", + "make_overhang_printable_angle": "55", + "make_overhang_printable_hole_size": "0", + "max_bridge_length": "10", + "max_travel_detour_distance": "0", + "max_volumetric_extrusion_rate_slope": "0", + "max_volumetric_extrusion_rate_slope_segment_length": "5", + "min_bead_width": "85%", + "min_feature_size": "25%", + "min_length_factor": "0.5", + "min_width_top_surface": "300%", + "minimum_sparse_infill_area": "15", + "mmu_segmented_region_interlocking_depth": "0", + "mmu_segmented_region_max_width": "0", + "notes": "", + "only_one_wall_first_layer": "0", + "only_one_wall_top": "1", + "ooze_prevention": "0", + "outer_wall_acceleration": "5000", + "outer_wall_jerk": "9", + "outer_wall_line_width": "0.42", + "outer_wall_speed": "130", + "overhang_1_4_speed": "60", + "overhang_2_4_speed": "30", + "overhang_3_4_speed": "10", + "overhang_4_4_speed": "10", + "overhang_reverse": "0", + "overhang_reverse_internal_only": "0", + "overhang_reverse_threshold": "50%", + "post_process": [], + "precise_outer_wall": "0", + "precise_z_height": "0", + "prime_tower_brim_width": "5", + "prime_tower_width": "35", + "prime_volume": "20", + "print_flow_ratio": "1", + "print_order": "default", + "print_sequence": "by layer", + "raft_contact_distance": "0.1", + "raft_expansion": "1.5", + "raft_first_layer_density": "90%", + "raft_first_layer_expansion": "5", + "raft_layers": "0", + "reduce_crossing_wall": "0", + "reduce_infill_retraction": "1", + "resolution": "0.012", + "role_based_wipe_speed": "1", + "rotate_solid_infill_direction": "1", + "scarf_angle_threshold": "155", + "scarf_joint_flow_ratio": "1", + "scarf_joint_speed": "30", + "scarf_overhang_threshold": "40%", + "seam_gap": "10%", + "seam_position": "aligned", + "seam_slope_conditional": "0", + "seam_slope_entire_loop": "0", + "seam_slope_inner_walls": "1", + "seam_slope_min_length": "10", + "seam_slope_start_height": "10%", + "seam_slope_steps": "10", + "seam_slope_type": "none", + "single_extruder_multi_material_priming": "0", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "0", + "skirt_speed": "50", + "slice_closing_radius": "0.049", + "slicing_mode": "regular", + "slow_down_layers": "1", + "slowdown_for_curled_perimeters": "0", + "small_area_infill_flow_compensation": "0", + "small_area_infill_flow_compensation_model": [ + "0,0", + "\n0.2,0.4444", + "\n0.4,0.6145", + "\n0.6,0.7059", + "\n0.8,0.7619", + "\n1.5,0.8571", + "\n2,0.8889", + "\n3,0.9231", + "\n5,0.9520", + "\n10,1" + ], + "small_perimeter_speed": "30%", + "small_perimeter_threshold": "0", + "solid_infill_direction": "45", + "solid_infill_filament": "1", + "sparse_infill_acceleration": "5000", + "sparse_infill_density": "15%", + "sparse_infill_filament": "1", + "sparse_infill_line_width": "0.45", + "sparse_infill_pattern": "3dhoneycomb", + "sparse_infill_speed": "300", + "spiral_mode": "0", + "spiral_mode_max_xy_smoothing": "200%", + "spiral_mode_smooth": "0", + "staggered_inner_seams": "0", + "standby_temperature_delta": "0", + "support_angle": "0", + "support_base_pattern": "default", + "support_base_pattern_spacing": "0.2", + "support_bottom_interface_spacing": "0.5", + "support_bottom_z_distance": "0.16", + "support_critical_regions_only": "0", + "support_expansion": "0", + "support_filament": "0", + "support_interface_bottom_layers": "-1", + "support_interface_filament": "0", + "support_interface_loop_pattern": "0", + "support_interface_not_for_body": "1", + "support_interface_pattern": "auto", + "support_interface_spacing": "0.2", + "support_interface_speed": "100%", + "support_interface_top_layers": "2", + "support_line_width": "0.42", + "support_object_xy_distance": "60%", + "support_on_build_plate_only": "1", + "support_remove_small_overhang": "1", + "support_speed": "100", + "support_style": "default", + "support_threshold_angle": "25", + "support_top_z_distance": "0.16", + "support_type": "tree(auto)", + "thick_bridges": "0", + "thick_internal_bridges": "1", + "timelapse_type": "0", + "top_bottom_infill_wall_overlap": "15%", + "top_shell_layers": "6", + "top_shell_thickness": "1", + "top_solid_infill_flow_ratio": "0.97", + "top_surface_acceleration": "2000", + "top_surface_jerk": "9", + "top_surface_line_width": "0.42", + "top_surface_pattern": "monotonicline", + "top_surface_speed": "150", + "travel_acceleration": "10000", + "travel_jerk": "9", + "travel_speed": "350", + "travel_speed_z": "0", + "tree_support_adaptive_layer_height": "1", + "tree_support_angle_slow": "25", + "tree_support_auto_brim": "1", + "tree_support_branch_angle": "40", + "tree_support_branch_angle_organic": "40", + "tree_support_branch_diameter": "5", + "tree_support_branch_diameter_angle": "5", + "tree_support_branch_diameter_double_wall": "3", + "tree_support_branch_diameter_organic": "2", + "tree_support_branch_distance": "5", + "tree_support_branch_distance_organic": "1", + "tree_support_brim_width": "3", + "tree_support_tip_diameter": "0.8", + "tree_support_top_rate": "30%", + "tree_support_wall_count": "0", + "wall_direction": "auto", + "wall_distribution_count": "1", + "wall_filament": "1", + "wall_generator": "classic", + "wall_infill_order": "inner wall/outer wall/infill", + "wall_loops": "2", + "wall_sequence": "inner wall/outer wall", + "wall_transition_angle": "10", + "wall_transition_filter_deviation": "25%", + "wall_transition_length": "100%", + "wipe_before_external_loop": "0", + "wipe_on_loops": "0", + "wipe_speed": "80%", + "wipe_tower_bridging": "10", + "wipe_tower_cone_angle": "15", + "wipe_tower_extra_spacing": "120%", + "wipe_tower_extruder": "0", + "wipe_tower_max_purge_speed": "90", + "wipe_tower_no_sparse_layers": "0", + "wipe_tower_rotation_angle": "0", + "wiping_volumes_extruders": [ + "70", + "70", + "70", + "70", + "70", + "70", + "70", + "70", + "70", + "70" + ], + "xy_contour_compensation": "0", + "xy_hole_compensation": "0" +} diff --git a/resources/profiles/Anycubic/process/0.20mm High Quality @Anycubic Kobra 3 V2 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.20mm High Quality @Anycubic Kobra 3 V2 0.4 nozzle.json new file mode 100644 index 0000000000..a20341393e --- /dev/null +++ b/resources/profiles/Anycubic/process/0.20mm High Quality @Anycubic Kobra 3 V2 0.4 nozzle.json @@ -0,0 +1,57 @@ +{ + "type": "process", + "name": "0.20mm High Quality @Anycubic Kobra 3 V2 0.4 nozzle", + "inherits": "0.20mm Standard @Anycubic Kobra 3 V2 0.4 nozzle", + "from": "system", + "setting_id": "V7T6yBxuQzWucCpA", + "instantiation": "true", + "print_settings_id": "0.20mm High Quality @Anycubic Kobra 3 V2 0.4 nozzle", + "layer_height": "0.2", + "filename_format": "{timestamp}-{if plate_name==\"\" then input_filename_base+\"_plate\" else plate_name endif}{\"(\"+plate_number+\")\"}_{filament_type[initial_tool]}_{layer_height}_{print_time}.gcode", + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.4 nozzle" + ], + "accel_to_decel_enable": "1", + "bottom_shell_thickness": "0", + "bridge_acceleration": "4000", + "bridge_speed": "50", + "brim_object_gap": "0.1", + "brim_width": "5", + "default_acceleration": "4000", + "default_jerk": "9", + "initial_layer_infill_speed": "50", + "initial_layer_speed": "50", + "inner_wall_acceleration": "4000", + "inner_wall_jerk": "9", + "inner_wall_speed": "150", + "internal_solid_infill_acceleration": "4000", + "internal_solid_infill_speed": "250", + "ironing_flow": "10%", + "outer_wall_acceleration": "2000", + "outer_wall_jerk": "9", + "outer_wall_speed": "60", + "overhang_4_4_speed": "10", + "prime_tower_width": "30", + "raft_first_layer_expansion": "5", + "scarf_joint_flow_ratio": "1", + "scarf_joint_speed": "30", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_min_length": "10", + "seam_slope_start_height": "10%", + "sparse_infill_acceleration": "4000", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "3dhoneycomb", + "sparse_infill_speed": "270", + "support_line_width": "0.42", + "support_threshold_angle": "30", + "top_bottom_infill_wall_overlap": "15%", + "top_solid_infill_flow_ratio": "0.97", + "top_surface_speed": "200", + "travel_acceleration": "4000", + "travel_jerk": "9", + "wall_loops": "2", + "wall_sequence": "inner wall/outer wall", + "wipe_on_loops": "0", + "wipe_tower_extra_spacing": "120%" +} diff --git a/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 3 V2 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 3 V2 0.4 nozzle.json new file mode 100644 index 0000000000..c3c4c21855 --- /dev/null +++ b/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 3 V2 0.4 nozzle.json @@ -0,0 +1,289 @@ +{ + "type": "process", + "name": "0.20mm Standard @Anycubic Kobra 3 V2 0.4 nozzle", + "inherits": "fdm_process_common", + "from": "system", + "setting_id": "K5se4jnf2XHJNkEQ", + "instantiation": "true", + "print_settings_id": "0.20mm Standard @Anycubic Kobra 3 V2 0.4 nozzle", + "layer_height": "0.2", + "filename_format": "{timestamp}-{if plate_name==\"\" then input_filename_base+\"_plate\" else plate_name endif}{\"(\"+plate_number+\")\"}_{filament_type[initial_tool]}_{layer_height}_{print_time}.gcode", + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.4 nozzle" + ], + "accel_to_decel_enable": "1", + "accel_to_decel_factor": "50%", + "alternate_extra_wall": "0", + "bottom_shell_layers": "3", + "bottom_shell_thickness": "0", + "bottom_solid_infill_flow_ratio": "1", + "bottom_surface_pattern": "monotonic", + "bridge_acceleration": "5000", + "bridge_angle": "0", + "bridge_density": "100%", + "bridge_flow": "0.9", + "bridge_no_support": "0", + "bridge_speed": "30", + "brim_ears_detection_length": "1", + "brim_ears_max_angle": "125", + "brim_object_gap": "0.15", + "brim_type": "auto_brim", + "brim_width": "5", + "compatible_printers_condition": "", + "counterbore_hole_bridging": "none", + "default_acceleration": "10000", + "default_jerk": "9", + "detect_narrow_internal_solid_infill": "1", + "detect_overhang_wall": "1", + "detect_thin_wall": "0", + "dont_filter_internal_bridges": "disabled", + "draft_shield": "disabled", + "elefant_foot_compensation": "0.1", + "elefant_foot_compensation_layers": "1", + "enable_arc_fitting": "0", + "enable_overhang_speed": "1", + "enable_prime_tower": "1", + "enable_support": "0", + "enforce_support_layers": "0", + "ensure_vertical_shell_thickness": "ensure_all", + "exclude_object": "1", + "extra_perimeters_on_overhangs": "1", + "filter_out_gap_fill": "0", + "flush_into_infill": "0", + "flush_into_objects": "0", + "flush_into_support": "1", + "fuzzy_skin": "none", + "fuzzy_skin_first_layer": "0", + "fuzzy_skin_point_distance": "0.8", + "fuzzy_skin_thickness": "0.3", + "gap_fill_target": "topbottom", + "gap_infill_speed": "250", + "gcode_add_line_number": "0", + "gcode_comments": "0", + "gcode_label_objects": "1", + "hole_to_polyhole": "0", + "hole_to_polyhole_threshold": "0.01", + "hole_to_polyhole_twisted": "1", + "independent_support_layer_height": "1", + "infill_anchor": "400", + "infill_anchor_max": "20", + "infill_combination": "0", + "infill_direction": "45", + "infill_jerk": "9", + "infill_wall_overlap": "15%", + "initial_layer_acceleration": "500", + "initial_layer_infill_speed": "45", + "initial_layer_jerk": "9", + "initial_layer_line_width": "0.5", + "initial_layer_min_bead_width": "85%", + "initial_layer_print_height": "0.2", + "initial_layer_speed": "45", + "initial_layer_travel_speed": "100%", + "inner_wall_acceleration": "6000", + "inner_wall_jerk": "9", + "inner_wall_line_width": "0.45", + "inner_wall_speed": "200", + "interface_shells": "0", + "internal_bridge_flow": "1", + "internal_bridge_speed": "150%", + "internal_solid_infill_acceleration": "10000", + "internal_solid_infill_line_width": "0.42", + "internal_solid_infill_pattern": "zig-zag", + "internal_solid_infill_speed": "130", + "ironing_angle": "-1", + "ironing_flow": "15%", + "ironing_pattern": "zig-zag", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "ironing_type": "no ironing", + "is_infill_first": "0", + "line_width": "0.42", + "make_overhang_printable": "0", + "make_overhang_printable_angle": "55", + "make_overhang_printable_hole_size": "0", + "max_bridge_length": "10", + "max_travel_detour_distance": "0", + "max_volumetric_extrusion_rate_slope": "0", + "max_volumetric_extrusion_rate_slope_segment_length": "5", + "min_bead_width": "85%", + "min_feature_size": "25%", + "min_length_factor": "0.5", + "min_width_top_surface": "300%", + "minimum_sparse_infill_area": "15", + "mmu_segmented_region_interlocking_depth": "0", + "mmu_segmented_region_max_width": "0", + "notes": "", + "only_one_wall_first_layer": "0", + "only_one_wall_top": "1", + "ooze_prevention": "0", + "outer_wall_acceleration": "5000", + "outer_wall_jerk": "9", + "outer_wall_line_width": "0.42", + "outer_wall_speed": "130", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "50", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "10", + "overhang_reverse": "0", + "overhang_reverse_internal_only": "0", + "overhang_reverse_threshold": "50%", + "post_process": [], + "precise_outer_wall": "0", + "precise_z_height": "0", + "prime_tower_brim_width": "5", + "prime_tower_width": "35", + "prime_volume": "20", + "print_flow_ratio": "1", + "print_order": "default", + "print_sequence": "by layer", + "raft_contact_distance": "0.1", + "raft_expansion": "1.5", + "raft_first_layer_density": "90%", + "raft_first_layer_expansion": "5", + "raft_layers": "0", + "reduce_crossing_wall": "0", + "reduce_infill_retraction": "1", + "resolution": "0.012", + "role_based_wipe_speed": "1", + "rotate_solid_infill_direction": "1", + "scarf_angle_threshold": "155", + "scarf_joint_flow_ratio": "1", + "scarf_joint_speed": "30", + "scarf_overhang_threshold": "40%", + "seam_gap": "10%", + "seam_position": "aligned", + "seam_slope_conditional": "0", + "seam_slope_entire_loop": "0", + "seam_slope_inner_walls": "0", + "seam_slope_min_length": "10", + "seam_slope_start_height": "10%", + "seam_slope_steps": "10", + "seam_slope_type": "none", + "single_extruder_multi_material_priming": "0", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "0", + "skirt_speed": "50", + "slice_closing_radius": "0.049", + "slicing_mode": "regular", + "slow_down_layers": "1", + "slowdown_for_curled_perimeters": "0", + "small_area_infill_flow_compensation": "0", + "small_area_infill_flow_compensation_model": [ + "0,0", + "\n0.2,0.4444", + "\n0.4,0.6145", + "\n0.6,0.7059", + "\n0.8,0.7619", + "\n1.5,0.8571", + "\n2,0.8889", + "\n3,0.9231", + "\n5,0.9520", + "\n10,1" + ], + "small_perimeter_speed": "30%", + "small_perimeter_threshold": "0", + "solid_infill_direction": "45", + "solid_infill_filament": "1", + "sparse_infill_acceleration": "5000", + "sparse_infill_density": "15%", + "sparse_infill_filament": "1", + "sparse_infill_line_width": "0.45", + "sparse_infill_pattern": "3dhoneycomb", + "sparse_infill_speed": "300", + "spiral_mode": "0", + "spiral_mode_max_xy_smoothing": "200%", + "spiral_mode_smooth": "0", + "staggered_inner_seams": "0", + "standby_temperature_delta": "0", + "support_angle": "0", + "support_base_pattern": "default", + "support_base_pattern_spacing": "0.2", + "support_bottom_interface_spacing": "0.5", + "support_bottom_z_distance": "0.2", + "support_critical_regions_only": "0", + "support_expansion": "0", + "support_filament": "0", + "support_interface_bottom_layers": "-1", + "support_interface_filament": "0", + "support_interface_loop_pattern": "0", + "support_interface_not_for_body": "1", + "support_interface_pattern": "auto", + "support_interface_spacing": "0.2", + "support_interface_speed": "100%", + "support_interface_top_layers": "2", + "support_line_width": "0.4", + "support_object_xy_distance": "60%", + "support_on_build_plate_only": "1", + "support_remove_small_overhang": "1", + "support_speed": "100", + "support_style": "default", + "support_threshold_angle": "30", + "support_top_z_distance": "0.25", + "support_type": "tree(auto)", + "thick_bridges": "0", + "thick_internal_bridges": "0", + "timelapse_type": "0", + "top_bottom_infill_wall_overlap": "15%", + "top_shell_layers": "5", + "top_shell_thickness": "1", + "top_solid_infill_flow_ratio": "0.97", + "top_surface_acceleration": "2000", + "top_surface_jerk": "9", + "top_surface_line_width": "0.42", + "top_surface_pattern": "monotonicline", + "top_surface_speed": "130", + "travel_acceleration": "10000", + "travel_jerk": "9", + "travel_speed": "350", + "travel_speed_z": "0", + "tree_support_adaptive_layer_height": "1", + "tree_support_angle_slow": "25", + "tree_support_auto_brim": "1", + "tree_support_branch_angle": "40", + "tree_support_branch_angle_organic": "40", + "tree_support_branch_diameter": "5", + "tree_support_branch_diameter_angle": "5", + "tree_support_branch_diameter_double_wall": "3", + "tree_support_branch_diameter_organic": "2", + "tree_support_branch_distance": "5", + "tree_support_branch_distance_organic": "1", + "tree_support_brim_width": "3", + "tree_support_tip_diameter": "0.8", + "tree_support_top_rate": "30%", + "tree_support_wall_count": "0", + "wall_direction": "auto", + "wall_distribution_count": "1", + "wall_filament": "1", + "wall_generator": "classic", + "wall_infill_order": "inner wall/outer wall/infill", + "wall_loops": "2", + "wall_sequence": "inner wall/outer wall", + "wall_transition_angle": "10", + "wall_transition_filter_deviation": "25%", + "wall_transition_length": "100%", + "wipe_before_external_loop": "0", + "wipe_on_loops": "0", + "wipe_speed": "80%", + "wipe_tower_bridging": "10", + "wipe_tower_cone_angle": "15", + "wipe_tower_extra_spacing": "120%", + "wipe_tower_extruder": "0", + "wipe_tower_max_purge_speed": "90", + "wipe_tower_no_sparse_layers": "0", + "wipe_tower_rotation_angle": "0", + "wiping_volumes_extruders": [ + "70", + "70", + "70", + "70", + "70", + "70", + "70", + "70", + "70", + "70" + ], + "xy_contour_compensation": "0", + "xy_hole_compensation": "0" +} diff --git a/resources/profiles/Anycubic/process/0.24mm Standard @Anycubic Kobra 3 V2 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.24mm Standard @Anycubic Kobra 3 V2 0.4 nozzle.json new file mode 100644 index 0000000000..7bf100714b --- /dev/null +++ b/resources/profiles/Anycubic/process/0.24mm Standard @Anycubic Kobra 3 V2 0.4 nozzle.json @@ -0,0 +1,289 @@ +{ + "type": "process", + "name": "0.24mm Standard @Anycubic Kobra 3 V2 0.4 nozzle", + "inherits": "fdm_process_common", + "from": "system", + "setting_id": "cg8f6Q9o8nRePSC9", + "instantiation": "true", + "print_settings_id": "0.24mm Standard @Anycubic Kobra 3 V2 0.4 nozzle", + "layer_height": "0.24", + "filename_format": "{timestamp}-{if plate_name==\"\" then input_filename_base+\"_plate\" else plate_name endif}{\"(\"+plate_number+\")\"}_{filament_type[initial_tool]}_{layer_height}_{print_time}.gcode", + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.4 nozzle" + ], + "accel_to_decel_enable": "1", + "accel_to_decel_factor": "50%", + "alternate_extra_wall": "0", + "bottom_shell_layers": "3", + "bottom_shell_thickness": "0", + "bottom_solid_infill_flow_ratio": "1", + "bottom_surface_pattern": "monotonic", + "bridge_acceleration": "5000", + "bridge_angle": "0", + "bridge_density": "100%", + "bridge_flow": "0.9", + "bridge_no_support": "0", + "bridge_speed": "30", + "brim_ears_detection_length": "1", + "brim_ears_max_angle": "125", + "brim_object_gap": "0.15", + "brim_type": "auto_brim", + "brim_width": "5", + "compatible_printers_condition": "", + "counterbore_hole_bridging": "none", + "default_acceleration": "10000", + "default_jerk": "9", + "detect_narrow_internal_solid_infill": "1", + "detect_overhang_wall": "1", + "detect_thin_wall": "0", + "dont_filter_internal_bridges": "disabled", + "draft_shield": "disabled", + "elefant_foot_compensation": "0.1", + "elefant_foot_compensation_layers": "1", + "enable_arc_fitting": "0", + "enable_overhang_speed": "1", + "enable_prime_tower": "1", + "enable_support": "0", + "enforce_support_layers": "0", + "ensure_vertical_shell_thickness": "ensure_all", + "exclude_object": "1", + "extra_perimeters_on_overhangs": "1", + "filter_out_gap_fill": "0", + "flush_into_infill": "0", + "flush_into_objects": "0", + "flush_into_support": "1", + "fuzzy_skin": "none", + "fuzzy_skin_first_layer": "0", + "fuzzy_skin_point_distance": "0.8", + "fuzzy_skin_thickness": "0.3", + "gap_fill_target": "topbottom", + "gap_infill_speed": "200", + "gcode_add_line_number": "0", + "gcode_comments": "0", + "gcode_label_objects": "1", + "hole_to_polyhole": "0", + "hole_to_polyhole_threshold": "0.01", + "hole_to_polyhole_twisted": "1", + "independent_support_layer_height": "1", + "infill_anchor": "400", + "infill_anchor_max": "10", + "infill_combination": "0", + "infill_direction": "45", + "infill_jerk": "9", + "infill_wall_overlap": "15%", + "initial_layer_acceleration": "500", + "initial_layer_infill_speed": "45", + "initial_layer_jerk": "9", + "initial_layer_line_width": "0.5", + "initial_layer_min_bead_width": "85%", + "initial_layer_print_height": "0.2", + "initial_layer_speed": "45", + "initial_layer_travel_speed": "100%", + "inner_wall_acceleration": "6000", + "inner_wall_jerk": "9", + "inner_wall_line_width": "0.45", + "inner_wall_speed": "200", + "interface_shells": "0", + "internal_bridge_flow": "1", + "internal_bridge_speed": "150%", + "internal_solid_infill_acceleration": "10000", + "internal_solid_infill_line_width": "0.45", + "internal_solid_infill_pattern": "zig-zag", + "internal_solid_infill_speed": "200", + "ironing_angle": "-1", + "ironing_flow": "10%", + "ironing_pattern": "zig-zag", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "ironing_type": "no ironing", + "is_infill_first": "0", + "line_width": "0.42", + "make_overhang_printable": "0", + "make_overhang_printable_angle": "55", + "make_overhang_printable_hole_size": "0", + "max_bridge_length": "10", + "max_travel_detour_distance": "0", + "max_volumetric_extrusion_rate_slope": "0", + "max_volumetric_extrusion_rate_slope_segment_length": "5", + "min_bead_width": "85%", + "min_feature_size": "25%", + "min_length_factor": "0.5", + "min_width_top_surface": "300%", + "minimum_sparse_infill_area": "15", + "mmu_segmented_region_interlocking_depth": "0", + "mmu_segmented_region_max_width": "0", + "notes": "", + "only_one_wall_first_layer": "0", + "only_one_wall_top": "1", + "ooze_prevention": "0", + "outer_wall_acceleration": "5000", + "outer_wall_jerk": "9", + "outer_wall_line_width": "0.42", + "outer_wall_speed": "120", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "50", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "10", + "overhang_reverse": "0", + "overhang_reverse_internal_only": "0", + "overhang_reverse_threshold": "50%", + "post_process": [], + "precise_outer_wall": "0", + "precise_z_height": "0", + "prime_tower_brim_width": "5", + "prime_tower_width": "35", + "prime_volume": "20", + "print_flow_ratio": "1", + "print_order": "default", + "print_sequence": "by layer", + "raft_contact_distance": "0.1", + "raft_expansion": "1.5", + "raft_first_layer_density": "90%", + "raft_first_layer_expansion": "5", + "raft_layers": "0", + "reduce_crossing_wall": "0", + "reduce_infill_retraction": "1", + "resolution": "0.012", + "role_based_wipe_speed": "1", + "rotate_solid_infill_direction": "1", + "scarf_angle_threshold": "155", + "scarf_joint_flow_ratio": "1", + "scarf_joint_speed": "30", + "scarf_overhang_threshold": "40%", + "seam_gap": "10%", + "seam_position": "aligned", + "seam_slope_conditional": "0", + "seam_slope_entire_loop": "0", + "seam_slope_inner_walls": "0", + "seam_slope_min_length": "10", + "seam_slope_start_height": "10%", + "seam_slope_steps": "10", + "seam_slope_type": "none", + "single_extruder_multi_material_priming": "0", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "0", + "skirt_speed": "50", + "slice_closing_radius": "0.049", + "slicing_mode": "regular", + "slow_down_layers": "1", + "slowdown_for_curled_perimeters": "0", + "small_area_infill_flow_compensation": "0", + "small_area_infill_flow_compensation_model": [ + "0,0", + "\n0.2,0.4444", + "\n0.4,0.6145", + "\n0.6,0.7059", + "\n0.8,0.7619", + "\n1.5,0.8571", + "\n2,0.8889", + "\n3,0.9231", + "\n5,0.9520", + "\n10,1" + ], + "small_perimeter_speed": "30%", + "small_perimeter_threshold": "0", + "solid_infill_direction": "45", + "solid_infill_filament": "1", + "sparse_infill_acceleration": "5000", + "sparse_infill_density": "15%", + "sparse_infill_filament": "1", + "sparse_infill_line_width": "0.45", + "sparse_infill_pattern": "3dhoneycomb", + "sparse_infill_speed": "200", + "spiral_mode": "0", + "spiral_mode_max_xy_smoothing": "200%", + "spiral_mode_smooth": "0", + "staggered_inner_seams": "0", + "standby_temperature_delta": "0", + "support_angle": "0", + "support_base_pattern": "default", + "support_base_pattern_spacing": "0.2", + "support_bottom_interface_spacing": "0.5", + "support_bottom_z_distance": "0.2", + "support_critical_regions_only": "0", + "support_expansion": "0", + "support_filament": "0", + "support_interface_bottom_layers": "-1", + "support_interface_filament": "0", + "support_interface_loop_pattern": "0", + "support_interface_not_for_body": "1", + "support_interface_pattern": "auto", + "support_interface_spacing": "0.2", + "support_interface_speed": "100%", + "support_interface_top_layers": "2", + "support_line_width": "0.42", + "support_object_xy_distance": "60%", + "support_on_build_plate_only": "1", + "support_remove_small_overhang": "1", + "support_speed": "100", + "support_style": "default", + "support_threshold_angle": "35", + "support_top_z_distance": "0.2", + "support_type": "tree(auto)", + "thick_bridges": "0", + "thick_internal_bridges": "1", + "timelapse_type": "0", + "top_bottom_infill_wall_overlap": "15%", + "top_shell_layers": "4", + "top_shell_thickness": "1", + "top_solid_infill_flow_ratio": "0.97", + "top_surface_acceleration": "2000", + "top_surface_jerk": "9", + "top_surface_line_width": "0.42", + "top_surface_pattern": "monotonicline", + "top_surface_speed": "180", + "travel_acceleration": "10000", + "travel_jerk": "9", + "travel_speed": "350", + "travel_speed_z": "0", + "tree_support_adaptive_layer_height": "1", + "tree_support_angle_slow": "25", + "tree_support_auto_brim": "1", + "tree_support_branch_angle": "40", + "tree_support_branch_angle_organic": "40", + "tree_support_branch_diameter": "5", + "tree_support_branch_diameter_angle": "5", + "tree_support_branch_diameter_double_wall": "3", + "tree_support_branch_diameter_organic": "2", + "tree_support_branch_distance": "5", + "tree_support_branch_distance_organic": "1", + "tree_support_brim_width": "3", + "tree_support_tip_diameter": "0.8", + "tree_support_top_rate": "30%", + "tree_support_wall_count": "0", + "wall_direction": "auto", + "wall_distribution_count": "1", + "wall_filament": "1", + "wall_generator": "classic", + "wall_infill_order": "inner wall/outer wall/infill", + "wall_loops": "2", + "wall_sequence": "inner wall/outer wall", + "wall_transition_angle": "10", + "wall_transition_filter_deviation": "25%", + "wall_transition_length": "100%", + "wipe_before_external_loop": "0", + "wipe_on_loops": "0", + "wipe_speed": "80%", + "wipe_tower_bridging": "10", + "wipe_tower_cone_angle": "15", + "wipe_tower_extra_spacing": "120%", + "wipe_tower_extruder": "0", + "wipe_tower_max_purge_speed": "90", + "wipe_tower_no_sparse_layers": "0", + "wipe_tower_rotation_angle": "0", + "wiping_volumes_extruders": [ + "70", + "70", + "70", + "70", + "70", + "70", + "70", + "70", + "70", + "70" + ], + "xy_contour_compensation": "0", + "xy_hole_compensation": "0" +} diff --git a/resources/profiles/Anycubic/process/0.24mm Standard @Anycubic Kobra 3 V2 0.6 nozzle.json b/resources/profiles/Anycubic/process/0.24mm Standard @Anycubic Kobra 3 V2 0.6 nozzle.json new file mode 100644 index 0000000000..5c93071727 --- /dev/null +++ b/resources/profiles/Anycubic/process/0.24mm Standard @Anycubic Kobra 3 V2 0.6 nozzle.json @@ -0,0 +1,24 @@ +{ + "type": "process", + "name": "0.24mm Standard @Anycubic Kobra 3 V2 0.6 nozzle", + "inherits": "0.30mm Standard @Anycubic Kobra 3 V2 0.6 nozzle", + "from": "system", + "setting_id": "DhqKrBJZh4W22xna", + "instantiation": "true", + "filename_format": "{timestamp}-{if plate_name==\"\" then input_filename_base+\"_plate\" else plate_name endif}{\"(\"+plate_number+\")\"}_{filament_type[initial_tool]}_{layer_height}_{print_time}.gcode", + "print_settings_id": "0.24mm Standard @Anycubic Kobra 3 V2 0.6 nozzle", + "layer_height": "0.24", + "brim_type": "auto_brim", + "default_acceleration": "6000", + "default_jerk": "9", + "elefant_foot_compensation": "0.1", + "inner_wall_acceleration": "6000", + "inner_wall_jerk": "9", + "outer_wall_jerk": "9", + "raft_first_layer_expansion": "5", + "sparse_infill_acceleration": "6000", + "support_threshold_angle": "30", + "top_bottom_infill_wall_overlap": "15%", + "travel_acceleration": "10000", + "travel_jerk": "9" +} diff --git a/resources/profiles/Anycubic/process/0.28mm Standard @Anycubic Kobra 3 V2 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.28mm Standard @Anycubic Kobra 3 V2 0.4 nozzle.json new file mode 100644 index 0000000000..8d99d7720e --- /dev/null +++ b/resources/profiles/Anycubic/process/0.28mm Standard @Anycubic Kobra 3 V2 0.4 nozzle.json @@ -0,0 +1,289 @@ +{ + "type": "process", + "name": "0.28mm Standard @Anycubic Kobra 3 V2 0.4 nozzle", + "inherits": "fdm_process_common", + "from": "system", + "setting_id": "Qe8XQonRxfA8Jei1", + "instantiation": "true", + "print_settings_id": "0.28mm Standard @Anycubic Kobra 3 V2 0.4 nozzle", + "layer_height": "0.28", + "filename_format": "{timestamp}-{if plate_name==\"\" then input_filename_base+\"_plate\" else plate_name endif}{\"(\"+plate_number+\")\"}_{filament_type[initial_tool]}_{layer_height}_{print_time}.gcode", + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.4 nozzle" + ], + "accel_to_decel_enable": "1", + "accel_to_decel_factor": "50%", + "alternate_extra_wall": "0", + "bottom_shell_layers": "3", + "bottom_shell_thickness": "0", + "bottom_solid_infill_flow_ratio": "1", + "bottom_surface_pattern": "monotonic", + "bridge_acceleration": "2000", + "bridge_angle": "0", + "bridge_density": "100%", + "bridge_flow": "0.9", + "bridge_no_support": "0", + "bridge_speed": "30", + "brim_ears_detection_length": "1", + "brim_ears_max_angle": "125", + "brim_object_gap": "0.15", + "brim_type": "auto_brim", + "brim_width": "5", + "compatible_printers_condition": "", + "counterbore_hole_bridging": "none", + "default_acceleration": "10000", + "default_jerk": "9", + "detect_narrow_internal_solid_infill": "1", + "detect_overhang_wall": "1", + "detect_thin_wall": "0", + "dont_filter_internal_bridges": "disabled", + "draft_shield": "disabled", + "elefant_foot_compensation": "0.1", + "elefant_foot_compensation_layers": "1", + "enable_arc_fitting": "0", + "enable_overhang_speed": "1", + "enable_prime_tower": "1", + "enable_support": "0", + "enforce_support_layers": "0", + "ensure_vertical_shell_thickness": "ensure_all", + "exclude_object": "1", + "extra_perimeters_on_overhangs": "1", + "filter_out_gap_fill": "0", + "flush_into_infill": "0", + "flush_into_objects": "0", + "flush_into_support": "1", + "fuzzy_skin": "none", + "fuzzy_skin_first_layer": "0", + "fuzzy_skin_point_distance": "0.8", + "fuzzy_skin_thickness": "0.3", + "gap_fill_target": "topbottom", + "gap_infill_speed": "200", + "gcode_add_line_number": "0", + "gcode_comments": "0", + "gcode_label_objects": "1", + "hole_to_polyhole": "0", + "hole_to_polyhole_threshold": "0.01", + "hole_to_polyhole_twisted": "1", + "independent_support_layer_height": "1", + "infill_anchor": "400", + "infill_anchor_max": "20", + "infill_combination": "0", + "infill_direction": "45", + "infill_jerk": "9", + "infill_wall_overlap": "15%", + "initial_layer_acceleration": "500", + "initial_layer_infill_speed": "45", + "initial_layer_jerk": "9", + "initial_layer_line_width": "0.5", + "initial_layer_min_bead_width": "85%", + "initial_layer_print_height": "0.2", + "initial_layer_speed": "45", + "initial_layer_travel_speed": "100%", + "inner_wall_acceleration": "6000", + "inner_wall_jerk": "9", + "inner_wall_line_width": "0.45", + "inner_wall_speed": "200", + "interface_shells": "0", + "internal_bridge_flow": "1", + "internal_bridge_speed": "150%", + "internal_solid_infill_acceleration": "10000", + "internal_solid_infill_line_width": "0.42", + "internal_solid_infill_pattern": "zig-zag", + "internal_solid_infill_speed": "180", + "ironing_angle": "-1", + "ironing_flow": "10%", + "ironing_pattern": "zig-zag", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "ironing_type": "no ironing", + "is_infill_first": "0", + "line_width": "0.42", + "make_overhang_printable": "0", + "make_overhang_printable_angle": "55", + "make_overhang_printable_hole_size": "0", + "max_bridge_length": "10", + "max_travel_detour_distance": "0", + "max_volumetric_extrusion_rate_slope": "0", + "max_volumetric_extrusion_rate_slope_segment_length": "5", + "min_bead_width": "85%", + "min_feature_size": "25%", + "min_length_factor": "0.5", + "min_width_top_surface": "300%", + "minimum_sparse_infill_area": "15", + "mmu_segmented_region_interlocking_depth": "0", + "mmu_segmented_region_max_width": "0", + "notes": "", + "only_one_wall_first_layer": "0", + "only_one_wall_top": "1", + "ooze_prevention": "0", + "outer_wall_acceleration": "5000", + "outer_wall_jerk": "9", + "outer_wall_line_width": "0.42", + "outer_wall_speed": "120", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "50", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "10", + "overhang_reverse": "0", + "overhang_reverse_internal_only": "0", + "overhang_reverse_threshold": "0%", + "post_process": [], + "precise_outer_wall": "0", + "precise_z_height": "0", + "prime_tower_brim_width": "5", + "prime_tower_width": "35", + "prime_volume": "20", + "print_flow_ratio": "1", + "print_order": "default", + "print_sequence": "by layer", + "raft_contact_distance": "0.1", + "raft_expansion": "1.5", + "raft_first_layer_density": "90%", + "raft_first_layer_expansion": "5", + "raft_layers": "0", + "reduce_crossing_wall": "0", + "reduce_infill_retraction": "1", + "resolution": "0.012", + "role_based_wipe_speed": "1", + "rotate_solid_infill_direction": "1", + "scarf_angle_threshold": "155", + "scarf_joint_flow_ratio": "1", + "scarf_joint_speed": "30", + "scarf_overhang_threshold": "40%", + "seam_gap": "10%", + "seam_position": "aligned", + "seam_slope_conditional": "0", + "seam_slope_entire_loop": "0", + "seam_slope_inner_walls": "0", + "seam_slope_min_length": "10", + "seam_slope_start_height": "10%", + "seam_slope_steps": "10", + "seam_slope_type": "none", + "single_extruder_multi_material_priming": "0", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "0", + "skirt_speed": "50", + "slice_closing_radius": "0.049", + "slicing_mode": "regular", + "slow_down_layers": "1", + "slowdown_for_curled_perimeters": "0", + "small_area_infill_flow_compensation": "0", + "small_area_infill_flow_compensation_model": [ + "0,0", + "\n0.2,0.4444", + "\n0.4,0.6145", + "\n0.6,0.7059", + "\n0.8,0.7619", + "\n1.5,0.8571", + "\n2,0.8889", + "\n3,0.9231", + "\n5,0.9520", + "\n10,1" + ], + "small_perimeter_speed": "30%", + "small_perimeter_threshold": "0", + "solid_infill_direction": "45", + "solid_infill_filament": "1", + "sparse_infill_acceleration": "5000", + "sparse_infill_density": "15%", + "sparse_infill_filament": "1", + "sparse_infill_line_width": "0.45", + "sparse_infill_pattern": "grid", + "sparse_infill_speed": "200", + "spiral_mode": "0", + "spiral_mode_max_xy_smoothing": "200%", + "spiral_mode_smooth": "0", + "staggered_inner_seams": "0", + "standby_temperature_delta": "0", + "support_angle": "0", + "support_base_pattern": "default", + "support_base_pattern_spacing": "0.2", + "support_bottom_interface_spacing": "0.5", + "support_bottom_z_distance": "0.2", + "support_critical_regions_only": "0", + "support_expansion": "0", + "support_filament": "0", + "support_interface_bottom_layers": "-1", + "support_interface_filament": "0", + "support_interface_loop_pattern": "0", + "support_interface_not_for_body": "1", + "support_interface_pattern": "auto", + "support_interface_spacing": "0.2", + "support_interface_speed": "100%", + "support_interface_top_layers": "2", + "support_line_width": "0.42", + "support_object_xy_distance": "60%", + "support_on_build_plate_only": "1", + "support_remove_small_overhang": "1", + "support_speed": "100", + "support_style": "default", + "support_threshold_angle": "40", + "support_top_z_distance": "0.2", + "support_type": "tree(auto)", + "thick_bridges": "0", + "thick_internal_bridges": "1", + "timelapse_type": "0", + "top_bottom_infill_wall_overlap": "25%", + "top_shell_layers": "4", + "top_shell_thickness": "1", + "top_solid_infill_flow_ratio": "0.97", + "top_surface_acceleration": "2000", + "top_surface_jerk": "9", + "top_surface_line_width": "0.42", + "top_surface_pattern": "monotonicline", + "top_surface_speed": "180", + "travel_acceleration": "10000", + "travel_jerk": "9", + "travel_speed": "350", + "travel_speed_z": "0", + "tree_support_adaptive_layer_height": "1", + "tree_support_angle_slow": "25", + "tree_support_auto_brim": "1", + "tree_support_branch_angle": "40", + "tree_support_branch_angle_organic": "40", + "tree_support_branch_diameter": "5", + "tree_support_branch_diameter_angle": "5", + "tree_support_branch_diameter_double_wall": "3", + "tree_support_branch_diameter_organic": "2", + "tree_support_branch_distance": "5", + "tree_support_branch_distance_organic": "1", + "tree_support_brim_width": "3", + "tree_support_tip_diameter": "0.8", + "tree_support_top_rate": "30%", + "tree_support_wall_count": "0", + "wall_direction": "auto", + "wall_distribution_count": "1", + "wall_filament": "1", + "wall_generator": "classic", + "wall_infill_order": "inner wall/outer wall/infill", + "wall_loops": "2", + "wall_sequence": "inner wall/outer wall", + "wall_transition_angle": "10", + "wall_transition_filter_deviation": "25%", + "wall_transition_length": "100%", + "wipe_before_external_loop": "0", + "wipe_on_loops": "0", + "wipe_speed": "80%", + "wipe_tower_bridging": "10", + "wipe_tower_cone_angle": "15", + "wipe_tower_extra_spacing": "120%", + "wipe_tower_extruder": "0", + "wipe_tower_max_purge_speed": "90", + "wipe_tower_no_sparse_layers": "0", + "wipe_tower_rotation_angle": "0", + "wiping_volumes_extruders": [ + "70", + "70", + "70", + "70", + "70", + "70", + "70", + "70", + "70", + "70" + ], + "xy_contour_compensation": "0", + "xy_hole_compensation": "0" +} diff --git a/resources/profiles/Anycubic/process/0.30mm Standard @Anycubic Kobra 3 V2 0.6 nozzle.json b/resources/profiles/Anycubic/process/0.30mm Standard @Anycubic Kobra 3 V2 0.6 nozzle.json new file mode 100644 index 0000000000..b5873f5a6e --- /dev/null +++ b/resources/profiles/Anycubic/process/0.30mm Standard @Anycubic Kobra 3 V2 0.6 nozzle.json @@ -0,0 +1,289 @@ +{ + "type": "process", + "name": "0.30mm Standard @Anycubic Kobra 3 V2 0.6 nozzle", + "inherits": "fdm_process_common", + "from": "system", + "setting_id": "13ES5eks7VTR3G2E", + "instantiation": "true", + "filename_format": "{timestamp}-{if plate_name==\"\" then input_filename_base+\"_plate\" else plate_name endif}{\"(\"+plate_number+\")\"}_{filament_type[initial_tool]}_{layer_height}_{print_time}.gcode", + "print_settings_id": "0.30mm Standard @Anycubic Kobra 3 V2 0.6 nozzle", + "layer_height": "0.3", + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.6 nozzle" + ], + "accel_to_decel_enable": "1", + "accel_to_decel_factor": "50%", + "alternate_extra_wall": "0", + "bottom_shell_layers": "3", + "bottom_shell_thickness": "0", + "bottom_solid_infill_flow_ratio": "1", + "bottom_surface_pattern": "monotonic", + "bridge_acceleration": "500", + "bridge_angle": "0", + "bridge_density": "100%", + "bridge_flow": "0.9", + "bridge_no_support": "0", + "bridge_speed": "30", + "brim_ears_detection_length": "1", + "brim_ears_max_angle": "125", + "brim_object_gap": "0.15", + "brim_type": "outer_only", + "brim_width": "5", + "compatible_printers_condition": "", + "counterbore_hole_bridging": "none", + "default_acceleration": "5000", + "default_jerk": "20", + "detect_narrow_internal_solid_infill": "1", + "detect_overhang_wall": "1", + "detect_thin_wall": "0", + "dont_filter_internal_bridges": "disabled", + "draft_shield": "disabled", + "elefant_foot_compensation": "0.075", + "elefant_foot_compensation_layers": "1", + "enable_arc_fitting": "0", + "enable_overhang_speed": "1", + "enable_prime_tower": "1", + "enable_support": "0", + "enforce_support_layers": "0", + "ensure_vertical_shell_thickness": "ensure_all", + "exclude_object": "1", + "extra_perimeters_on_overhangs": "1", + "filter_out_gap_fill": "0", + "flush_into_infill": "0", + "flush_into_objects": "0", + "flush_into_support": "1", + "fuzzy_skin": "none", + "fuzzy_skin_first_layer": "0", + "fuzzy_skin_point_distance": "0.8", + "fuzzy_skin_thickness": "0.3", + "gap_fill_target": "topbottom", + "gap_infill_speed": "50", + "gcode_add_line_number": "0", + "gcode_comments": "0", + "gcode_label_objects": "1", + "hole_to_polyhole": "0", + "hole_to_polyhole_threshold": "0.01", + "hole_to_polyhole_twisted": "1", + "independent_support_layer_height": "1", + "infill_anchor": "400", + "infill_anchor_max": "10", + "infill_combination": "0", + "infill_direction": "45", + "infill_jerk": "9", + "infill_wall_overlap": "15%", + "initial_layer_acceleration": "500", + "initial_layer_infill_speed": "30", + "initial_layer_jerk": "9", + "initial_layer_line_width": "0.62", + "initial_layer_min_bead_width": "85%", + "initial_layer_print_height": "0.3", + "initial_layer_speed": "30", + "initial_layer_travel_speed": "100%", + "inner_wall_acceleration": "10000", + "inner_wall_jerk": "15", + "inner_wall_line_width": "0.62", + "inner_wall_speed": "150", + "interface_shells": "0", + "internal_bridge_flow": "1", + "internal_bridge_speed": "150%", + "internal_solid_infill_acceleration": "5000", + "internal_solid_infill_line_width": "0.62", + "internal_solid_infill_pattern": "monotonic", + "internal_solid_infill_speed": "150", + "ironing_angle": "-1", + "ironing_flow": "15%", + "ironing_pattern": "zig-zag", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "ironing_type": "no ironing", + "is_infill_first": "0", + "line_width": "0.62", + "make_overhang_printable": "0", + "make_overhang_printable_angle": "55", + "make_overhang_printable_hole_size": "0", + "max_bridge_length": "10", + "max_travel_detour_distance": "0", + "max_volumetric_extrusion_rate_slope": "0", + "max_volumetric_extrusion_rate_slope_segment_length": "5", + "min_bead_width": "85%", + "min_feature_size": "25%", + "min_length_factor": "0.5", + "min_width_top_surface": "300%", + "minimum_sparse_infill_area": "0", + "mmu_segmented_region_interlocking_depth": "0", + "mmu_segmented_region_max_width": "0", + "notes": "", + "only_one_wall_first_layer": "0", + "only_one_wall_top": "1", + "ooze_prevention": "0", + "outer_wall_acceleration": "5000", + "outer_wall_jerk": "15", + "outer_wall_line_width": "0.62", + "outer_wall_speed": "120", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "50", + "overhang_3_4_speed": "15", + "overhang_4_4_speed": "10", + "overhang_reverse": "0", + "overhang_reverse_internal_only": "0", + "overhang_reverse_threshold": "50%", + "post_process": [], + "precise_outer_wall": "0", + "precise_z_height": "0", + "prime_tower_brim_width": "5", + "prime_tower_width": "35", + "prime_volume": "20", + "print_flow_ratio": "1", + "print_order": "default", + "print_sequence": "by layer", + "raft_contact_distance": "0.1", + "raft_expansion": "1.5", + "raft_first_layer_density": "90%", + "raft_first_layer_expansion": "2", + "raft_layers": "0", + "reduce_crossing_wall": "0", + "reduce_infill_retraction": "1", + "resolution": "0.012", + "role_based_wipe_speed": "1", + "rotate_solid_infill_direction": "1", + "scarf_angle_threshold": "155", + "scarf_joint_flow_ratio": "1", + "scarf_joint_speed": "35", + "scarf_overhang_threshold": "40%", + "seam_gap": "10%", + "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_entire_loop": "0", + "seam_slope_inner_walls": "0", + "seam_slope_min_length": "10", + "seam_slope_start_height": "0", + "seam_slope_steps": "10", + "seam_slope_type": "none", + "single_extruder_multi_material_priming": "0", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "0", + "skirt_speed": "50", + "slice_closing_radius": "0.049", + "slicing_mode": "regular", + "slow_down_layers": "1", + "slowdown_for_curled_perimeters": "0", + "small_area_infill_flow_compensation": "0", + "small_area_infill_flow_compensation_model": [ + "0,0", + "\n0.2,0.4444", + "\n0.4,0.6145", + "\n0.6,0.7059", + "\n0.8,0.7619", + "\n1.5,0.8571", + "\n2,0.8889", + "\n3,0.9231", + "\n5,0.9520", + "\n10,1" + ], + "small_perimeter_speed": "50%", + "small_perimeter_threshold": "0", + "solid_infill_direction": "45", + "solid_infill_filament": "1", + "sparse_infill_acceleration": "10000", + "sparse_infill_density": "15%", + "sparse_infill_filament": "1", + "sparse_infill_line_width": "0.62", + "sparse_infill_pattern": "3dhoneycomb", + "sparse_infill_speed": "100", + "spiral_mode": "0", + "spiral_mode_max_xy_smoothing": "200%", + "spiral_mode_smooth": "0", + "staggered_inner_seams": "0", + "standby_temperature_delta": "0", + "support_angle": "0", + "support_base_pattern": "default", + "support_base_pattern_spacing": "0.2", + "support_bottom_interface_spacing": "0.5", + "support_bottom_z_distance": "0.2", + "support_critical_regions_only": "0", + "support_expansion": "0", + "support_filament": "0", + "support_interface_bottom_layers": "-1", + "support_interface_filament": "0", + "support_interface_loop_pattern": "0", + "support_interface_not_for_body": "1", + "support_interface_pattern": "auto", + "support_interface_spacing": "0.2", + "support_interface_speed": "80", + "support_interface_top_layers": "3", + "support_line_width": "0.62", + "support_object_xy_distance": "0.35", + "support_on_build_plate_only": "1", + "support_remove_small_overhang": "1", + "support_speed": "100", + "support_style": "default", + "support_threshold_angle": "40", + "support_top_z_distance": "0.25", + "support_type": "tree(auto)", + "thick_bridges": "0", + "thick_internal_bridges": "1", + "timelapse_type": "0", + "top_bottom_infill_wall_overlap": "25%", + "top_shell_layers": "3", + "top_shell_thickness": "0.6", + "top_solid_infill_flow_ratio": "0.97", + "top_surface_acceleration": "5000", + "top_surface_jerk": "9", + "top_surface_line_width": "0.62", + "top_surface_pattern": "monotonicline", + "top_surface_speed": "150", + "travel_acceleration": "15000", + "travel_jerk": "12", + "travel_speed": "350", + "travel_speed_z": "0", + "tree_support_adaptive_layer_height": "1", + "tree_support_angle_slow": "25", + "tree_support_auto_brim": "1", + "tree_support_branch_angle": "40", + "tree_support_branch_angle_organic": "40", + "tree_support_branch_diameter": "5", + "tree_support_branch_diameter_angle": "5", + "tree_support_branch_diameter_double_wall": "3", + "tree_support_branch_diameter_organic": "2", + "tree_support_branch_distance": "5", + "tree_support_branch_distance_organic": "1", + "tree_support_brim_width": "3", + "tree_support_tip_diameter": "0.8", + "tree_support_top_rate": "30%", + "tree_support_wall_count": "0", + "wall_direction": "auto", + "wall_distribution_count": "1", + "wall_filament": "1", + "wall_generator": "classic", + "wall_infill_order": "inner wall/outer wall/infill", + "wall_loops": "2", + "wall_sequence": "inner wall/outer wall", + "wall_transition_angle": "10", + "wall_transition_filter_deviation": "25%", + "wall_transition_length": "100%", + "wipe_before_external_loop": "0", + "wipe_on_loops": "0", + "wipe_speed": "80%", + "wipe_tower_bridging": "10", + "wipe_tower_cone_angle": "15", + "wipe_tower_extra_spacing": "150%", + "wipe_tower_extruder": "0", + "wipe_tower_max_purge_speed": "90", + "wipe_tower_no_sparse_layers": "0", + "wipe_tower_rotation_angle": "0", + "wiping_volumes_extruders": [ + "70", + "70", + "70", + "70", + "70", + "70", + "70", + "70", + "70", + "70" + ], + "xy_contour_compensation": "0", + "xy_hole_compensation": "0" +} diff --git a/resources/profiles/Anycubic/process/0.32mm Standard @Anycubic Kobra 3 V2 0.8 nozzle.json b/resources/profiles/Anycubic/process/0.32mm Standard @Anycubic Kobra 3 V2 0.8 nozzle.json new file mode 100644 index 0000000000..938312f46e --- /dev/null +++ b/resources/profiles/Anycubic/process/0.32mm Standard @Anycubic Kobra 3 V2 0.8 nozzle.json @@ -0,0 +1,17 @@ +{ + "type": "process", + "name": "0.32mm Standard @Anycubic Kobra 3 V2 0.8 nozzle", + "inherits": "0.40mm Standard @Anycubic Kobra 3 V2 0.8 nozzle", + "from": "system", + "setting_id": "avPzsOBN3DnXTaol", + "instantiation": "true", + "filename_format": "{timestamp}-{if plate_name==\"\" then input_filename_base+\"_plate\" else plate_name endif}{\"(\"+plate_number+\")\"}_{filament_type[initial_tool]}_{layer_height}_{print_time}.gcode", + "print_settings_id": "0.32mm Standard @Anycubic Kobra 3 V2 0.8 nozzle", + "layer_height": "0.32", + "initial_layer_print_height": "0.32", + "inner_wall_speed": "120", + "outer_wall_speed": "80", + "overhang_2_4_speed": "40", + "overhang_3_4_speed": "30", + "top_solid_infill_flow_ratio": "0.95" +} diff --git a/resources/profiles/Anycubic/process/0.36mm Standard @Anycubic Kobra 3 V2 0.6 nozzle.json b/resources/profiles/Anycubic/process/0.36mm Standard @Anycubic Kobra 3 V2 0.6 nozzle.json new file mode 100644 index 0000000000..d10161ced6 --- /dev/null +++ b/resources/profiles/Anycubic/process/0.36mm Standard @Anycubic Kobra 3 V2 0.6 nozzle.json @@ -0,0 +1,24 @@ +{ + "type": "process", + "name": "0.36mm Standard @Anycubic Kobra 3 V2 0.6 nozzle", + "inherits": "0.30mm Standard @Anycubic Kobra 3 V2 0.6 nozzle", + "from": "system", + "setting_id": "7pIVSig189FDjOMY", + "instantiation": "true", + "filename_format": "{timestamp}-{if plate_name==\"\" then input_filename_base+\"_plate\" else plate_name endif}{\"(\"+plate_number+\")\"}_{filament_type[initial_tool]}_{layer_height}_{print_time}.gcode", + "print_settings_id": "0.36mm Standard @Anycubic Kobra 3 V2 0.6 nozzle", + "layer_height": "0.36", + "brim_type": "auto_brim", + "default_acceleration": "6000", + "default_jerk": "9", + "elefant_foot_compensation": "0.1", + "inner_wall_acceleration": "6000", + "inner_wall_jerk": "9", + "outer_wall_jerk": "9", + "raft_first_layer_expansion": "5", + "sparse_infill_acceleration": "6000", + "support_threshold_angle": "30", + "top_bottom_infill_wall_overlap": "15%", + "travel_acceleration": "10000", + "travel_jerk": "9" +} diff --git a/resources/profiles/Anycubic/process/0.40mm Standard @Anycubic Kobra 3 V2 0.8 nozzle.json b/resources/profiles/Anycubic/process/0.40mm Standard @Anycubic Kobra 3 V2 0.8 nozzle.json new file mode 100644 index 0000000000..1de694f388 --- /dev/null +++ b/resources/profiles/Anycubic/process/0.40mm Standard @Anycubic Kobra 3 V2 0.8 nozzle.json @@ -0,0 +1,289 @@ +{ + "type": "process", + "name": "0.40mm Standard @Anycubic Kobra 3 V2 0.8 nozzle", + "inherits": "fdm_process_common", + "from": "system", + "setting_id": "0yxg7c5tH07ZMIL4", + "instantiation": "true", + "filename_format": "{timestamp}-{if plate_name==\"\" then input_filename_base+\"_plate\" else plate_name endif}{\"(\"+plate_number+\")\"}_{filament_type[initial_tool]}_{layer_height}_{print_time}.gcode", + "print_settings_id": "0.40mm Standard @Anycubic Kobra 3 V2 0.8 nozzle", + "layer_height": "0.4", + "compatible_printers": [ + "Anycubic Kobra 3 V2 0.8 nozzle" + ], + "accel_to_decel_enable": "1", + "accel_to_decel_factor": "50%", + "alternate_extra_wall": "0", + "bottom_shell_layers": "3", + "bottom_shell_thickness": "0", + "bottom_solid_infill_flow_ratio": "1", + "bottom_surface_pattern": "monotonic", + "bridge_acceleration": "5000", + "bridge_angle": "0", + "bridge_density": "100%", + "bridge_flow": "0.9", + "bridge_no_support": "0", + "bridge_speed": "30", + "brim_ears_detection_length": "1", + "brim_ears_max_angle": "125", + "brim_object_gap": "0.15", + "brim_type": "outer_only", + "brim_width": "5", + "compatible_printers_condition": "", + "counterbore_hole_bridging": "none", + "default_acceleration": "6000", + "default_jerk": "20", + "detect_narrow_internal_solid_infill": "1", + "detect_overhang_wall": "1", + "detect_thin_wall": "1", + "dont_filter_internal_bridges": "disabled", + "draft_shield": "disabled", + "elefant_foot_compensation": "0.1", + "elefant_foot_compensation_layers": "1", + "enable_arc_fitting": "0", + "enable_overhang_speed": "1", + "enable_prime_tower": "1", + "enable_support": "0", + "enforce_support_layers": "0", + "ensure_vertical_shell_thickness": "ensure_all", + "exclude_object": "1", + "extra_perimeters_on_overhangs": "1", + "filter_out_gap_fill": "0", + "flush_into_infill": "0", + "flush_into_objects": "0", + "flush_into_support": "1", + "fuzzy_skin": "none", + "fuzzy_skin_first_layer": "0", + "fuzzy_skin_point_distance": "0.8", + "fuzzy_skin_thickness": "0.3", + "gap_fill_target": "topbottom", + "gap_infill_speed": "50", + "gcode_add_line_number": "0", + "gcode_comments": "0", + "gcode_label_objects": "1", + "hole_to_polyhole": "0", + "hole_to_polyhole_threshold": "0.01", + "hole_to_polyhole_twisted": "1", + "independent_support_layer_height": "1", + "infill_anchor": "400", + "infill_anchor_max": "10", + "infill_combination": "0", + "infill_direction": "45", + "infill_jerk": "9", + "infill_wall_overlap": "15%", + "initial_layer_acceleration": "500", + "initial_layer_infill_speed": "30", + "initial_layer_jerk": "9", + "initial_layer_line_width": "0.82", + "initial_layer_min_bead_width": "85%", + "initial_layer_print_height": "0.4", + "initial_layer_speed": "30", + "initial_layer_travel_speed": "100%", + "inner_wall_acceleration": "0", + "inner_wall_jerk": "15", + "inner_wall_line_width": "0.82", + "inner_wall_speed": "150", + "interface_shells": "0", + "internal_bridge_flow": "1", + "internal_bridge_speed": "150%", + "internal_solid_infill_acceleration": "10000", + "internal_solid_infill_line_width": "0.82", + "internal_solid_infill_pattern": "zig-zag", + "internal_solid_infill_speed": "150", + "ironing_angle": "-1", + "ironing_flow": "15%", + "ironing_pattern": "zig-zag", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "ironing_type": "no ironing", + "is_infill_first": "0", + "line_width": "0.82", + "make_overhang_printable": "0", + "make_overhang_printable_angle": "55", + "make_overhang_printable_hole_size": "0", + "max_bridge_length": "10", + "max_travel_detour_distance": "0", + "max_volumetric_extrusion_rate_slope": "0", + "max_volumetric_extrusion_rate_slope_segment_length": "5", + "min_bead_width": "85%", + "min_feature_size": "25%", + "min_length_factor": "0.5", + "min_width_top_surface": "300%", + "minimum_sparse_infill_area": "0", + "mmu_segmented_region_interlocking_depth": "0", + "mmu_segmented_region_max_width": "0", + "notes": "", + "only_one_wall_first_layer": "0", + "only_one_wall_top": "1", + "ooze_prevention": "0", + "outer_wall_acceleration": "5000", + "outer_wall_jerk": "15", + "outer_wall_line_width": "0.82", + "outer_wall_speed": "120", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "50", + "overhang_3_4_speed": "25", + "overhang_4_4_speed": "5", + "overhang_reverse": "0", + "overhang_reverse_internal_only": "0", + "overhang_reverse_threshold": "50%", + "post_process": [], + "precise_outer_wall": "0", + "precise_z_height": "0", + "prime_tower_brim_width": "5", + "prime_tower_width": "35", + "prime_volume": "20", + "print_flow_ratio": "1", + "print_order": "default", + "print_sequence": "by layer", + "raft_contact_distance": "0.1", + "raft_expansion": "1.5", + "raft_first_layer_density": "90%", + "raft_first_layer_expansion": "2", + "raft_layers": "0", + "reduce_crossing_wall": "0", + "reduce_infill_retraction": "1", + "resolution": "0.012", + "role_based_wipe_speed": "1", + "rotate_solid_infill_direction": "1", + "scarf_angle_threshold": "155", + "scarf_joint_flow_ratio": "1", + "scarf_joint_speed": "100%", + "scarf_overhang_threshold": "40%", + "seam_gap": "10%", + "seam_position": "aligned", + "seam_slope_conditional": "0", + "seam_slope_entire_loop": "0", + "seam_slope_inner_walls": "0", + "seam_slope_min_length": "20", + "seam_slope_start_height": "0", + "seam_slope_steps": "10", + "seam_slope_type": "none", + "single_extruder_multi_material_priming": "0", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "0", + "skirt_speed": "50", + "slice_closing_radius": "0.049", + "slicing_mode": "regular", + "slow_down_layers": "1", + "slowdown_for_curled_perimeters": "0", + "small_area_infill_flow_compensation": "0", + "small_area_infill_flow_compensation_model": [ + "0,0", + "\n0.2,0.4444", + "\n0.4,0.6145", + "\n0.6,0.7059", + "\n0.8,0.7619", + "\n1.5,0.8571", + "\n2,0.8889", + "\n3,0.9231", + "\n5,0.9520", + "\n10,1" + ], + "small_perimeter_speed": "50%", + "small_perimeter_threshold": "0", + "solid_infill_direction": "45", + "solid_infill_filament": "1", + "sparse_infill_acceleration": "5000", + "sparse_infill_density": "15%", + "sparse_infill_filament": "1", + "sparse_infill_line_width": "0.82", + "sparse_infill_pattern": "3dhoneycomb", + "sparse_infill_speed": "100", + "spiral_mode": "0", + "spiral_mode_max_xy_smoothing": "200%", + "spiral_mode_smooth": "0", + "staggered_inner_seams": "0", + "standby_temperature_delta": "0", + "support_angle": "0", + "support_base_pattern": "default", + "support_base_pattern_spacing": "0.2", + "support_bottom_interface_spacing": "0.5", + "support_bottom_z_distance": "0.2", + "support_critical_regions_only": "0", + "support_expansion": "0", + "support_filament": "0", + "support_interface_bottom_layers": "-1", + "support_interface_filament": "0", + "support_interface_loop_pattern": "0", + "support_interface_not_for_body": "1", + "support_interface_pattern": "auto", + "support_interface_spacing": "0.2", + "support_interface_speed": "80", + "support_interface_top_layers": "3", + "support_line_width": "0.82", + "support_object_xy_distance": "0.35", + "support_on_build_plate_only": "1", + "support_remove_small_overhang": "1", + "support_speed": "100", + "support_style": "default", + "support_threshold_angle": "40", + "support_top_z_distance": "0.25", + "support_type": "tree(auto)", + "thick_bridges": "0", + "thick_internal_bridges": "1", + "timelapse_type": "0", + "top_bottom_infill_wall_overlap": "25%", + "top_shell_layers": "3", + "top_shell_thickness": "0.8", + "top_solid_infill_flow_ratio": "0.97", + "top_surface_acceleration": "2000", + "top_surface_jerk": "9", + "top_surface_line_width": "0.82", + "top_surface_pattern": "monotonic", + "top_surface_speed": "150", + "travel_acceleration": "10000", + "travel_jerk": "12", + "travel_speed": "350", + "travel_speed_z": "0", + "tree_support_adaptive_layer_height": "1", + "tree_support_angle_slow": "25", + "tree_support_auto_brim": "1", + "tree_support_branch_angle": "40", + "tree_support_branch_angle_organic": "40", + "tree_support_branch_diameter": "5", + "tree_support_branch_diameter_angle": "5", + "tree_support_branch_diameter_double_wall": "3", + "tree_support_branch_diameter_organic": "2", + "tree_support_branch_distance": "5", + "tree_support_branch_distance_organic": "1", + "tree_support_brim_width": "3", + "tree_support_tip_diameter": "1.5", + "tree_support_top_rate": "30%", + "tree_support_wall_count": "0", + "wall_direction": "auto", + "wall_distribution_count": "1", + "wall_filament": "1", + "wall_generator": "classic", + "wall_infill_order": "inner wall/outer wall/infill", + "wall_loops": "2", + "wall_sequence": "inner wall/outer wall", + "wall_transition_angle": "10", + "wall_transition_filter_deviation": "25%", + "wall_transition_length": "100%", + "wipe_before_external_loop": "0", + "wipe_on_loops": "0", + "wipe_speed": "80%", + "wipe_tower_bridging": "10", + "wipe_tower_cone_angle": "15", + "wipe_tower_extra_spacing": "150%", + "wipe_tower_extruder": "0", + "wipe_tower_max_purge_speed": "90", + "wipe_tower_no_sparse_layers": "0", + "wipe_tower_rotation_angle": "0", + "wiping_volumes_extruders": [ + "70", + "70", + "70", + "70", + "70", + "70", + "70", + "70", + "70", + "70" + ], + "xy_contour_compensation": "0", + "xy_hole_compensation": "0" +} diff --git a/resources/profiles/Anycubic/process/0.48mm Standard @Anycubic Kobra 3 V2 0.8 nozzle.json b/resources/profiles/Anycubic/process/0.48mm Standard @Anycubic Kobra 3 V2 0.8 nozzle.json new file mode 100644 index 0000000000..c01e2d63f3 --- /dev/null +++ b/resources/profiles/Anycubic/process/0.48mm Standard @Anycubic Kobra 3 V2 0.8 nozzle.json @@ -0,0 +1,17 @@ +{ + "type": "process", + "name": "0.48mm Standard @Anycubic Kobra 3 V2 0.8 nozzle", + "inherits": "0.40mm Standard @Anycubic Kobra 3 V2 0.8 nozzle", + "from": "system", + "setting_id": "2cCCPfRX7H33XrMb", + "instantiation": "true", + "filename_format": "{timestamp}-{if plate_name==\"\" then input_filename_base+\"_plate\" else plate_name endif}{\"(\"+plate_number+\")\"}_{filament_type[initial_tool]}_{layer_height}_{print_time}.gcode", + "print_settings_id": "0.48mm Standard @Anycubic Kobra 3 V2 0.8 nozzle", + "layer_height": "0.48", + "initial_layer_print_height": "0.48", + "inner_wall_speed": "180", + "outer_wall_speed": "140", + "overhang_2_4_speed": "40", + "overhang_3_4_speed": "30", + "top_solid_infill_flow_ratio": "0.95" +} diff --git a/resources/profiles/BBL.json b/resources/profiles/BBL.json index 7491f4064d..fd52cf63a4 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.28", + "version": "02.01.00.30", "force_update": "0", "description": "BBL configurations", "machine_model_list": [ @@ -1169,86 +1169,10 @@ } ], "filament_list": [ - { - "name": "COEX PCTG PRIME @BBL X1C", - "sub_path": "filament/COEX/COEX PCTG PRIME @BBL X1C.json" - }, - { - "name": "COEX PCTG PRIME @BBL X1C 0.2 nozzle", - "sub_path": "filament/COEX/COEX PCTG PRIME @BBL X1C 0.2 nozzle.json" - }, - { - "name": "COEX PCTG PRIME @BBL X1C 0.8 nozzle", - "sub_path": "filament/COEX/COEX PCTG PRIME @BBL X1C 0.8 nozzle.json" - }, - { - "name": "COEX PETG @BBL X1C", - "sub_path": "filament/COEX/COEX PETG @BBL X1C.json" - }, - { - "name": "COEX PETG @BBL X1C 0.2 nozzle", - "sub_path": "filament/COEX/COEX PETG @BBL X1C 0.2 nozzle.json" - }, - { - "name": "COEX PETG @BBL X1C 0.8 nozzle", - "sub_path": "filament/COEX/COEX PETG @BBL X1C 0.8 nozzle.json" - }, - { - "name": "COEX PLA @BBL A1M", - "sub_path": "filament/COEX/COEX PLA @BBL A1M.json" - }, - { - "name": "COEX PLA @BBL P1P", - "sub_path": "filament/COEX/COEX PLA @BBL P1P.json" - }, - { - "name": "COEX PLA @BBL X1C", - "sub_path": "filament/COEX/COEX PLA @BBL X1C.json" - }, { "name": "fdm_filament_common", "sub_path": "filament/fdm_filament_common.json" }, - { - "name": "COEX PCTG PRIME @BBL A1M 0.4 nozzle", - "sub_path": "filament/COEX/COEX PCTG PRIME @BBL A1M.json" - }, - { - "name": "COEX PCTG PRIME @BBL A1M 0.2 nozzle", - "sub_path": "filament/COEX/COEX PCTG PRIME @BBL A1M 0.2 nozzle.json" - }, - { - "name": "COEX PCTG PRIME @BBL A1M 0.8 nozzle", - "sub_path": "filament/COEX/COEX PCTG PRIME @BBL A1M 0.8 nozzle.json" - }, - { - "name": "COEX PETG @BBL A1M 0.4 nozzle", - "sub_path": "filament/COEX/COEX PETG @BBL A1M.json" - }, - { - "name": "COEX PETG @BBL A1M 0.2 nozzle", - "sub_path": "filament/COEX/COEX PETG @BBL A1M 0.2 nozzle.json" - }, - { - "name": "COEX PETG @BBL A1M 0.8 nozzle", - "sub_path": "filament/COEX/COEX PETG @BBL A1M 0.8 nozzle.json" - }, - { - "name": "COEX PLA @BBL A1M 0.2 nozzle", - "sub_path": "filament/COEX/COEX PLA @BBL A1M 0.2 nozzle.json" - }, - { - "name": "COEX PLA @BBL P1P 0.2 nozzle", - "sub_path": "filament/COEX/COEX PLA @BBL P1P 0.2 nozzle.json" - }, - { - "name": "COEX PLA @BBL X1C 0.2 nozzle", - "sub_path": "filament/COEX/COEX PLA @BBL X1C 0.2 nozzle.json" - }, - { - "name": "FusRock ABS-GF @base", - "sub_path": "filament/FusRock/FusRock ABS-GF @base.json" - }, { "name": "fdm_filament_abs", "sub_path": "filament/fdm_filament_abs.json" @@ -1321,26 +1245,6 @@ "name": "fdm_filament_tpu", "sub_path": "filament/fdm_filament_tpu.json" }, - { - "name": "FusRock ABS-GF @BBL A1", - "sub_path": "filament/FusRock/FusRock ABS-GF @BBL A1.json" - }, - { - "name": "FusRock ABS-GF @BBL H2D", - "sub_path": "filament/FusRock/FusRock ABS-GF @BBL H2D.json" - }, - { - "name": "FusRock ABS-GF @BBL P1P", - "sub_path": "filament/FusRock/FusRock ABS-GF @BBL P1P.json" - }, - { - "name": "FusRock ABS-GF @BBL X1C", - "sub_path": "filament/FusRock/FusRock ABS-GF @BBL X1C.json" - }, - { - "name": "BETA ABS @base", - "sub_path": "filament/BETA/BETA ABS @base.json" - }, { "name": "Bambu ABS @base", "sub_path": "filament/Bambu ABS @base.json" @@ -1361,10 +1265,6 @@ "name": "PolyLite ABS @base", "sub_path": "filament/Polymaker/PolyLite ABS @base.json" }, - { - "name": "BETA ASA @base", - "sub_path": "filament/BETA/BETA ASA @base.json" - }, { "name": "Bambu ASA @base", "sub_path": "filament/Bambu ASA @base.json" @@ -1393,18 +1293,10 @@ "name": "Generic EVA @base", "sub_path": "filament/Generic EVA @base.json" }, - { - "name": "BETA HIPS @base", - "sub_path": "filament/BETA/BETA HIPS @base.json" - }, { "name": "Generic HIPS @base", "sub_path": "filament/Generic HIPS @base.json" }, - { - "name": "BETA PAHT-CF @base", - "sub_path": "filament/BETA/BETA PAHT-CF @base.json" - }, { "name": "Bambu PA-CF @base", "sub_path": "filament/Bambu PA-CF @base.json" @@ -1433,34 +1325,18 @@ "name": "Fiberon PA12-CF @base", "sub_path": "filament/Polymaker/Fiberon PA12-CF @base.json" }, - { - "name": "Fiberon PA12-CF10 @base", - "sub_path": "filament/Polymaker/Fiberon PA12-CF10 @base.json" - }, { "name": "Fiberon PA6-CF @base", "sub_path": "filament/Polymaker/Fiberon PA6-CF @base.json" }, - { - "name": "Fiberon PA6-CF20 @base", - "sub_path": "filament/Polymaker/Fiberon PA6-CF20 @base.json" - }, { "name": "Fiberon PA6-GF @base", "sub_path": "filament/Polymaker/Fiberon PA6-GF @base.json" }, - { - "name": "Fiberon PA6-GF25 @base", - "sub_path": "filament/Polymaker/Fiberon PA6-GF25 @base.json" - }, { "name": "Fiberon PA612-CF @base", "sub_path": "filament/Polymaker/Fiberon PA612-CF @base.json" }, - { - "name": "Fiberon PA612-CF15 @base", - "sub_path": "filament/Polymaker/Fiberon PA612-CF15 @base.json" - }, { "name": "Generic PA @base", "sub_path": "filament/Generic PA @base.json" @@ -1493,62 +1369,6 @@ "name": "Generic PE-CF @base", "sub_path": "filament/Generic PE-CF @base.json" }, - { - "name": "BETA PETG @base", - "sub_path": "filament/BETA/BETA PETG @base.json" - }, - { - "name": "BETA PETG Fluorescence @base", - "sub_path": "filament/BETA/BETA PETG Fluorescence @base.json" - }, - { - "name": "BETA PETG Glitter @base", - "sub_path": "filament/BETA/BETA PETG Glitter @base.json" - }, - { - "name": "BETA PETG Glow @base", - "sub_path": "filament/BETA/BETA PETG Glow @base.json" - }, - { - "name": "BETA PETG Gradient @base", - "sub_path": "filament/BETA/BETA PETG Gradient @base.json" - }, - { - "name": "BETA PETG HF @base", - "sub_path": "filament/BETA/BETA PETG HF @base.json" - }, - { - "name": "BETA PETG Heat Color Change @base", - "sub_path": "filament/BETA/BETA PETG Heat Color Change @base.json" - }, - { - "name": "BETA PETG Marble @base", - "sub_path": "filament/BETA/BETA PETG Marble @base.json" - }, - { - "name": "BETA PETG Matte @base", - "sub_path": "filament/BETA/BETA PETG Matte @base.json" - }, - { - "name": "BETA PETG Metallic @base", - "sub_path": "filament/BETA/BETA PETG Metallic @base.json" - }, - { - "name": "BETA PETG Transparent @base", - "sub_path": "filament/BETA/BETA PETG Transparent @base.json" - }, - { - "name": "BETA PETG UV Color Change @base", - "sub_path": "filament/BETA/BETA PETG UV Color Change @base.json" - }, - { - "name": "BETA PETG-CF @base", - "sub_path": "filament/BETA/BETA PETG-CF @base.json" - }, - { - "name": "BETA PETG-GF @base", - "sub_path": "filament/BETA/BETA PETG-GF @base.json" - }, { "name": "Bambu PET-CF @base", "sub_path": "filament/Bambu PET-CF @base.json" @@ -1573,10 +1393,6 @@ "name": "Fiberon PET-CF @base", "sub_path": "filament/Polymaker/Fiberon PET-CF @base.json" }, - { - "name": "Fiberon PET-CF17 @base", - "sub_path": "filament/Polymaker/Fiberon PET-CF17 @base.json" - }, { "name": "Fiberon PETG-ESD @base", "sub_path": "filament/Polymaker/Fiberon PETG-ESD @base.json" @@ -1585,10 +1401,6 @@ "name": "Fiberon PETG-rCF @base", "sub_path": "filament/Polymaker/Fiberon PETG-rCF @base.json" }, - { - "name": "Fiberon PETG-rCF08 @base", - "sub_path": "filament/Polymaker/Fiberon PETG-rCF08 @base.json" - }, { "name": "Generic PETG @base", "sub_path": "filament/Generic PETG @base.json" @@ -1613,90 +1425,6 @@ "name": "Generic PHA @base", "sub_path": "filament/Generic PHA @base.json" }, - { - "name": "BETA PLA Basic @base", - "sub_path": "filament/BETA/BETA PLA Basic @base.json" - }, - { - "name": "BETA PLA Chameleon @base", - "sub_path": "filament/BETA/BETA PLA Chameleon @base.json" - }, - { - "name": "BETA PLA Fluorescence @base", - "sub_path": "filament/BETA/BETA PLA Fluorescence @base.json" - }, - { - "name": "BETA PLA Glitter @base", - "sub_path": "filament/BETA/BETA PLA Glitter @base.json" - }, - { - "name": "BETA PLA Glow @base", - "sub_path": "filament/BETA/BETA PLA Glow @base.json" - }, - { - "name": "BETA PLA Gradient @base", - "sub_path": "filament/BETA/BETA PLA Gradient @base.json" - }, - { - "name": "BETA PLA Heat Color Change @base", - "sub_path": "filament/BETA/BETA PLA Heat Color Change @base.json" - }, - { - "name": "BETA PLA High Speed @base", - "sub_path": "filament/BETA/BETA PLA High Speed @base.json" - }, - { - "name": "BETA PLA High Temp @base", - "sub_path": "filament/BETA/BETA PLA High Temp @base.json" - }, - { - "name": "BETA PLA Marble @base", - "sub_path": "filament/BETA/BETA PLA Marble @base.json" - }, - { - "name": "BETA PLA Matte @base", - "sub_path": "filament/BETA/BETA PLA Matte @base.json" - }, - { - "name": "BETA PLA Metal @base", - "sub_path": "filament/BETA/BETA PLA Metal @base.json" - }, - { - "name": "BETA PLA Metallic @base", - "sub_path": "filament/BETA/BETA PLA Metallic @base.json" - }, - { - "name": "BETA PLA PRO @base", - "sub_path": "filament/BETA/BETA PLA PRO @base.json" - }, - { - "name": "BETA PLA Silk @base", - "sub_path": "filament/BETA/BETA PLA Silk @base.json" - }, - { - "name": "BETA PLA Silk+ @base", - "sub_path": "filament/BETA/BETA PLA Silk+ @base.json" - }, - { - "name": "BETA PLA Transparent @base", - "sub_path": "filament/BETA/BETA PLA Transparent @base.json" - }, - { - "name": "BETA PLA UV Color Change @base", - "sub_path": "filament/BETA/BETA PLA UV Color Change @base.json" - }, - { - "name": "BETA PLA Wood @base", - "sub_path": "filament/BETA/BETA PLA Wood @base.json" - }, - { - "name": "BETA PLA Youth @base", - "sub_path": "filament/BETA/BETA PLA Youth @base.json" - }, - { - "name": "BETA PLA-CF @base", - "sub_path": "filament/BETA/BETA PLA-CF @base.json" - }, { "name": "Bambu PLA Aero @base", "sub_path": "filament/Bambu PLA Aero @base.json" @@ -1797,10 +1525,6 @@ "name": "Generic PLA-CF @base", "sub_path": "filament/Generic PLA-CF @base.json" }, - { - "name": "Numakers PLA+ @base", - "sub_path": "filament/Numakers/Numakers PLA+ @base.json" - }, { "name": "Overture Matte PLA @base", "sub_path": "filament/Overture/Overture Matte PLA @base.json" @@ -1809,130 +1533,14 @@ "name": "Overture PLA @base", "sub_path": "filament/Overture/Overture PLA @base.json" }, - { - "name": "Overture PLA Pro @base", - "sub_path": "filament/Overture/Overture PLA Pro @base.json" - }, - { - "name": "Panchroma CoPE @base", - "sub_path": "filament/Polymaker/Panchroma CoPE @base.json" - }, - { - "name": "Panchroma PLA @base", - "sub_path": "filament/Polymaker/Panchroma PLA @base.json" - }, - { - "name": "Panchroma PLA Celestial @base", - "sub_path": "filament/Polymaker/Panchroma PLA Celestial @base.json" - }, - { - "name": "Panchroma PLA Galaxy @base", - "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @base.json" - }, - { - "name": "Panchroma PLA Glow @base", - "sub_path": "filament/Polymaker/Panchroma PLA Glow @base.json" - }, - { - "name": "Panchroma PLA Luminous @base", - "sub_path": "filament/Polymaker/Panchroma PLA Luminous @base.json" - }, - { - "name": "Panchroma PLA Marble @base", - "sub_path": "filament/Polymaker/Panchroma PLA Marble @base.json" - }, - { - "name": "Panchroma PLA Matte @base", - "sub_path": "filament/Polymaker/Panchroma PLA Matte @base.json" - }, - { - "name": "Panchroma PLA Metallic @base", - "sub_path": "filament/Polymaker/Panchroma PLA Metallic @base.json" - }, - { - "name": "Panchroma PLA Neon @base", - "sub_path": "filament/Polymaker/Panchroma PLA Neon @base.json" - }, - { - "name": "Panchroma PLA Satin @base", - "sub_path": "filament/Polymaker/Panchroma PLA Satin @base.json" - }, - { - "name": "Panchroma PLA Silk @base", - "sub_path": "filament/Polymaker/Panchroma PLA Silk @base.json" - }, - { - "name": "Panchroma PLA Starlight @base", - "sub_path": "filament/Polymaker/Panchroma PLA Starlight @base.json" - }, - { - "name": "Panchroma PLA Temp Shift @base", - "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @base.json" - }, - { - "name": "Panchroma PLA Translucent @base", - "sub_path": "filament/Polymaker/Panchroma PLA Translucent @base.json" - }, - { - "name": "Panchroma PLA UV Shift @base", - "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @base.json" - }, - { - "name": "PolyLite CosPLA @base", - "sub_path": "filament/Polymaker/PolyLite CosPLA @base.json" - }, { "name": "PolyLite PLA @base", "sub_path": "filament/Polymaker/PolyLite PLA @base.json" }, - { - "name": "PolyLite PLA Galaxy @base", - "sub_path": "filament/Polymaker/PolyLite PLA Galaxy @base.json" - }, - { - "name": "PolyLite PLA Glow @base", - "sub_path": "filament/Polymaker/PolyLite PLA Glow @base.json" - }, - { - "name": "PolyLite PLA Luminous @base", - "sub_path": "filament/Polymaker/PolyLite PLA Luminous @base.json" - }, - { - "name": "PolyLite PLA Neon @base", - "sub_path": "filament/Polymaker/PolyLite PLA Neon @base.json" - }, - { - "name": "PolyLite PLA Pro @base", - "sub_path": "filament/Polymaker/PolyLite PLA Pro @base.json" - }, - { - "name": "PolyLite PLA Starlight @base", - "sub_path": "filament/Polymaker/PolyLite PLA Starlight @base.json" - }, - { - "name": "PolyLite PLA Translucent @base", - "sub_path": "filament/Polymaker/PolyLite PLA Translucent @base.json" - }, { "name": "PolyTerra PLA @base", "sub_path": "filament/Polymaker/PolyTerra PLA @base.json" }, - { - "name": "PolyTerra PLA Marble @base", - "sub_path": "filament/Polymaker/PolyTerra PLA Marble @base.json" - }, - { - "name": "PolyTerra PLA+ @base", - "sub_path": "filament/Polymaker/PolyTerra PLA+ @base.json" - }, - { - "name": "Polymaker HT-PLA @base", - "sub_path": "filament/Polymaker/Polymaker HT-PLA @base.json" - }, - { - "name": "Polymaker HT-PLA-GF @base", - "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @base.json" - }, { "name": "SUNLU PLA Marble @base", "sub_path": "filament/SUNLU/SUNLU Marble PLA @base.json" @@ -2009,26 +1617,6 @@ "name": "Generic SBS @base", "sub_path": "filament/Generic SBS @base.json" }, - { - "name": "BETA PEBA 90A @base", - "sub_path": "filament/BETA/BETA PEBA 90A @base.json" - }, - { - "name": "BETA TPU 90A @base", - "sub_path": "filament/BETA/BETA TPU 90A @base.json" - }, - { - "name": "BETA TPU 95A @base", - "sub_path": "filament/BETA/BETA TPU 95A @base.json" - }, - { - "name": "BETA TPU 98A @base", - "sub_path": "filament/BETA/BETA TPU 98A @base.json" - }, - { - "name": "BETA TPU Matte @base", - "sub_path": "filament/BETA/BETA TPU Matte @base.json" - }, { "name": "Bambu TPU 85A @base", "sub_path": "filament/Bambu TPU 85A @base.json" @@ -2057,22 +1645,6 @@ "name": "Generic TPU for AMS @base", "sub_path": "filament/Generic TPU for AMS @base.json" }, - { - "name": "BETA ABS @BBL A1", - "sub_path": "filament/BETA/BETA ABS @BBL A1.json" - }, - { - "name": "BETA ABS @BBL H2D", - "sub_path": "filament/BETA/BETA ABS @BBL H2D.json" - }, - { - "name": "BETA ABS @BBL P1P", - "sub_path": "filament/BETA/BETA ABS @BBL P1P.json" - }, - { - "name": "BETA ABS @BBL X1C", - "sub_path": "filament/BETA/BETA ABS @BBL X1C.json" - }, { "name": "Bambu ABS @BBL A1", "sub_path": "filament/Bambu ABS @BBL A1.json" @@ -2365,10 +1937,6 @@ "name": "Generic ABS @BBL X2D 0.4 nozzle", "sub_path": "filament/Generic ABS @BBL X2D 0.4 nozzle.json" }, - { - "name": "addnorth ABS rABS", - "sub_path": "filament/addnorth/addnorth ABS rABS.json" - }, { "name": "PolyLite ABS @BBL A1", "sub_path": "filament/Polymaker/PolyLite ABS @BBL A1.json" @@ -2409,18 +1977,6 @@ "name": "PolyLite ABS @BBL X1E 0.2 nozzle", "sub_path": "filament/Polymaker/PolyLite ABS @BBL X1E 0.2 nozzle.json" }, - { - "name": "BETA ASA @BBL A1 0.4 nozzle", - "sub_path": "filament/BETA/BETA ASA @BBL A1 0.4 nozzle.json" - }, - { - "name": "BETA ASA @BBL H2D 0.4 nozzle", - "sub_path": "filament/BETA/BETA ASA @BBL H2D 0.4 nozzle.json" - }, - { - "name": "BETA ASA @BBL X1C 0.4 nozzle", - "sub_path": "filament/BETA/BETA ASA @BBL X1C 0.4 nozzle.json" - }, { "name": "Bambu ASA @BBL A1 0.2 nozzle", "sub_path": "filament/Bambu ASA @BBL A1 0.2 nozzle.json" @@ -2873,14 +2429,6 @@ "name": "Generic EVA @BBL X2D 0.4 nozzle", "sub_path": "filament/Generic EVA @BBL X2D 0.4 nozzle.json" }, - { - "name": "BETA HIPS @BBL H2D", - "sub_path": "filament/BETA/BETA HIPS @BBL H2D.json" - }, - { - "name": "BETA HIPS @BBL X1C", - "sub_path": "filament/BETA/BETA HIPS @BBL X1C.json" - }, { "name": "Generic HIPS @BBL A1", "sub_path": "filament/Generic HIPS @BBL A1.json" @@ -2969,18 +2517,6 @@ "name": "Generic HIPS @BBL X2D 0.4 nozzle", "sub_path": "filament/Generic HIPS @BBL X2D 0.4 nozzle.json" }, - { - "name": "BETA PAHT-CF @BBL H2D", - "sub_path": "filament/BETA/BETA PAHT-CF @BBL H2D.json" - }, - { - "name": "BETA PAHT-CF @BBL P1P", - "sub_path": "filament/BETA/BETA PAHT-CF @BBL P1P.json" - }, - { - "name": "BETA PAHT-CF @BBL X1C", - "sub_path": "filament/BETA/BETA PAHT-CF @BBL X1C.json" - }, { "name": "Bambu PA-CF @BBL A1", "sub_path": "filament/Bambu PA-CF @BBL A1.json" @@ -3261,10 +2797,6 @@ "name": "Fiberon PA12-CF @BBL X1C", "sub_path": "filament/Polymaker/Fiberon PA12-CF @BBL X1C.json" }, - { - "name": "Fiberon PA12-CF10 @BBL X1", - "sub_path": "filament/Polymaker/Fiberon PA12-CF10 @BBL X1.json" - }, { "name": "Fiberon PA6-CF @BBL H2D", "sub_path": "filament/Polymaker/Fiberon PA6-CF @BBL H2D.json" @@ -3273,10 +2805,6 @@ "name": "Fiberon PA6-CF @BBL X1C", "sub_path": "filament/Polymaker/Fiberon PA6-CF @BBL X1C.json" }, - { - "name": "Fiberon PA6-CF20 @BBL X1", - "sub_path": "filament/Polymaker/Fiberon PA6-CF20 @BBL X1.json" - }, { "name": "Fiberon PA6-GF @BBL H2D", "sub_path": "filament/Polymaker/Fiberon PA6-GF @BBL H2D.json" @@ -3285,10 +2813,6 @@ "name": "Fiberon PA6-GF @BBL X1C", "sub_path": "filament/Polymaker/Fiberon PA6-GF @BBL X1C.json" }, - { - "name": "Fiberon PA6-GF25 @BBL X1", - "sub_path": "filament/Polymaker/Fiberon PA6-GF25 @BBL X1.json" - }, { "name": "Fiberon PA612-CF @BBL H2D", "sub_path": "filament/Polymaker/Fiberon PA612-CF @BBL H2D.json" @@ -3297,10 +2821,6 @@ "name": "Fiberon PA612-CF @BBL X1C", "sub_path": "filament/Polymaker/Fiberon PA612-CF @BBL X1C.json" }, - { - "name": "Fiberon PA612-CF15 @BBL X1", - "sub_path": "filament/Polymaker/Fiberon PA612-CF15 @BBL X1.json" - }, { "name": "Generic PA", "sub_path": "filament/Generic PA.json" @@ -3341,22 +2861,6 @@ "name": "Generic PA @BBL X2D 0.4 nozzle", "sub_path": "filament/Generic PA @BBL X2D 0.4 nozzle.json" }, - { - "name": "addnorth PA Adura", - "sub_path": "filament/addnorth/addnorth PA Adura.json" - }, - { - "name": "addnorth PA Adura FDA", - "sub_path": "filament/addnorth/addnorth PA Adura FDA.json" - }, - { - "name": "addnorth PA6 Addlantis", - "sub_path": "filament/addnorth/addnorth PA6 Addlantis.json" - }, - { - "name": "addnorth PVDF Adamant S1", - "sub_path": "filament/addnorth/addnorth PVDF Adamant S1.json" - }, { "name": "Generic PA-CF", "sub_path": "filament/Generic PA-CF.json" @@ -3381,10 +2885,6 @@ "name": "Generic PA-CF @BBL X2D 0.4 nozzle", "sub_path": "filament/Generic PA-CF @BBL X2D 0.4 nozzle.json" }, - { - "name": "addnorth PA-CF Adura X", - "sub_path": "filament/addnorth/addnorth PA-CF Adura X.json" - }, { "name": "Bambu PC @BBL A1", "sub_path": "filament/Bambu PC @BBL A1.json" @@ -3725,10 +3225,6 @@ "name": "Generic PC @BBL X2D 0.4 nozzle", "sub_path": "filament/Generic PC @BBL X2D 0.4 nozzle.json" }, - { - "name": "addnorth PC BLend HT LCF", - "sub_path": "filament/addnorth/addnorth PC BLend HT LCF.json" - }, { "name": "Generic PCTG @BBL A1", "sub_path": "filament/Generic PCTG @BBL A1.json" @@ -3873,238 +3369,6 @@ "name": "Generic PE-CF @BBL X2D 0.4 nozzle", "sub_path": "filament/Generic PE-CF @BBL X2D 0.4 nozzle.json" }, - { - "name": "BETA PETG @BBL A1", - "sub_path": "filament/BETA/BETA PETG @BBL A1.json" - }, - { - "name": "BETA PETG @BBL A1M 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG @BBL A1M 0.4 nozzle.json" - }, - { - "name": "BETA PETG @BBL H2D 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG @BBL H2D 0.4 nozzle.json" - }, - { - "name": "BETA PETG @BBL X1C", - "sub_path": "filament/BETA/BETA PETG @BBL X1C.json" - }, - { - "name": "BETA PETG Fluorescence @BBL A1", - "sub_path": "filament/BETA/BETA PETG Fluorescence @BBL A1.json" - }, - { - "name": "BETA PETG Fluorescence @BBL A1M 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG Fluorescence @BBL A1M 0.4 nozzle.json" - }, - { - "name": "BETA PETG Fluorescence @BBL H2D 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG Fluorescence @BBL H2D 0.4 nozzle.json" - }, - { - "name": "BETA PETG Fluorescence @BBL X1C", - "sub_path": "filament/BETA/BETA PETG Fluorescence @BBL X1C.json" - }, - { - "name": "BETA PETG Glitter @BBL A1", - "sub_path": "filament/BETA/BETA PETG Glitter @BBL A1.json" - }, - { - "name": "BETA PETG Glitter @BBL A1M 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG Glitter @BBL A1M 0.4 nozzle.json" - }, - { - "name": "BETA PETG Glitter @BBL H2D 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG Glitter @BBL H2D 0.4 nozzle.json" - }, - { - "name": "BETA PETG Glitter @BBL X1C", - "sub_path": "filament/BETA/BETA PETG Glitter @BBL X1C.json" - }, - { - "name": "BETA PETG Glow @BBL A1", - "sub_path": "filament/BETA/BETA PETG Glow @BBL A1.json" - }, - { - "name": "BETA PETG Glow @BBL A1M 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG Glow @BBL A1M 0.4 nozzle.json" - }, - { - "name": "BETA PETG Glow @BBL H2D 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG Glow @BBL H2D 0.4 nozzle.json" - }, - { - "name": "BETA PETG Glow @BBL X1C", - "sub_path": "filament/BETA/BETA PETG Glow @BBL X1C.json" - }, - { - "name": "BETA PETG Gradient @BBL A1", - "sub_path": "filament/BETA/BETA PETG Gradient @BBL A1.json" - }, - { - "name": "BETA PETG Gradient @BBL A1M 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG Gradient @BBL A1M 0.4 nozzle.json" - }, - { - "name": "BETA PETG Gradient @BBL H2D 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG Gradient @BBL H2D 0.4 nozzle.json" - }, - { - "name": "BETA PETG Gradient @BBL X1C", - "sub_path": "filament/BETA/BETA PETG Gradient @BBL X1C.json" - }, - { - "name": "BETA PETG HF @BBL A1", - "sub_path": "filament/BETA/BETA PETG HF @BBL A1.json" - }, - { - "name": "BETA PETG HF @BBL A1M", - "sub_path": "filament/BETA/BETA PETG HF @BBL A1M.json" - }, - { - "name": "BETA PETG HF @BBL H2D 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG HF @BBL H2D 0.4 nozzle.json" - }, - { - "name": "BETA PETG HF @BBL X1C", - "sub_path": "filament/BETA/BETA PETG HF @BBL X1C.json" - }, - { - "name": "BETA PETG Heat Color Change @BBL A1", - "sub_path": "filament/BETA/BETA PETG Heat Color Change @BBL A1.json" - }, - { - "name": "BETA PETG Heat Color Change @BBL A1M 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG Heat Color Change @BBL A1M 0.4 nozzle.json" - }, - { - "name": "BETA PETG Heat Color Change @BBL H2D 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG Heat Color Change @BBL H2D 0.4 nozzle.json" - }, - { - "name": "BETA PETG Heat Color Change @BBL X1C", - "sub_path": "filament/BETA/BETA PETG Heat Color Change @BBL X1C.json" - }, - { - "name": "BETA PETG Marble @BBL A1", - "sub_path": "filament/BETA/BETA PETG Marble @BBL A1.json" - }, - { - "name": "BETA PETG Marble @BBL A1M 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG Marble @BBL A1M 0.4 nozzle.json" - }, - { - "name": "BETA PETG Marble @BBL H2D 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG Marble @BBL H2D 0.4 nozzle.json" - }, - { - "name": "BETA PETG Marble @BBL X1C", - "sub_path": "filament/BETA/BETA PETG Marble @BBL X1C.json" - }, - { - "name": "BETA PETG Matte @BBL A1", - "sub_path": "filament/BETA/BETA PETG Matte @BBL A1.json" - }, - { - "name": "BETA PETG Matte @BBL A1M 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG Matte @BBL A1M 0.4 nozzle.json" - }, - { - "name": "BETA PETG Matte @BBL H2D 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG Matte @BBL H2D 0.4 nozzle.json" - }, - { - "name": "BETA PETG Matte @BBL X1C", - "sub_path": "filament/BETA/BETA PETG Matte @BBL X1C.json" - }, - { - "name": "BETA PETG Metallic @BBL A1", - "sub_path": "filament/BETA/BETA PETG Metallic @BBL A1.json" - }, - { - "name": "BETA PETG Metallic @BBL A1M 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG Metallic @BBL A1M 0.4 nozzle.json" - }, - { - "name": "BETA PETG Metallic @BBL H2D 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG Metallic @BBL H2D 0.4 nozzle.json" - }, - { - "name": "BETA PETG Metallic @BBL X1C", - "sub_path": "filament/BETA/BETA PETG Metallic @BBL X1C.json" - }, - { - "name": "BETA PETG Transparent @BBL A1", - "sub_path": "filament/BETA/BETA PETG Transparent @BBL A1.json" - }, - { - "name": "BETA PETG Transparent @BBL A1M", - "sub_path": "filament/BETA/BETA PETG Transparent @BBL A1M.json" - }, - { - "name": "BETA PETG Transparent @BBL H2D 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG Transparent @BBL H2D 0.4 nozzle.json" - }, - { - "name": "BETA PETG Transparent @BBL X1C", - "sub_path": "filament/BETA/BETA PETG Transparent @BBL X1C.json" - }, - { - "name": "BETA PETG UV Color Change @BBL A1", - "sub_path": "filament/BETA/BETA PETG UV Color Change @BBL A1.json" - }, - { - "name": "BETA PETG UV Color Change @BBL A1M 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG UV Color Change @BBL A1M 0.4 nozzle.json" - }, - { - "name": "BETA PETG UV Color Change @BBL H2D 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG UV Color Change @BBL H2D 0.4 nozzle.json" - }, - { - "name": "BETA PETG UV Color Change @BBL X1C", - "sub_path": "filament/BETA/BETA PETG UV Color Change @BBL X1C.json" - }, - { - "name": "BETA PETG-CF @BBL A1 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG-CF @BBL A1 0.4 nozzle.json" - }, - { - "name": "BETA PETG-CF @BBL A1M 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG-CF @BBL A1M 0.4 nozzle.json" - }, - { - "name": "BETA PETG-CF @BBL H2D 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG-CF @BBL H2D 0.4 nozzle.json" - }, - { - "name": "BETA PETG-CF @BBL P1P 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG-CF @BBL P1P 0.4 nozzle.json" - }, - { - "name": "BETA PETG-CF @BBL X1C 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG-CF @BBL X1C 0.4 nozzle.json" - }, - { - "name": "BETA PETG-GF @BBL A1 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG-GF @BBL A1 0.4 nozzle.json" - }, - { - "name": "BETA PETG-GF @BBL A1M 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG-GF @BBL A1M 0.4 nozzle.json" - }, - { - "name": "BETA PETG-GF @BBL H2D 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG-GF @BBL H2D 0.4 nozzle.json" - }, - { - "name": "BETA PETG-GF @BBL P1P 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG-GF @BBL P1P 0.4 nozzle.json" - }, - { - "name": "BETA PETG-GF @BBL X1C 0.4 nozzle", - "sub_path": "filament/BETA/BETA PETG-GF @BBL X1C 0.4 nozzle.json" - }, { "name": "Bambu PET-CF @BBL A1", "sub_path": "filament/Bambu PET-CF @BBL A1.json" @@ -4637,18 +3901,10 @@ "name": "Fiberon PET-CF @BBL X1C", "sub_path": "filament/Polymaker/Fiberon PET-CF @BBL X1C.json" }, - { - "name": "Fiberon PET-CF17 @BBL X1", - "sub_path": "filament/Polymaker/Fiberon PET-CF17 @BBL X1.json" - }, { "name": "Fiberon PETG-ESD @BBL H2D", "sub_path": "filament/Polymaker/Fiberon PETG-ESD @BBL H2D.json" }, - { - "name": "Fiberon PETG-ESD @BBL X1", - "sub_path": "filament/Polymaker/Fiberon PETG-ESD @BBL X1.json" - }, { "name": "Fiberon PETG-ESD @BBL X1C", "sub_path": "filament/Polymaker/Fiberon PETG-ESD @BBL X1C.json" @@ -4661,10 +3917,6 @@ "name": "Fiberon PETG-rCF @BBL X1C", "sub_path": "filament/Polymaker/Fiberon PETG-rCF @BBL X1C.json" }, - { - "name": "Fiberon PETG-rCF08 @BBL X1", - "sub_path": "filament/Polymaker/Fiberon PETG-rCF08 @BBL X1.json" - }, { "name": "Generic PETG", "sub_path": "filament/Generic PETG.json" @@ -4761,30 +4013,6 @@ "name": "Generic PETG @BBL X2D 0.4 nozzle", "sub_path": "filament/Generic PETG @BBL X2D 0.4 nozzle.json" }, - { - "name": "addnorth PETG Base", - "sub_path": "filament/addnorth/addnorth PETG Base.json" - }, - { - "name": "addnorth PETG ESD", - "sub_path": "filament/addnorth/addnorth PETG ESD.json" - }, - { - "name": "addnorth PETG Economy", - "sub_path": "filament/addnorth/addnorth PETG Economy.json" - }, - { - "name": "addnorth PETG Flame v0", - "sub_path": "filament/addnorth/addnorth PETG Flame v0.json" - }, - { - "name": "addnorth PETG PRO Matte", - "sub_path": "filament/addnorth/addnorth PETG PRO Matte.json" - }, - { - "name": "addnorth PETG rPETG Matte", - "sub_path": "filament/addnorth/addnorth PETG rPETG Matte.json" - }, { "name": "Generic PETG HF @BBL A1", "sub_path": "filament/Generic PETG HF @BBL A1.json" @@ -4937,10 +4165,6 @@ "name": "Generic PETG-CF @BBL X2D 0.4 nozzle", "sub_path": "filament/Generic PETG-CF @BBL X2D 0.4 nozzle.json" }, - { - "name": "addnorth PETG-CF Rigid X", - "sub_path": "filament/addnorth/addnorth PETG-CF Rigid X.json" - }, { "name": "PolyLite PETG @BBL A1", "sub_path": "filament/Polymaker/PolyLite PETG @BBL A1.json" @@ -5069,426 +4293,6 @@ "name": "Generic PHA @BBL X2D 0.4 nozzle", "sub_path": "filament/Generic PHA @BBL X2D 0.4 nozzle.json" }, - { - "name": "BETA PLA Basic @BBL A1", - "sub_path": "filament/BETA/BETA PLA Basic @BBL A1.json" - }, - { - "name": "BETA PLA Basic @BBL A1M", - "sub_path": "filament/BETA/BETA PLA Basic @BBL A1M.json" - }, - { - "name": "BETA PLA Basic @BBL H2D", - "sub_path": "filament/BETA/BETA PLA Basic @BBL H2D.json" - }, - { - "name": "BETA PLA Basic @BBL P1P", - "sub_path": "filament/BETA/BETA PLA Basic @BBL P1P.json" - }, - { - "name": "BETA PLA Basic @BBL X1C", - "sub_path": "filament/BETA/BETA PLA Basic @BBL X1C.json" - }, - { - "name": "BETA PLA Chameleon @BBL A1", - "sub_path": "filament/BETA/BETA PLA Chameleon @BBL A1.json" - }, - { - "name": "BETA PLA Chameleon @BBL A1M", - "sub_path": "filament/BETA/BETA PLA Chameleon @BBL A1M.json" - }, - { - "name": "BETA PLA Chameleon @BBL H2D", - "sub_path": "filament/BETA/BETA PLA Chameleon @BBL H2D.json" - }, - { - "name": "BETA PLA Chameleon @BBL P1P", - "sub_path": "filament/BETA/BETA PLA Chameleon @BBL P1P.json" - }, - { - "name": "BETA PLA Chameleon @BBL X1C", - "sub_path": "filament/BETA/BETA PLA Chameleon @BBL X1C.json" - }, - { - "name": "BETA PLA Fluorescence @BBL A1", - "sub_path": "filament/BETA/BETA PLA Fluorescence @BBL A1.json" - }, - { - "name": "BETA PLA Fluorescence @BBL A1M", - "sub_path": "filament/BETA/BETA PLA Fluorescence @BBL A1M.json" - }, - { - "name": "BETA PLA Fluorescence @BBL H2D", - "sub_path": "filament/BETA/BETA PLA Fluorescence @BBL H2D.json" - }, - { - "name": "BETA PLA Fluorescence @BBL P1P", - "sub_path": "filament/BETA/BETA PLA Fluorescence @BBL P1P.json" - }, - { - "name": "BETA PLA Fluorescence @BBL X1C", - "sub_path": "filament/BETA/BETA PLA Fluorescence @BBL X1C.json" - }, - { - "name": "BETA PLA Glitter @BBL A1", - "sub_path": "filament/BETA/BETA PLA Glitter @BBL A1.json" - }, - { - "name": "BETA PLA Glitter @BBL A1M", - "sub_path": "filament/BETA/BETA PLA Glitter @BBL A1M.json" - }, - { - "name": "BETA PLA Glitter @BBL H2D", - "sub_path": "filament/BETA/BETA PLA Glitter @BBL H2D.json" - }, - { - "name": "BETA PLA Glitter @BBL P1P", - "sub_path": "filament/BETA/BETA PLA Glitter @BBL P1P.json" - }, - { - "name": "BETA PLA Glitter @BBL X1C", - "sub_path": "filament/BETA/BETA PLA Glitter @BBL X1C.json" - }, - { - "name": "BETA PLA Glow @BBL A1", - "sub_path": "filament/BETA/BETA PLA Glow @BBL A1.json" - }, - { - "name": "BETA PLA Glow @BBL A1M", - "sub_path": "filament/BETA/BETA PLA Glow @BBL A1M.json" - }, - { - "name": "BETA PLA Glow @BBL H2D", - "sub_path": "filament/BETA/BETA PLA Glow @BBL H2D.json" - }, - { - "name": "BETA PLA Glow @BBL P1P", - "sub_path": "filament/BETA/BETA PLA Glow @BBL P1P.json" - }, - { - "name": "BETA PLA Glow @BBL X1C", - "sub_path": "filament/BETA/BETA PLA Glow @BBL X1C.json" - }, - { - "name": "BETA PLA Gradient @BBL A1", - "sub_path": "filament/BETA/BETA PLA Gradient @BBL A1.json" - }, - { - "name": "BETA PLA Gradient @BBL A1M", - "sub_path": "filament/BETA/BETA PLA Gradient @BBL A1M.json" - }, - { - "name": "BETA PLA Gradient @BBL H2D", - "sub_path": "filament/BETA/BETA PLA Gradient @BBL H2D.json" - }, - { - "name": "BETA PLA Gradient @BBL P1P", - "sub_path": "filament/BETA/BETA PLA Gradient @BBL P1P.json" - }, - { - "name": "BETA PLA Gradient @BBL X1C", - "sub_path": "filament/BETA/BETA PLA Gradient @BBL X1C.json" - }, - { - "name": "BETA PLA Heat Color Change @BBL A1", - "sub_path": "filament/BETA/BETA PLA Heat Color Change @BBL A1.json" - }, - { - "name": "BETA PLA Heat Color Change @BBL A1M", - "sub_path": "filament/BETA/BETA PLA Heat Color Change @BBL A1M.json" - }, - { - "name": "BETA PLA Heat Color Change @BBL H2D", - "sub_path": "filament/BETA/BETA PLA Heat Color Change @BBL H2D.json" - }, - { - "name": "BETA PLA Heat Color Change @BBL P1P", - "sub_path": "filament/BETA/BETA PLA Heat Color Change @BBL P1P.json" - }, - { - "name": "BETA PLA Heat Color Change @BBL X1C", - "sub_path": "filament/BETA/BETA PLA Heat Color Change @BBL X1C.json" - }, - { - "name": "BETA PLA High Speed @BBL A1", - "sub_path": "filament/BETA/BETA PLA High Speed @BBL A1.json" - }, - { - "name": "BETA PLA High Speed @BBL A1M", - "sub_path": "filament/BETA/BETA PLA High Speed @BBL A1M.json" - }, - { - "name": "BETA PLA High Speed @BBL H2D", - "sub_path": "filament/BETA/BETA PLA High Speed @BBL H2D.json" - }, - { - "name": "BETA PLA High Speed @BBL P1P", - "sub_path": "filament/BETA/BETA PLA High Speed @BBL P1P.json" - }, - { - "name": "BETA PLA High Speed @BBL X1C", - "sub_path": "filament/BETA/BETA PLA High Speed @BBL X1C.json" - }, - { - "name": "BETA PLA High Temp @BBL A1", - "sub_path": "filament/BETA/BETA PLA High Temp @BBL A1.json" - }, - { - "name": "BETA PLA High Temp @BBL A1M", - "sub_path": "filament/BETA/BETA PLA High Temp @BBL A1M.json" - }, - { - "name": "BETA PLA High Temp @BBL H2D", - "sub_path": "filament/BETA/BETA PLA High Temp @BBL H2D.json" - }, - { - "name": "BETA PLA High Temp @BBL P1P", - "sub_path": "filament/BETA/BETA PLA High Temp @BBL P1P.json" - }, - { - "name": "BETA PLA High Temp @BBL X1C", - "sub_path": "filament/BETA/BETA PLA High Temp @BBL X1C.json" - }, - { - "name": "BETA PLA Marble @BBL A1", - "sub_path": "filament/BETA/BETA PLA Marble @BBL A1.json" - }, - { - "name": "BETA PLA Marble @BBL A1M", - "sub_path": "filament/BETA/BETA PLA Marble @BBL A1M.json" - }, - { - "name": "BETA PLA Marble @BBL H2D", - "sub_path": "filament/BETA/BETA PLA Marble @BBL H2D.json" - }, - { - "name": "BETA PLA Marble @BBL P1P", - "sub_path": "filament/BETA/BETA PLA Marble @BBL P1P.json" - }, - { - "name": "BETA PLA Marble @BBL X1C", - "sub_path": "filament/BETA/BETA PLA Marble @BBL X1C.json" - }, - { - "name": "BETA PLA Matte @BBL A1", - "sub_path": "filament/BETA/BETA PLA Matte @BBL A1.json" - }, - { - "name": "BETA PLA Matte @BBL A1M", - "sub_path": "filament/BETA/BETA PLA Matte @BBL A1M.json" - }, - { - "name": "BETA PLA Matte @BBL H2D", - "sub_path": "filament/BETA/BETA PLA Matte @BBL H2D.json" - }, - { - "name": "BETA PLA Matte @BBL P1P", - "sub_path": "filament/BETA/BETA PLA Matte @BBL P1P.json" - }, - { - "name": "BETA PLA Matte @BBL X1C", - "sub_path": "filament/BETA/BETA PLA Matte @BBL X1C.json" - }, - { - "name": "BETA PLA Metal @BBL A1", - "sub_path": "filament/BETA/BETA PLA Metal @BBL A1.json" - }, - { - "name": "BETA PLA Metal @BBL A1M", - "sub_path": "filament/BETA/BETA PLA Metal @BBL A1M.json" - }, - { - "name": "BETA PLA Metal @BBL H2D", - "sub_path": "filament/BETA/BETA PLA Metal @BBL H2D.json" - }, - { - "name": "BETA PLA Metal @BBL P1P", - "sub_path": "filament/BETA/BETA PLA Metal @BBL P1P.json" - }, - { - "name": "BETA PLA Metal @BBL X1C", - "sub_path": "filament/BETA/BETA PLA Metal @BBL X1C.json" - }, - { - "name": "BETA PLA Metallic @BBL A1", - "sub_path": "filament/BETA/BETA PLA Metallic @BBL A1.json" - }, - { - "name": "BETA PLA Metallic @BBL A1M", - "sub_path": "filament/BETA/BETA PLA Metallic @BBL A1M.json" - }, - { - "name": "BETA PLA Metallic @BBL H2D", - "sub_path": "filament/BETA/BETA PLA Metallic @BBL H2D.json" - }, - { - "name": "BETA PLA Metallic @BBL P1P", - "sub_path": "filament/BETA/BETA PLA Metallic @BBL P1P.json" - }, - { - "name": "BETA PLA Metallic @BBL X1C", - "sub_path": "filament/BETA/BETA PLA Metallic @BBL X1C.json" - }, - { - "name": "BETA PLA PRO @BBL A1", - "sub_path": "filament/BETA/BETA PLA PRO @BBL A1.json" - }, - { - "name": "BETA PLA PRO @BBL A1M", - "sub_path": "filament/BETA/BETA PLA PRO @BBL A1M.json" - }, - { - "name": "BETA PLA PRO @BBL H2D", - "sub_path": "filament/BETA/BETA PLA PRO @BBL H2D.json" - }, - { - "name": "BETA PLA PRO @BBL P1P", - "sub_path": "filament/BETA/BETA PLA PRO @BBL P1P.json" - }, - { - "name": "BETA PLA PRO @BBL X1C", - "sub_path": "filament/BETA/BETA PLA PRO @BBL X1C.json" - }, - { - "name": "BETA PLA Silk @BBL A1", - "sub_path": "filament/BETA/BETA PLA Silk @BBL A1.json" - }, - { - "name": "BETA PLA Silk @BBL A1M", - "sub_path": "filament/BETA/BETA PLA Silk @BBL A1M.json" - }, - { - "name": "BETA PLA Silk @BBL H2D", - "sub_path": "filament/BETA/BETA PLA Silk @BBL H2D.json" - }, - { - "name": "BETA PLA Silk @BBL P1P", - "sub_path": "filament/BETA/BETA PLA Silk @BBL P1P.json" - }, - { - "name": "BETA PLA Silk @BBL X1C", - "sub_path": "filament/BETA/BETA PLA Silk @BBL X1C.json" - }, - { - "name": "BETA PLA Silk+ @BBL A1", - "sub_path": "filament/BETA/BETA PLA Silk+ @BBL A1.json" - }, - { - "name": "BETA PLA Silk+ @BBL A1M", - "sub_path": "filament/BETA/BETA PLA Silk+ @BBL A1M.json" - }, - { - "name": "BETA PLA Silk+ @BBL H2D", - "sub_path": "filament/BETA/BETA PLA Silk+ @BBL H2D.json" - }, - { - "name": "BETA PLA Silk+ @BBL P1P", - "sub_path": "filament/BETA/BETA PLA Silk+ @BBL P1P.json" - }, - { - "name": "BETA PLA Silk+ @BBL X1C", - "sub_path": "filament/BETA/BETA PLA Silk+ @BBL X1C.json" - }, - { - "name": "BETA PLA Transparent @BBL A1", - "sub_path": "filament/BETA/BETA PLA Transparent @BBL A1.json" - }, - { - "name": "BETA PLA Transparent @BBL A1M", - "sub_path": "filament/BETA/BETA PLA Transparent @BBL A1M.json" - }, - { - "name": "BETA PLA Transparent @BBL H2D", - "sub_path": "filament/BETA/BETA PLA Transparent @BBL H2D.json" - }, - { - "name": "BETA PLA Transparent @BBL P1P", - "sub_path": "filament/BETA/BETA PLA Transparent @BBL P1P.json" - }, - { - "name": "BETA PLA Transparent @BBL X1C", - "sub_path": "filament/BETA/BETA PLA Transparent @BBL X1C.json" - }, - { - "name": "BETA PLA UV Color Change @BBL A1", - "sub_path": "filament/BETA/BETA PLA UV Color Change @BBL A1.json" - }, - { - "name": "BETA PLA UV Color Change @BBL A1M", - "sub_path": "filament/BETA/BETA PLA UV Color Change @BBL A1M.json" - }, - { - "name": "BETA PLA UV Color Change @BBL H2D", - "sub_path": "filament/BETA/BETA PLA UV Color Change @BBL H2D.json" - }, - { - "name": "BETA PLA UV Color Change @BBL P1P", - "sub_path": "filament/BETA/BETA PLA UV Color Change @BBL P1P.json" - }, - { - "name": "BETA PLA UV Color Change @BBL X1C", - "sub_path": "filament/BETA/BETA PLA UV Color Change @BBL X1C.json" - }, - { - "name": "BETA PLA Wood @BBL A1", - "sub_path": "filament/BETA/BETA PLA Wood @BBL A1.json" - }, - { - "name": "BETA PLA Wood @BBL A1M", - "sub_path": "filament/BETA/BETA PLA Wood @BBL A1M.json" - }, - { - "name": "BETA PLA Wood @BBL H2D", - "sub_path": "filament/BETA/BETA PLA Wood @BBL H2D.json" - }, - { - "name": "BETA PLA Wood @BBL P1P", - "sub_path": "filament/BETA/BETA PLA Wood @BBL P1P.json" - }, - { - "name": "BETA PLA Wood @BBL X1C", - "sub_path": "filament/BETA/BETA PLA Wood @BBL X1C.json" - }, - { - "name": "BETA PLA Youth @BBL A1", - "sub_path": "filament/BETA/BETA PLA Youth @BBL A1.json" - }, - { - "name": "BETA PLA Youth @BBL A1M", - "sub_path": "filament/BETA/BETA PLA Youth @BBL A1M.json" - }, - { - "name": "BETA PLA Youth @BBL H2D", - "sub_path": "filament/BETA/BETA PLA Youth @BBL H2D.json" - }, - { - "name": "BETA PLA Youth @BBL P1P", - "sub_path": "filament/BETA/BETA PLA Youth @BBL P1P.json" - }, - { - "name": "BETA PLA Youth @BBL X1C", - "sub_path": "filament/BETA/BETA PLA Youth @BBL X1C.json" - }, - { - "name": "BETA PLA-CF @BBL A1", - "sub_path": "filament/BETA/BETA PLA-CF @BBL A1.json" - }, - { - "name": "BETA PLA-CF @BBL A1M", - "sub_path": "filament/BETA/BETA PLA-CF @BBL A1M.json" - }, - { - "name": "BETA PLA-CF @BBL H2D 0.4 nozzle", - "sub_path": "filament/BETA/BETA PLA-CF @BBL H2D 0.4 nozzle.json" - }, - { - "name": "BETA PLA-CF @BBL P1P", - "sub_path": "filament/BETA/BETA PLA-CF @BBL P1P.json" - }, - { - "name": "BETA PLA-CF @BBL X1C", - "sub_path": "filament/BETA/BETA PLA-CF @BBL X1C.json" - }, { "name": "Bambu PLA Aero @BBL A1", "sub_path": "filament/Bambu PLA Aero @BBL A1.json" @@ -7809,34 +6613,6 @@ "name": "Generic PLA @BBL X2D 0.4 nozzle", "sub_path": "filament/Generic PLA @BBL X2D 0.4 nozzle.json" }, - { - "name": "addnorth PLA E-PLA", - "sub_path": "filament/addnorth/addnorth PLA E-PLA.json" - }, - { - "name": "addnorth PLA Economy", - "sub_path": "filament/addnorth/addnorth PLA Economy.json" - }, - { - "name": "addnorth PLA HT-PLA PRO Matte", - "sub_path": "filament/addnorth/addnorth PLA HT-PLA PRO Matte.json" - }, - { - "name": "addnorth PLA Textura", - "sub_path": "filament/addnorth/addnorth PLA Textura.json" - }, - { - "name": "addnorth PLA Wood", - "sub_path": "filament/addnorth/addnorth PLA Wood.json" - }, - { - "name": "addnorth PLA X-PLA", - "sub_path": "filament/addnorth/addnorth PLA X-PLA.json" - }, - { - "name": "addnorth PLA rPLA RE-ADD", - "sub_path": "filament/addnorth/addnorth PLA rPLA RE-ADD.json" - }, { "name": "Generic PLA High Speed @BBL A1", "sub_path": "filament/Generic PLA High Speed @BBL A1.json" @@ -7917,10 +6693,6 @@ "name": "Generic PLA High Speed @BBL X2D 0.4 nozzle", "sub_path": "filament/Generic PLA High Speed @BBL X2D 0.4 nozzle.json" }, - { - "name": "addnorth PLA X-PLA High Speed", - "sub_path": "filament/addnorth/addnorth PLA X-PLA High Speed.json" - }, { "name": "Generic PLA Silk", "sub_path": "filament/Generic PLA Silk.json" @@ -7973,10 +6745,6 @@ "name": "Generic PLA Silk @BBL X2D 0.4 nozzle", "sub_path": "filament/Generic PLA Silk @BBL X2D 0.4 nozzle.json" }, - { - "name": "addnorth PLA Premium Silk", - "sub_path": "filament/addnorth/addnorth PLA Premium Silk.json" - }, { "name": "Generic PLA-CF", "sub_path": "filament/Generic PLA-CF.json" @@ -8029,46 +6797,6 @@ "name": "Generic PLA-CF @BBL X2D 0.4 nozzle", "sub_path": "filament/Generic PLA-CF @BBL X2D 0.4 nozzle.json" }, - { - "name": "addnorth PLA-CF Carbon Fiber", - "sub_path": "filament/addnorth/addnorth PLA-CF Carbon Fiber.json" - }, - { - "name": "Numakers PLA+ @BBL A1", - "sub_path": "filament/Numakers/Numakers PLA+ @BBL A1.json" - }, - { - "name": "Numakers PLA+ @BBL A1 0.2 nozzle", - "sub_path": "filament/Numakers/Numakers PLA+ @BBL A1 0.2 nozzle.json" - }, - { - "name": "Numakers PLA+ @BBL A1M", - "sub_path": "filament/Numakers/Numakers PLA+ @BBL A1M.json" - }, - { - "name": "Numakers PLA+ @BBL A1M 0.2 nozzle", - "sub_path": "filament/Numakers/Numakers PLA+ @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Numakers PLA+ @BBL P1P", - "sub_path": "filament/Numakers/Numakers PLA+ @BBL P1P.json" - }, - { - "name": "Numakers PLA+ @BBL P1P 0.2 nozzle", - "sub_path": "filament/Numakers/Numakers PLA+ @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Numakers PLA+ @BBL X1", - "sub_path": "filament/Numakers/Numakers PLA+ @BBL X1.json" - }, - { - "name": "Numakers PLA+ @BBL X1C", - "sub_path": "filament/Numakers/Numakers PLA+ @BBL X1C.json" - }, - { - "name": "Numakers PLA+ @BBL X1C 0.2 nozzle", - "sub_path": "filament/Numakers/Numakers PLA+ @BBL X1C 0.2 nozzle.json" - }, { "name": "Overture Matte PLA @BBL A1", "sub_path": "filament/Overture/Overture Matte PLA @BBL A1.json" @@ -8165,702 +6893,6 @@ "name": "Overture PLA @BBL X1C", "sub_path": "filament/Overture/Overture PLA @BBL X1C.json" }, - { - "name": "Overture PLA Pro @BBL A1", - "sub_path": "filament/Overture/Overture PLA Pro @BBL A1.json" - }, - { - "name": "Overture PLA Pro @BBL A1 0.2 nozzle", - "sub_path": "filament/Overture/Overture PLA Pro @BBL A1 0.2 nozzle.json" - }, - { - "name": "Overture PLA Pro @BBL A1M", - "sub_path": "filament/Overture/Overture PLA Pro @BBL A1M.json" - }, - { - "name": "Overture PLA Pro @BBL A1M 0.2 nozzle", - "sub_path": "filament/Overture/Overture PLA Pro @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Overture PLA Pro @BBL P1P", - "sub_path": "filament/Overture/Overture PLA Pro @BBL P1P.json" - }, - { - "name": "Overture PLA Pro @BBL P1P 0.2 nozzle", - "sub_path": "filament/Overture/Overture PLA Pro @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Overture PLA Pro @BBL X1", - "sub_path": "filament/Overture/Overture PLA Pro @BBL X1.json" - }, - { - "name": "Overture PLA Pro @BBL X1 0.2 nozzle", - "sub_path": "filament/Overture/Overture PLA Pro @BBL X1 0.2 nozzle.json" - }, - { - "name": "Overture PLA Pro @BBL X1C", - "sub_path": "filament/Overture/Overture PLA Pro @BBL X1C.json" - }, - { - "name": "Overture PLA Pro @BBL X1C 0.2 nozzle", - "sub_path": "filament/Overture/Overture PLA Pro @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Panchroma CoPE @BBL A1", - "sub_path": "filament/Polymaker/Panchroma CoPE @BBL A1.json" - }, - { - "name": "Panchroma CoPE @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma CoPE @BBL A1 0.2 nozzle.json" - }, - { - "name": "Panchroma CoPE @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma CoPE @BBL A1M.json" - }, - { - "name": "Panchroma CoPE @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma CoPE @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Panchroma CoPE @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma CoPE @BBL P1P.json" - }, - { - "name": "Panchroma CoPE @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma CoPE @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Panchroma CoPE @BBL X1", - "sub_path": "filament/Polymaker/Panchroma CoPE @BBL X1.json" - }, - { - "name": "Panchroma CoPE @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma CoPE @BBL X1 0.2 nozzle.json" - }, - { - "name": "Panchroma CoPE @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma CoPE @BBL X1C.json" - }, - { - "name": "Panchroma CoPE @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma CoPE @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA @BBL A1", - "sub_path": "filament/Polymaker/Panchroma PLA @BBL A1.json" - }, - { - "name": "Panchroma PLA @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA @BBL A1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma PLA @BBL A1M.json" - }, - { - "name": "Panchroma PLA @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma PLA @BBL P1P.json" - }, - { - "name": "Panchroma PLA @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA @BBL X1", - "sub_path": "filament/Polymaker/Panchroma PLA @BBL X1.json" - }, - { - "name": "Panchroma PLA @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA @BBL X1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma PLA @BBL X1C.json" - }, - { - "name": "Panchroma PLA @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Celestial @BBL A1", - "sub_path": "filament/Polymaker/Panchroma PLA Celestial @BBL A1.json" - }, - { - "name": "Panchroma PLA Celestial @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Celestial @BBL A1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Celestial @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma PLA Celestial @BBL A1M.json" - }, - { - "name": "Panchroma PLA Celestial @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Celestial @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Celestial @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma PLA Celestial @BBL P1P.json" - }, - { - "name": "Panchroma PLA Celestial @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Celestial @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Celestial @BBL X1", - "sub_path": "filament/Polymaker/Panchroma PLA Celestial @BBL X1.json" - }, - { - "name": "Panchroma PLA Celestial @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Celestial @BBL X1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Celestial @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma PLA Celestial @BBL X1C.json" - }, - { - "name": "Panchroma PLA Celestial @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Celestial @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Galaxy @BBL A1", - "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @BBL A1.json" - }, - { - "name": "Panchroma PLA Galaxy @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @BBL A1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Galaxy @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @BBL A1M.json" - }, - { - "name": "Panchroma PLA Galaxy @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Galaxy @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @BBL P1P.json" - }, - { - "name": "Panchroma PLA Galaxy @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Galaxy @BBL X1", - "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @BBL X1.json" - }, - { - "name": "Panchroma PLA Galaxy @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @BBL X1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Galaxy @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @BBL X1C.json" - }, - { - "name": "Panchroma PLA Galaxy @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Glow @BBL A1", - "sub_path": "filament/Polymaker/Panchroma PLA Glow @BBL A1.json" - }, - { - "name": "Panchroma PLA Glow @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Glow @BBL A1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Glow @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma PLA Glow @BBL A1M.json" - }, - { - "name": "Panchroma PLA Glow @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Glow @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Glow @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma PLA Glow @BBL P1P.json" - }, - { - "name": "Panchroma PLA Glow @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Glow @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Glow @BBL X1", - "sub_path": "filament/Polymaker/Panchroma PLA Glow @BBL X1.json" - }, - { - "name": "Panchroma PLA Glow @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Glow @BBL X1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Glow @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma PLA Glow @BBL X1C.json" - }, - { - "name": "Panchroma PLA Glow @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Glow @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Luminous @BBL A1", - "sub_path": "filament/Polymaker/Panchroma PLA Luminous @BBL A1.json" - }, - { - "name": "Panchroma PLA Luminous @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Luminous @BBL A1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Luminous @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma PLA Luminous @BBL A1M.json" - }, - { - "name": "Panchroma PLA Luminous @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Luminous @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Luminous @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma PLA Luminous @BBL P1P.json" - }, - { - "name": "Panchroma PLA Luminous @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Luminous @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Luminous @BBL X1", - "sub_path": "filament/Polymaker/Panchroma PLA Luminous @BBL X1.json" - }, - { - "name": "Panchroma PLA Luminous @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Luminous @BBL X1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Luminous @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma PLA Luminous @BBL X1C.json" - }, - { - "name": "Panchroma PLA Luminous @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Luminous @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Marble @BBL A1", - "sub_path": "filament/Polymaker/Panchroma PLA Marble @BBL A1.json" - }, - { - "name": "Panchroma PLA Marble @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Marble @BBL A1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Marble @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma PLA Marble @BBL A1M.json" - }, - { - "name": "Panchroma PLA Marble @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Marble @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Marble @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma PLA Marble @BBL P1P.json" - }, - { - "name": "Panchroma PLA Marble @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Marble @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Marble @BBL X1", - "sub_path": "filament/Polymaker/Panchroma PLA Marble @BBL X1.json" - }, - { - "name": "Panchroma PLA Marble @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Marble @BBL X1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Marble @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma PLA Marble @BBL X1C.json" - }, - { - "name": "Panchroma PLA Marble @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Marble @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Matte @BBL A1", - "sub_path": "filament/Polymaker/Panchroma PLA Matte @BBL A1.json" - }, - { - "name": "Panchroma PLA Matte @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Matte @BBL A1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Matte @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma PLA Matte @BBL A1M.json" - }, - { - "name": "Panchroma PLA Matte @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Matte @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Matte @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma PLA Matte @BBL P1P.json" - }, - { - "name": "Panchroma PLA Matte @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Matte @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Matte @BBL X1", - "sub_path": "filament/Polymaker/Panchroma PLA Matte @BBL X1.json" - }, - { - "name": "Panchroma PLA Matte @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Matte @BBL X1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Matte @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma PLA Matte @BBL X1C.json" - }, - { - "name": "Panchroma PLA Matte @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Matte @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Metallic @BBL A1", - "sub_path": "filament/Polymaker/Panchroma PLA Metallic @BBL A1.json" - }, - { - "name": "Panchroma PLA Metallic @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Metallic @BBL A1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Metallic @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma PLA Metallic @BBL A1M.json" - }, - { - "name": "Panchroma PLA Metallic @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Metallic @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Metallic @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma PLA Metallic @BBL P1P.json" - }, - { - "name": "Panchroma PLA Metallic @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Metallic @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Metallic @BBL X1", - "sub_path": "filament/Polymaker/Panchroma PLA Metallic @BBL X1.json" - }, - { - "name": "Panchroma PLA Metallic @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Metallic @BBL X1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Metallic @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma PLA Metallic @BBL X1C.json" - }, - { - "name": "Panchroma PLA Metallic @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Metallic @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Neon @BBL A1", - "sub_path": "filament/Polymaker/Panchroma PLA Neon @BBL A1.json" - }, - { - "name": "Panchroma PLA Neon @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Neon @BBL A1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Neon @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma PLA Neon @BBL A1M.json" - }, - { - "name": "Panchroma PLA Neon @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Neon @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Neon @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma PLA Neon @BBL P1P.json" - }, - { - "name": "Panchroma PLA Neon @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Neon @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Neon @BBL X1", - "sub_path": "filament/Polymaker/Panchroma PLA Neon @BBL X1.json" - }, - { - "name": "Panchroma PLA Neon @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Neon @BBL X1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Neon @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma PLA Neon @BBL X1C.json" - }, - { - "name": "Panchroma PLA Neon @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Neon @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Satin @BBL A1", - "sub_path": "filament/Polymaker/Panchroma PLA Satin @BBL A1.json" - }, - { - "name": "Panchroma PLA Satin @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Satin @BBL A1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Satin @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma PLA Satin @BBL A1M.json" - }, - { - "name": "Panchroma PLA Satin @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Satin @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Satin @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma PLA Satin @BBL P1P.json" - }, - { - "name": "Panchroma PLA Satin @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Satin @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Satin @BBL X1", - "sub_path": "filament/Polymaker/Panchroma PLA Satin @BBL X1.json" - }, - { - "name": "Panchroma PLA Satin @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Satin @BBL X1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Satin @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma PLA Satin @BBL X1C.json" - }, - { - "name": "Panchroma PLA Satin @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Satin @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Silk @BBL A1", - "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL A1.json" - }, - { - "name": "Panchroma PLA Silk @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL A1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Silk @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL A1M.json" - }, - { - "name": "Panchroma PLA Silk @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Silk @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL P1P.json" - }, - { - "name": "Panchroma PLA Silk @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Silk @BBL X1", - "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL X1.json" - }, - { - "name": "Panchroma PLA Silk @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL X1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Silk @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL X1C.json" - }, - { - "name": "Panchroma PLA Silk @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Starlight @BBL A1", - "sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL A1.json" - }, - { - "name": "Panchroma PLA Starlight @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL A1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Starlight @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL A1M.json" - }, - { - "name": "Panchroma PLA Starlight @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Starlight @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL P1P.json" - }, - { - "name": "Panchroma PLA Starlight @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Starlight @BBL X1", - "sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL X1.json" - }, - { - "name": "Panchroma PLA Starlight @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL X1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Starlight @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL X1C.json" - }, - { - "name": "Panchroma PLA Starlight @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Temp Shift @BBL A1", - "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @BBL A1.json" - }, - { - "name": "Panchroma PLA Temp Shift @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @BBL A1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Temp Shift @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @BBL A1M.json" - }, - { - "name": "Panchroma PLA Temp Shift @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Temp Shift @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @BBL P1P.json" - }, - { - "name": "Panchroma PLA Temp Shift @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Temp Shift @BBL X1", - "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @BBL X1.json" - }, - { - "name": "Panchroma PLA Temp Shift @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @BBL X1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Temp Shift @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @BBL X1C.json" - }, - { - "name": "Panchroma PLA Temp Shift @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Translucent @BBL A1", - "sub_path": "filament/Polymaker/Panchroma PLA Translucent @BBL A1.json" - }, - { - "name": "Panchroma PLA Translucent @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Translucent @BBL A1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Translucent @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma PLA Translucent @BBL A1M.json" - }, - { - "name": "Panchroma PLA Translucent @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Translucent @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Translucent @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma PLA Translucent @BBL P1P.json" - }, - { - "name": "Panchroma PLA Translucent @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Translucent @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Translucent @BBL X1", - "sub_path": "filament/Polymaker/Panchroma PLA Translucent @BBL X1.json" - }, - { - "name": "Panchroma PLA Translucent @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Translucent @BBL X1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA Translucent @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma PLA Translucent @BBL X1C.json" - }, - { - "name": "Panchroma PLA Translucent @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA Translucent @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA UV Shift @BBL A1", - "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @BBL A1.json" - }, - { - "name": "Panchroma PLA UV Shift @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @BBL A1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA UV Shift @BBL A1M", - "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @BBL A1M.json" - }, - { - "name": "Panchroma PLA UV Shift @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA UV Shift @BBL P1P", - "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @BBL P1P.json" - }, - { - "name": "Panchroma PLA UV Shift @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA UV Shift @BBL X1", - "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @BBL X1.json" - }, - { - "name": "Panchroma PLA UV Shift @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @BBL X1 0.2 nozzle.json" - }, - { - "name": "Panchroma PLA UV Shift @BBL X1C", - "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @BBL X1C.json" - }, - { - "name": "Panchroma PLA UV Shift @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @BBL X1C 0.2 nozzle.json" - }, - { - "name": "PolyLite CosPLA @BBL A1", - "sub_path": "filament/Polymaker/PolyLite CosPLA @BBL A1.json" - }, - { - "name": "PolyLite CosPLA @BBL A1M", - "sub_path": "filament/Polymaker/PolyLite CosPLA @BBL A1M.json" - }, - { - "name": "PolyLite CosPLA @BBL P1P", - "sub_path": "filament/Polymaker/PolyLite CosPLA @BBL P1P.json" - }, - { - "name": "PolyLite CosPLA @BBL X1", - "sub_path": "filament/Polymaker/PolyLite CosPLA @BBL X1.json" - }, { "name": "PolyLite PLA @BBL A1", "sub_path": "filament/Polymaker/PolyLite PLA @BBL A1.json" @@ -8913,142 +6945,6 @@ "name": "PolyLite PLA @BBL X1C", "sub_path": "filament/Polymaker/PolyLite PLA @BBL X1C.json" }, - { - "name": "PolyLite PLA Galaxy @BBL A1", - "sub_path": "filament/Polymaker/PolyLite PLA Galaxy @BBL A1.json" - }, - { - "name": "PolyLite PLA Galaxy @BBL A1M", - "sub_path": "filament/Polymaker/PolyLite PLA Galaxy @BBL A1M.json" - }, - { - "name": "PolyLite PLA Galaxy @BBL P1P", - "sub_path": "filament/Polymaker/PolyLite PLA Galaxy @BBL P1P.json" - }, - { - "name": "PolyLite PLA Galaxy @BBL X1", - "sub_path": "filament/Polymaker/PolyLite PLA Galaxy @BBL X1.json" - }, - { - "name": "PolyLite PLA Glow @BBL A1", - "sub_path": "filament/Polymaker/PolyLite PLA Glow @BBL A1.json" - }, - { - "name": "PolyLite PLA Glow @BBL A1M", - "sub_path": "filament/Polymaker/PolyLite PLA Glow @BBL A1M.json" - }, - { - "name": "PolyLite PLA Glow @BBL P1P", - "sub_path": "filament/Polymaker/PolyLite PLA Glow @BBL P1P.json" - }, - { - "name": "PolyLite PLA Glow @BBL X1", - "sub_path": "filament/Polymaker/PolyLite PLA Glow @BBL X1.json" - }, - { - "name": "PolyLite PLA Luminous @BBL A1", - "sub_path": "filament/Polymaker/PolyLite PLA Luminous @BBL A1.json" - }, - { - "name": "PolyLite PLA Luminous @BBL A1M", - "sub_path": "filament/Polymaker/PolyLite PLA Luminous @BBL A1M.json" - }, - { - "name": "PolyLite PLA Luminous @BBL P1P", - "sub_path": "filament/Polymaker/PolyLite PLA Luminous @BBL P1P.json" - }, - { - "name": "PolyLite PLA Luminous @BBL X1", - "sub_path": "filament/Polymaker/PolyLite PLA Luminous @BBL X1.json" - }, - { - "name": "PolyLite PLA Neon @BBL A1", - "sub_path": "filament/Polymaker/PolyLite PLA Neon @BBL A1.json" - }, - { - "name": "PolyLite PLA Neon @BBL A1M", - "sub_path": "filament/Polymaker/PolyLite PLA Neon @BBL A1M.json" - }, - { - "name": "PolyLite PLA Neon @BBL P1P", - "sub_path": "filament/Polymaker/PolyLite PLA Neon @BBL P1P.json" - }, - { - "name": "PolyLite PLA Neon @BBL X1", - "sub_path": "filament/Polymaker/PolyLite PLA Neon @BBL X1.json" - }, - { - "name": "PolyLite PLA Pro @BBL A1", - "sub_path": "filament/Polymaker/PolyLite PLA Pro @BBL A1.json" - }, - { - "name": "PolyLite PLA Pro @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/PolyLite PLA Pro @BBL A1 0.2 nozzle.json" - }, - { - "name": "PolyLite PLA Pro @BBL A1M", - "sub_path": "filament/Polymaker/PolyLite PLA Pro @BBL A1M.json" - }, - { - "name": "PolyLite PLA Pro @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/PolyLite PLA Pro @BBL A1M 0.2 nozzle.json" - }, - { - "name": "PolyLite PLA Pro @BBL P1P", - "sub_path": "filament/Polymaker/PolyLite PLA Pro @BBL P1P.json" - }, - { - "name": "PolyLite PLA Pro @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/PolyLite PLA Pro @BBL P1P 0.2 nozzle.json" - }, - { - "name": "PolyLite PLA Pro @BBL X1", - "sub_path": "filament/Polymaker/PolyLite PLA Pro @BBL X1.json" - }, - { - "name": "PolyLite PLA Pro @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/PolyLite PLA Pro @BBL X1 0.2 nozzle.json" - }, - { - "name": "PolyLite PLA Pro @BBL X1C", - "sub_path": "filament/Polymaker/PolyLite PLA Pro @BBL X1C.json" - }, - { - "name": "PolyLite PLA Pro @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/PolyLite PLA Pro @BBL X1C 0.2 nozzle.json" - }, - { - "name": "PolyLite PLA Starlight @BBL A1", - "sub_path": "filament/Polymaker/PolyLite PLA Starlight @BBL A1.json" - }, - { - "name": "PolyLite PLA Starlight @BBL A1M", - "sub_path": "filament/Polymaker/PolyLite PLA Starlight @BBL A1M.json" - }, - { - "name": "PolyLite PLA Starlight @BBL P1P", - "sub_path": "filament/Polymaker/PolyLite PLA Starlight @BBL P1P.json" - }, - { - "name": "PolyLite PLA Starlight @BBL X1", - "sub_path": "filament/Polymaker/PolyLite PLA Starlight @BBL X1.json" - }, - { - "name": "PolyLite PLA Translucent @BBL A1", - "sub_path": "filament/Polymaker/PolyLite PLA Translucent @BBL A1.json" - }, - { - "name": "PolyLite PLA Translucent @BBL A1M", - "sub_path": "filament/Polymaker/PolyLite PLA Translucent @BBL A1M.json" - }, - { - "name": "PolyLite PLA Translucent @BBL P1P", - "sub_path": "filament/Polymaker/PolyLite PLA Translucent @BBL P1P.json" - }, - { - "name": "PolyLite PLA Translucent @BBL X1", - "sub_path": "filament/Polymaker/PolyLite PLA Translucent @BBL X1.json" - }, { "name": "PolyTerra PLA @BBL A1", "sub_path": "filament/Polymaker/PolyTerra PLA @BBL A1.json" @@ -9101,118 +6997,6 @@ "name": "PolyTerra PLA @BBL X1C", "sub_path": "filament/Polymaker/PolyTerra PLA @BBL X1C.json" }, - { - "name": "PolyTerra PLA Marble @BBL A1", - "sub_path": "filament/Polymaker/PolyTerra PLA Marble @BBL A1.json" - }, - { - "name": "PolyTerra PLA Marble @BBL A1M", - "sub_path": "filament/Polymaker/PolyTerra PLA Marble @BBL A1M.json" - }, - { - "name": "PolyTerra PLA Marble @BBL P1P", - "sub_path": "filament/Polymaker/PolyTerra PLA Marble @BBL P1P.json" - }, - { - "name": "PolyTerra PLA Marble @BBL X1", - "sub_path": "filament/Polymaker/PolyTerra PLA Marble @BBL X1.json" - }, - { - "name": "PolyTerra PLA+ @BBL A1", - "sub_path": "filament/Polymaker/PolyTerra PLA+ @BBL A1.json" - }, - { - "name": "PolyTerra PLA+ @BBL A1M", - "sub_path": "filament/Polymaker/PolyTerra PLA+ @BBL A1M.json" - }, - { - "name": "PolyTerra PLA+ @BBL P1P", - "sub_path": "filament/Polymaker/PolyTerra PLA+ @BBL P1P.json" - }, - { - "name": "PolyTerra PLA+ @BBL X1", - "sub_path": "filament/Polymaker/PolyTerra PLA+ @BBL X1.json" - }, - { - "name": "Polymaker HT-PLA @BBL A1", - "sub_path": "filament/Polymaker/Polymaker HT-PLA @BBL A1.json" - }, - { - "name": "Polymaker HT-PLA @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Polymaker HT-PLA @BBL A1 0.2 nozzle.json" - }, - { - "name": "Polymaker HT-PLA @BBL A1M", - "sub_path": "filament/Polymaker/Polymaker HT-PLA @BBL A1M.json" - }, - { - "name": "Polymaker HT-PLA @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Polymaker HT-PLA @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Polymaker HT-PLA @BBL P1P", - "sub_path": "filament/Polymaker/Polymaker HT-PLA @BBL P1P.json" - }, - { - "name": "Polymaker HT-PLA @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Polymaker HT-PLA @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Polymaker HT-PLA @BBL X1", - "sub_path": "filament/Polymaker/Polymaker HT-PLA @BBL X1.json" - }, - { - "name": "Polymaker HT-PLA @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Polymaker HT-PLA @BBL X1 0.2 nozzle.json" - }, - { - "name": "Polymaker HT-PLA @BBL X1C", - "sub_path": "filament/Polymaker/Polymaker HT-PLA @BBL X1C.json" - }, - { - "name": "Polymaker HT-PLA @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Polymaker HT-PLA @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Polymaker HT-PLA-GF @BBL A1", - "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @BBL A1.json" - }, - { - "name": "Polymaker HT-PLA-GF @BBL A1 0.2 nozzle", - "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @BBL A1 0.2 nozzle.json" - }, - { - "name": "Polymaker HT-PLA-GF @BBL A1M", - "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @BBL A1M.json" - }, - { - "name": "Polymaker HT-PLA-GF @BBL A1M 0.2 nozzle", - "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Polymaker HT-PLA-GF @BBL P1P", - "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @BBL P1P.json" - }, - { - "name": "Polymaker HT-PLA-GF @BBL P1P 0.2 nozzle", - "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Polymaker HT-PLA-GF @BBL X1", - "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @BBL X1.json" - }, - { - "name": "Polymaker HT-PLA-GF @BBL X1 0.2 nozzle", - "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @BBL X1 0.2 nozzle.json" - }, - { - "name": "Polymaker HT-PLA-GF @BBL X1C", - "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @BBL X1C.json" - }, - { - "name": "Polymaker HT-PLA-GF @BBL X1C 0.2 nozzle", - "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @BBL X1C 0.2 nozzle.json" - }, { "name": "SUNLU PLA Marble @BBL A1", "sub_path": "filament/SUNLU/SUNLU Marble PLA @BBL A1.json" @@ -9933,106 +7717,6 @@ "name": "Generic SBS", "sub_path": "filament/Generic SBS.json" }, - { - "name": "BETA PEBA 90A @BBL A1", - "sub_path": "filament/BETA/BETA PEBA 90A @BBL A1.json" - }, - { - "name": "BETA PEBA 90A @BBL A1M", - "sub_path": "filament/BETA/BETA PEBA 90A @BBL A1M.json" - }, - { - "name": "BETA PEBA 90A @BBL H2D", - "sub_path": "filament/BETA/BETA PEBA 90A @BBL H2D.json" - }, - { - "name": "BETA PEBA 90A @BBL P1P", - "sub_path": "filament/BETA/BETA PEBA 90A @BBL P1P.json" - }, - { - "name": "BETA PEBA 90A @BBL X1C", - "sub_path": "filament/BETA/BETA PEBA 90A @BBL X1C.json" - }, - { - "name": "BETA TPU 90A @BBL A1", - "sub_path": "filament/BETA/BETA TPU 90A @BBL A1.json" - }, - { - "name": "BETA TPU 90A @BBL A1M", - "sub_path": "filament/BETA/BETA TPU 90A @BBL A1M.json" - }, - { - "name": "BETA TPU 90A @BBL H2D", - "sub_path": "filament/BETA/BETA TPU 90A @BBL H2D.json" - }, - { - "name": "BETA TPU 90A @BBL P1P", - "sub_path": "filament/BETA/BETA TPU 90A @BBL P1P.json" - }, - { - "name": "BETA TPU 90A @BBL X1C", - "sub_path": "filament/BETA/BETA TPU 90A @BBL X1C.json" - }, - { - "name": "BETA TPU 95A @BBL A1", - "sub_path": "filament/BETA/BETA TPU 95A @BBL A1.json" - }, - { - "name": "BETA TPU 95A @BBL A1M", - "sub_path": "filament/BETA/BETA TPU 95A @BBL A1M.json" - }, - { - "name": "BETA TPU 95A @BBL H2D", - "sub_path": "filament/BETA/BETA TPU 95A @BBL H2D.json" - }, - { - "name": "BETA TPU 95A @BBL P1P", - "sub_path": "filament/BETA/BETA TPU 95A @BBL P1P.json" - }, - { - "name": "BETA TPU 95A @BBL X1C", - "sub_path": "filament/BETA/BETA TPU 95A @BBL X1C.json" - }, - { - "name": "BETA TPU 98A @BBL A1", - "sub_path": "filament/BETA/BETA TPU 98A @BBL A1.json" - }, - { - "name": "BETA TPU 98A @BBL A1M", - "sub_path": "filament/BETA/BETA TPU 98A @BBL A1M.json" - }, - { - "name": "BETA TPU 98A @BBL H2D", - "sub_path": "filament/BETA/BETA TPU 98A @BBL H2D.json" - }, - { - "name": "BETA TPU 98A @BBL P1P", - "sub_path": "filament/BETA/BETA TPU 98A @BBL P1P.json" - }, - { - "name": "BETA TPU 98A @BBL X1C", - "sub_path": "filament/BETA/BETA TPU 98A @BBL X1C.json" - }, - { - "name": "BETA TPU Matte @BBL A1", - "sub_path": "filament/BETA/BETA TPU Matte @BBL A1.json" - }, - { - "name": "BETA TPU Matte @BBL A1M", - "sub_path": "filament/BETA/BETA TPU Matte @BBL A1M.json" - }, - { - "name": "BETA TPU Matte @BBL H2D", - "sub_path": "filament/BETA/BETA TPU Matte @BBL H2D.json" - }, - { - "name": "BETA TPU Matte @BBL P1P", - "sub_path": "filament/BETA/BETA TPU Matte @BBL P1P.json" - }, - { - "name": "BETA TPU Matte @BBL X1C", - "sub_path": "filament/BETA/BETA TPU Matte @BBL X1C.json" - }, { "name": "Bambu TPU 85A @BBL A2L 0.6 nozzle", "sub_path": "filament/Bambu TPU 85A @BBL A2L 0.6 nozzle.json" @@ -10417,18 +8101,6 @@ "name": "Generic TPU @BBL X2D 0.4 nozzle", "sub_path": "filament/Generic TPU @BBL X2D 0.4 nozzle.json" }, - { - "name": "addnorth TPU EasyFlex", - "sub_path": "filament/addnorth/addnorth TPU EasyFlex.json" - }, - { - "name": "addnorth TPU Pro Matte 85A", - "sub_path": "filament/addnorth/addnorth TPU Pro Matte 85A.json" - }, - { - "name": "addnorth TPU Pro Matte 95A", - "sub_path": "filament/addnorth/addnorth TPU Pro Matte 95A.json" - }, { "name": "Generic TPU for AMS @BBL A1", "sub_path": "filament/Generic TPU for AMS @BBL A1.json" @@ -10725,558 +8397,6 @@ "name": "Generic TPU @BBL H2S", "sub_path": "filament/Generic TPU @BBL H2S.json" }, - { - "name": "AliZ PA-CF @P1-X1", - "sub_path": "filament/AliZ/AliZ PA-CF @P1-X1.json" - }, - { - "name": "AliZ PETG @P1-X1", - "sub_path": "filament/AliZ/AliZ PETG @P1-X1.json" - }, - { - "name": "AliZ PETG-CF @P1-X1", - "sub_path": "filament/AliZ/AliZ PETG-CF @P1-X1.json" - }, - { - "name": "AliZ PETG-Metal @P1-X1", - "sub_path": "filament/AliZ/AliZ PETG-Metal @P1-X1.json" - }, - { - "name": "AliZ PLA @P1-X1", - "sub_path": "filament/AliZ/AliZ PLA @P1-X1.json" - }, - { - "name": "COEX ABS @BBL X1", - "sub_path": "filament/COEX/COEX ABS @BBL X1.json" - }, - { - "name": "COEX ABS @BBL X1 0.2 nozzle", - "sub_path": "filament/COEX/COEX ABS @BBL X1 0.2 nozzle.json" - }, - { - "name": "COEX ABS @BBL X1C", - "sub_path": "filament/COEX/COEX ABS @BBL X1C.json" - }, - { - "name": "COEX ABS @BBL X1C 0.2 nozzle", - "sub_path": "filament/COEX/COEX ABS @BBL X1C 0.2 nozzle.json" - }, - { - "name": "COEX ABS PRIME @BBL X1", - "sub_path": "filament/COEX/COEX ABS PRIME @BBL X1.json" - }, - { - "name": "COEX ABS PRIME @BBL X1 0.2 nozzle", - "sub_path": "filament/COEX/COEX ABS PRIME @BBL X1 0.2 nozzle.json" - }, - { - "name": "COEX ABS PRIME @BBL X1C", - "sub_path": "filament/COEX/COEX ABS PRIME @BBL X1C.json" - }, - { - "name": "COEX ABS PRIME @BBL X1C 0.2 nozzle", - "sub_path": "filament/COEX/COEX ABS PRIME @BBL X1C 0.2 nozzle.json" - }, - { - "name": "COEX ASA PRIME @BBL X1", - "sub_path": "filament/COEX/COEX ASA PRIME @BBL X1.json" - }, - { - "name": "COEX ASA PRIME @BBL X1 0.2 nozzle", - "sub_path": "filament/COEX/COEX ASA PRIME @BBL X1 0.2 nozzle.json" - }, - { - "name": "COEX ASA PRIME @BBL X1C", - "sub_path": "filament/COEX/COEX ASA PRIME @BBL X1C.json" - }, - { - "name": "COEX ASA PRIME @BBL X1C 0.2 nozzle", - "sub_path": "filament/COEX/COEX ASA PRIME @BBL X1C 0.2 nozzle.json" - }, - { - "name": "COEX NYLEX PA6-CF @BBL X1C", - "sub_path": "filament/COEX/COEX NYLEX PA6-CF @BBL X1C.json" - }, - { - "name": "COEX NYLEX UNFILLED @BBL X1C", - "sub_path": "filament/COEX/COEX NYLEX UNFILLED @BBL X1C.json" - }, - { - "name": "COEX PCTG PRIME @BBL A1", - "sub_path": "filament/COEX/COEX PCTG PRIME @BBL A1.json" - }, - { - "name": "COEX PCTG PRIME @BBL A1 0.2 nozzle", - "sub_path": "filament/COEX/COEX PCTG PRIME @BBL A1 0.2 nozzle.json" - }, - { - "name": "COEX PCTG PRIME @BBL A1 0.8 nozzle", - "sub_path": "filament/COEX/COEX PCTG PRIME @BBL A1 0.8 nozzle.json" - }, - { - "name": "COEX PETG @BBL A1", - "sub_path": "filament/COEX/COEX PETG @BBL A1.json" - }, - { - "name": "COEX PETG @BBL A1 0.2 nozzle", - "sub_path": "filament/COEX/COEX PETG @BBL A1 0.2 nozzle.json" - }, - { - "name": "COEX PETG @BBL A1 0.8 nozzle", - "sub_path": "filament/COEX/COEX PETG @BBL A1 0.8 nozzle.json" - }, - { - "name": "COEX PLA @BBL A1", - "sub_path": "filament/COEX/COEX PLA @BBL A1.json" - }, - { - "name": "COEX PLA @BBL A1 0.2 nozzle", - "sub_path": "filament/COEX/COEX PLA @BBL A1 0.2 nozzle.json" - }, - { - "name": "COEX PLA @BBL X1", - "sub_path": "filament/COEX/COEX PLA @BBL X1.json" - }, - { - "name": "COEX PLA PRIME @BBL A1", - "sub_path": "filament/COEX/COEX PLA PRIME @BBL A1.json" - }, - { - "name": "COEX PLA PRIME @BBL A1 0.2 nozzle", - "sub_path": "filament/COEX/COEX PLA PRIME @BBL A1 0.2 nozzle.json" - }, - { - "name": "COEX PLA PRIME @BBL A1M", - "sub_path": "filament/COEX/COEX PLA PRIME @BBL A1M.json" - }, - { - "name": "COEX PLA PRIME @BBL A1M 0.2 nozzle", - "sub_path": "filament/COEX/COEX PLA PRIME @BBL A1M 0.2 nozzle.json" - }, - { - "name": "COEX PLA PRIME @BBL P1P", - "sub_path": "filament/COEX/COEX PLA PRIME @BBL P1P.json" - }, - { - "name": "COEX PLA PRIME @BBL P1P 0.2 nozzle", - "sub_path": "filament/COEX/COEX PLA PRIME @BBL P1P 0.2 nozzle.json" - }, - { - "name": "COEX PLA PRIME @BBL X1", - "sub_path": "filament/COEX/COEX PLA PRIME @BBL X1.json" - }, - { - "name": "COEX PLA PRIME @BBL X1 0.2 nozzle", - "sub_path": "filament/COEX/COEX PLA PRIME @BBL X1 0.2 nozzle.json" - }, - { - "name": "COEX PLA PRIME @BBL X1C", - "sub_path": "filament/COEX/COEX PLA PRIME @BBL X1C.json" - }, - { - "name": "COEX PLA PRIME @BBL X1C 0.2 nozzle", - "sub_path": "filament/COEX/COEX PLA PRIME @BBL X1C 0.2 nozzle.json" - }, - { - "name": "COEX PLA+Silk @BBL A1", - "sub_path": "filament/COEX/COEX PLA+Silk @BBL A1.json" - }, - { - "name": "COEX PLA+Silk @BBL A1 0.2 nozzle", - "sub_path": "filament/COEX/COEX PLA+Silk @BBL A1 0.2 nozzle.json" - }, - { - "name": "COEX PLA+Silk @BBL A1M", - "sub_path": "filament/COEX/COEX PLA+Silk @BBL A1M.json" - }, - { - "name": "COEX PLA+Silk @BBL A1M 0.2 nozzle", - "sub_path": "filament/COEX/COEX PLA+Silk @BBL A1M 0.2 nozzle.json" - }, - { - "name": "COEX PLA+Silk @BBL P1P", - "sub_path": "filament/COEX/COEX PLA+Silk @BBL P1P.json" - }, - { - "name": "COEX PLA+Silk @BBL P1P 0.2 nozzle", - "sub_path": "filament/COEX/COEX PLA+Silk @BBL P1P 0.2 nozzle.json" - }, - { - "name": "COEX PLA+Silk @BBL X1", - "sub_path": "filament/COEX/COEX PLA+Silk @BBL X1.json" - }, - { - "name": "COEX PLA+Silk @BBL X1 0.2 nozzle", - "sub_path": "filament/COEX/COEX PLA+Silk @BBL X1 0.2 nozzle.json" - }, - { - "name": "COEX PLA+Silk @BBL X1C", - "sub_path": "filament/COEX/COEX PLA+Silk @BBL X1C.json" - }, - { - "name": "COEX PLA+Silk @BBL X1C 0.2 nozzle", - "sub_path": "filament/COEX/COEX PLA+Silk @BBL X1C 0.2 nozzle.json" - }, - { - "name": "COEX TPE 30D @BBL A1", - "sub_path": "filament/COEX/COEX TPE 30D @BBL A1.json" - }, - { - "name": "COEX TPE 30D @BBL A1M", - "sub_path": "filament/COEX/COEX TPE 30D @BBL A1M.json" - }, - { - "name": "COEX TPE 30D @BBL P1P", - "sub_path": "filament/COEX/COEX TPE 30D @BBL P1P.json" - }, - { - "name": "COEX TPE 30D @BBL X1", - "sub_path": "filament/COEX/COEX TPE 30D @BBL X1.json" - }, - { - "name": "COEX TPE 30D @BBL X1C", - "sub_path": "filament/COEX/COEX TPE 30D @BBL X1C.json" - }, - { - "name": "COEX TPE 40D @BBL A1", - "sub_path": "filament/COEX/COEX TPE 40D @BBL A1.json" - }, - { - "name": "COEX TPE 40D @BBL A1 0.2 nozzle", - "sub_path": "filament/COEX/COEX TPE 40D @BBL A1 0.2 nozzle.json" - }, - { - "name": "COEX TPE 40D @BBL A1M", - "sub_path": "filament/COEX/COEX TPE 40D @BBL A1M.json" - }, - { - "name": "COEX TPE 40D @BBL A1M 0.2 nozzle", - "sub_path": "filament/COEX/COEX TPE 40D @BBL A1M 0.2 nozzle.json" - }, - { - "name": "COEX TPE 40D @BBL P1P", - "sub_path": "filament/COEX/COEX TPE 40D @BBL P1P.json" - }, - { - "name": "COEX TPE 40D @BBL P1P 0.2 nozzle", - "sub_path": "filament/COEX/COEX TPE 40D @BBL P1P 0.2 nozzle.json" - }, - { - "name": "COEX TPE 40D @BBL X1", - "sub_path": "filament/COEX/COEX TPE 40D @BBL X1.json" - }, - { - "name": "COEX TPE 40D @BBL X1 0.2 nozzle", - "sub_path": "filament/COEX/COEX TPE 40D @BBL X1 0.2 nozzle.json" - }, - { - "name": "COEX TPE 40D @BBL X1C", - "sub_path": "filament/COEX/COEX TPE 40D @BBL X1C.json" - }, - { - "name": "COEX TPE 40D @BBL X1C 0.2 nozzle", - "sub_path": "filament/COEX/COEX TPE 40D @BBL X1C 0.2 nozzle.json" - }, - { - "name": "COEX TPE 60D @BBL A1", - "sub_path": "filament/COEX/COEX TPE 60D @BBL A1.json" - }, - { - "name": "COEX TPE 60D @BBL A1 0.2 nozzle", - "sub_path": "filament/COEX/COEX TPE 60D @BBL A1 0.2 nozzle.json" - }, - { - "name": "COEX TPE 60D @BBL A1M", - "sub_path": "filament/COEX/COEX TPE 60D @BBL A1M.json" - }, - { - "name": "COEX TPE 60D @BBL A1M 0.2 nozzle", - "sub_path": "filament/COEX/COEX TPE 60D @BBL A1M 0.2 nozzle.json" - }, - { - "name": "COEX TPE 60D @BBL P1P", - "sub_path": "filament/COEX/COEX TPE 60D @BBL P1P.json" - }, - { - "name": "COEX TPE 60D @BBL P1P 0.2 nozzle", - "sub_path": "filament/COEX/COEX TPE 60D @BBL P1P 0.2 nozzle.json" - }, - { - "name": "COEX TPE 60D @BBL X1", - "sub_path": "filament/COEX/COEX TPE 60D @BBL X1.json" - }, - { - "name": "COEX TPE 60D @BBL X1 0.2 nozzle", - "sub_path": "filament/COEX/COEX TPE 60D @BBL X1 0.2 nozzle.json" - }, - { - "name": "COEX TPE 60D @BBL X1C", - "sub_path": "filament/COEX/COEX TPE 60D @BBL X1C.json" - }, - { - "name": "COEX TPE 60D @BBL X1C 0.2 nozzle", - "sub_path": "filament/COEX/COEX TPE 60D @BBL X1C 0.2 nozzle.json" - }, - { - "name": "COEX TPU 60A @BBL X1C", - "sub_path": "filament/COEX/COEX TPU 60A @BBL X1C.json" - }, - { - "name": "Overture ASA @BBL X1", - "sub_path": "filament/Overture/Overture ASA @BBL X1.json" - }, - { - "name": "Overture ASA @BBL X1 0.2 nozzle", - "sub_path": "filament/Overture/Overture ASA @BBL X1 0.2 nozzle.json" - }, - { - "name": "Overture ASA @BBL X1C", - "sub_path": "filament/Overture/Overture ASA @BBL X1C.json" - }, - { - "name": "Overture ASA @BBL X1C 0.2 nozzle", - "sub_path": "filament/Overture/Overture ASA @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Overture Air PLA @BBL A1", - "sub_path": "filament/Overture/Overture Air PLA @BBL A1.json" - }, - { - "name": "Overture Air PLA @BBL A1 0.2 nozzle", - "sub_path": "filament/Overture/Overture Air PLA @BBL A1 0.2 nozzle.json" - }, - { - "name": "Overture Air PLA @BBL A1M", - "sub_path": "filament/Overture/Overture Air PLA @BBL A1M.json" - }, - { - "name": "Overture Air PLA @BBL A1M 0.2 nozzle", - "sub_path": "filament/Overture/Overture Air PLA @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Overture Air PLA @BBL P1P", - "sub_path": "filament/Overture/Overture Air PLA @BBL P1P.json" - }, - { - "name": "Overture Air PLA @BBL P1P 0.2 nozzle", - "sub_path": "filament/Overture/Overture Air PLA @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Overture Air PLA @BBL X1", - "sub_path": "filament/Overture/Overture Air PLA @BBL X1.json" - }, - { - "name": "Overture Air PLA @BBL X1 0.2 nozzle", - "sub_path": "filament/Overture/Overture Air PLA @BBL X1 0.2 nozzle.json" - }, - { - "name": "Overture Air PLA @BBL X1C", - "sub_path": "filament/Overture/Overture Air PLA @BBL X1C.json" - }, - { - "name": "Overture Air PLA @BBL X1C 0.2 nozzle", - "sub_path": "filament/Overture/Overture Air PLA @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Overture Easy PLA @BBL A1", - "sub_path": "filament/Overture/Overture Easy PLA @BBL A1.json" - }, - { - "name": "Overture Easy PLA @BBL A1 0.2 nozzle", - "sub_path": "filament/Overture/Overture Easy PLA @BBL A1 0.2 nozzle.json" - }, - { - "name": "Overture Easy PLA @BBL A1M", - "sub_path": "filament/Overture/Overture Easy PLA @BBL A1M.json" - }, - { - "name": "Overture Easy PLA @BBL A1M 0.2 nozzle", - "sub_path": "filament/Overture/Overture Easy PLA @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Overture Easy PLA @BBL P1P", - "sub_path": "filament/Overture/Overture Easy PLA @BBL P1P.json" - }, - { - "name": "Overture Easy PLA @BBL P1P 0.2 nozzle", - "sub_path": "filament/Overture/Overture Easy PLA @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Overture Easy PLA @BBL X1", - "sub_path": "filament/Overture/Overture Easy PLA @BBL X1.json" - }, - { - "name": "Overture Easy PLA @BBL X1 0.2 nozzle", - "sub_path": "filament/Overture/Overture Easy PLA @BBL X1 0.2 nozzle.json" - }, - { - "name": "Overture Easy PLA @BBL X1C", - "sub_path": "filament/Overture/Overture Easy PLA @BBL X1C.json" - }, - { - "name": "Overture Easy PLA @BBL X1C 0.2 nozzle", - "sub_path": "filament/Overture/Overture Easy PLA @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Overture Rock PLA @BBL A1", - "sub_path": "filament/Overture/Overture Rock PLA @BBL A1.json" - }, - { - "name": "Overture Rock PLA @BBL A1 0.2 nozzle", - "sub_path": "filament/Overture/Overture Rock PLA @BBL A1 0.2 nozzle.json" - }, - { - "name": "Overture Rock PLA @BBL A1M", - "sub_path": "filament/Overture/Overture Rock PLA @BBL A1M.json" - }, - { - "name": "Overture Rock PLA @BBL A1M 0.2 nozzle", - "sub_path": "filament/Overture/Overture Rock PLA @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Overture Rock PLA @BBL P1P", - "sub_path": "filament/Overture/Overture Rock PLA @BBL P1P.json" - }, - { - "name": "Overture Rock PLA @BBL P1P 0.2 nozzle", - "sub_path": "filament/Overture/Overture Rock PLA @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Overture Rock PLA @BBL X1", - "sub_path": "filament/Overture/Overture Rock PLA @BBL X1.json" - }, - { - "name": "Overture Rock PLA @BBL X1 0.2 nozzle", - "sub_path": "filament/Overture/Overture Rock PLA @BBL X1 0.2 nozzle.json" - }, - { - "name": "Overture Rock PLA @BBL X1C", - "sub_path": "filament/Overture/Overture Rock PLA @BBL X1C.json" - }, - { - "name": "Overture Rock PLA @BBL X1C 0.2 nozzle", - "sub_path": "filament/Overture/Overture Rock PLA @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Overture Silk PLA @BBL A1", - "sub_path": "filament/Overture/Overture Silk PLA @BBL A1.json" - }, - { - "name": "Overture Silk PLA @BBL A1 0.2 nozzle", - "sub_path": "filament/Overture/Overture Silk PLA @BBL A1 0.2 nozzle.json" - }, - { - "name": "Overture Silk PLA @BBL A1M", - "sub_path": "filament/Overture/Overture Silk PLA @BBL A1M.json" - }, - { - "name": "Overture Silk PLA @BBL A1M 0.2 nozzle", - "sub_path": "filament/Overture/Overture Silk PLA @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Overture Silk PLA @BBL P1P", - "sub_path": "filament/Overture/Overture Silk PLA @BBL P1P.json" - }, - { - "name": "Overture Silk PLA @BBL P1P 0.2 nozzle", - "sub_path": "filament/Overture/Overture Silk PLA @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Overture Silk PLA @BBL X1", - "sub_path": "filament/Overture/Overture Silk PLA @BBL X1.json" - }, - { - "name": "Overture Silk PLA @BBL X1 0.2 nozzle", - "sub_path": "filament/Overture/Overture Silk PLA @BBL X1 0.2 nozzle.json" - }, - { - "name": "Overture Silk PLA @BBL X1C", - "sub_path": "filament/Overture/Overture Silk PLA @BBL X1C.json" - }, - { - "name": "Overture Silk PLA @BBL X1C 0.2 nozzle", - "sub_path": "filament/Overture/Overture Silk PLA @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Overture Super PLA+ @BBL A1", - "sub_path": "filament/Overture/Overture Super PLA+ @BBL A1.json" - }, - { - "name": "Overture Super PLA+ @BBL A1 0.2 nozzle", - "sub_path": "filament/Overture/Overture Super PLA+ @BBL A1 0.2 nozzle.json" - }, - { - "name": "Overture Super PLA+ @BBL A1M", - "sub_path": "filament/Overture/Overture Super PLA+ @BBL A1M.json" - }, - { - "name": "Overture Super PLA+ @BBL A1M 0.2 nozzle", - "sub_path": "filament/Overture/Overture Super PLA+ @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Overture Super PLA+ @BBL P1P", - "sub_path": "filament/Overture/Overture Super PLA+ @BBL P1P.json" - }, - { - "name": "Overture Super PLA+ @BBL P1P 0.2 nozzle", - "sub_path": "filament/Overture/Overture Super PLA+ @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Overture Super PLA+ @BBL X1", - "sub_path": "filament/Overture/Overture Super PLA+ @BBL X1.json" - }, - { - "name": "Overture Super PLA+ @BBL X1 0.2 nozzle", - "sub_path": "filament/Overture/Overture Super PLA+ @BBL X1 0.2 nozzle.json" - }, - { - "name": "Overture Super PLA+ @BBL X1C", - "sub_path": "filament/Overture/Overture Super PLA+ @BBL X1C.json" - }, - { - "name": "Overture Super PLA+ @BBL X1C 0.2 nozzle", - "sub_path": "filament/Overture/Overture Super PLA+ @BBL X1C 0.2 nozzle.json" - }, - { - "name": "Overture TPU @BBL A1", - "sub_path": "filament/Overture/Overture TPU @BBL A1.json" - }, - { - "name": "Overture TPU @BBL A1 0.2 nozzle", - "sub_path": "filament/Overture/Overture TPU @BBL A1 0.2 nozzle.json" - }, - { - "name": "Overture TPU @BBL A1M", - "sub_path": "filament/Overture/Overture TPU @BBL A1M.json" - }, - { - "name": "Overture TPU @BBL A1M 0.2 nozzle", - "sub_path": "filament/Overture/Overture TPU @BBL A1M 0.2 nozzle.json" - }, - { - "name": "Overture TPU @BBL P1P", - "sub_path": "filament/Overture/Overture TPU @BBL P1P.json" - }, - { - "name": "Overture TPU @BBL P1P 0.2 nozzle", - "sub_path": "filament/Overture/Overture TPU @BBL P1P 0.2 nozzle.json" - }, - { - "name": "Overture TPU @BBL X1", - "sub_path": "filament/Overture/Overture TPU @BBL X1.json" - }, - { - "name": "Overture TPU @BBL X1 0.2 nozzle", - "sub_path": "filament/Overture/Overture TPU @BBL X1 0.2 nozzle.json" - }, - { - "name": "Overture TPU @BBL X1C", - "sub_path": "filament/Overture/Overture TPU @BBL X1C.json" - }, - { - "name": "Overture TPU @BBL X1C 0.2 nozzle", - "sub_path": "filament/Overture/Overture TPU @BBL X1C 0.2 nozzle.json" - }, { "name": "fdm_filament_dual_common", "sub_path": "filament/fdm_filament_dual_common.json" diff --git a/resources/profiles/BBL/Bambu Lab A2L_cover.png b/resources/profiles/BBL/Bambu Lab A2L_cover.png index 513fa6fdaa..970d63c4e4 100644 Binary files a/resources/profiles/BBL/Bambu Lab A2L_cover.png and b/resources/profiles/BBL/Bambu Lab A2L_cover.png differ diff --git a/resources/profiles/BBL/Bambu Lab H2C_cover.png b/resources/profiles/BBL/Bambu Lab H2C_cover.png index 6dfddf5ef6..2e4a6e97da 100644 Binary files a/resources/profiles/BBL/Bambu Lab H2C_cover.png and b/resources/profiles/BBL/Bambu Lab H2C_cover.png differ diff --git a/resources/profiles/BBL/bbl-3dp-H2C.stl b/resources/profiles/BBL/bbl-3dp-H2C.stl index 4588514dd5..81e7321c25 100644 Binary files a/resources/profiles/BBL/bbl-3dp-H2C.stl and b/resources/profiles/BBL/bbl-3dp-H2C.stl differ diff --git a/resources/profiles/BBL/filament/BETA/BETA ABS @base.json b/resources/profiles/BBL/filament/BETA/BETA ABS @base.json deleted file mode 100644 index bbed068703..0000000000 --- a/resources/profiles/BBL/filament/BETA/BETA ABS @base.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "filament", - "name": "BETA ABS @base", - "inherits": "fdm_filament_abs", - "from": "system", - "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": [ - "24.99" - ], - "filament_flow_ratio": [ - "0.95" - ], - "filament_vendor": [ - "BETA" - ], - "impact_strength_z": [ - "7.4" - ] -} diff --git a/resources/profiles/BBL/filament/BETA/BETA HIPS @base.json b/resources/profiles/BBL/filament/BETA/BETA HIPS @base.json deleted file mode 100644 index 4d244f9fe1..0000000000 --- a/resources/profiles/BBL/filament/BETA/BETA HIPS @base.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "filament", - "name": "BETA HIPS @base", - "inherits": "fdm_filament_hips", - "from": "system", - "filament_id": "OFlmxlDG", - "instantiation": "false", - "filament_is_support": [ - "1" - ], - "filament_vendor": [ - "BETA" - ] -} diff --git a/resources/profiles/BBL/filament/BETA/BETA PAHT-CF @base.json b/resources/profiles/BBL/filament/BETA/BETA PAHT-CF @base.json deleted file mode 100644 index 1c140e3720..0000000000 --- a/resources/profiles/BBL/filament/BETA/BETA PAHT-CF @base.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "filament", - "name": "BETA PAHT-CF @base", - "inherits": "fdm_filament_pa", - "from": "system", - "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": [ - "5" - ], - "fan_max_speed": [ - "30" - ], - "fan_min_speed": [ - "10" - ], - "filament_cost": [ - "94.99" - ], - "filament_density": [ - "1.06" - ], - "filament_flow_ratio": [ - "0.96" - ], - "filament_type": [ - "PA-CF" - ], - "filament_vendor": [ - "BETA" - ], - "full_fan_speed_layer": [ - "2" - ], - "impact_strength_z": [ - "13.3" - ], - "overhang_fan_speed": [ - "40" - ], - "overhang_fan_threshold": [ - "0%" - ], - "temperature_vitrification": [ - "180" - ] -} diff --git a/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @base.json b/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @base.json deleted file mode 100644 index fe1d3cd5b6..0000000000 --- a/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @base.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "filament", - "name": "BETA PEBA 90A @base", - "inherits": "fdm_filament_tpu", - "from": "system", - "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": [ - "59.99" - ], - "filament_max_volumetric_speed": [ - "2.8" - ], - "filament_vendor": [ - "BETA" - ], - "impact_strength_z": [ - "87.3" - ], - "nozzle_temperature": [ - "225" - ], - "nozzle_temperature_initial_layer": [ - "225" - ], - "nozzle_temperature_range_high": [ - "240" - ], - "slow_down_layer_time": [ - "14" - ] -} 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 deleted file mode 100644 index 7b93695099..0000000000 --- a/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @base.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "filament", - "name": "BETA PLA High Speed @base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "OF3PDEw3", - "instantiation": "false", - "filament_flow_ratio": [ - "0.98" - ], - "filament_max_volumetric_speed": [ - "18" - ], - "slow_down_layer_time": [ - "8" - ], - "filament_vendor": [ - "BETA" - ] -} diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 90A @base.json b/resources/profiles/BBL/filament/BETA/BETA TPU 90A @base.json deleted file mode 100644 index bba256fd74..0000000000 --- a/resources/profiles/BBL/filament/BETA/BETA TPU 90A @base.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "filament", - "name": "BETA TPU 90A @base", - "inherits": "fdm_filament_tpu", - "from": "system", - "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": [ - "59.99" - ], - "filament_max_volumetric_speed": [ - "2.8" - ], - "filament_vendor": [ - "BETA" - ], - "impact_strength_z": [ - "87.3" - ], - "nozzle_temperature": [ - "225" - ], - "nozzle_temperature_initial_layer": [ - "225" - ], - "nozzle_temperature_range_high": [ - "240" - ], - "slow_down_layer_time": [ - "14" - ] -} diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 95A @base.json b/resources/profiles/BBL/filament/BETA/BETA TPU 95A @base.json deleted file mode 100644 index 87f7757c3f..0000000000 --- a/resources/profiles/BBL/filament/BETA/BETA TPU 95A @base.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "filament", - "name": "BETA TPU 95A @base", - "inherits": "fdm_filament_tpu", - "from": "system", - "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": [ - "41.99" - ], - "filament_density": [ - "1.22" - ], - "filament_vendor": [ - "BETA" - ], - "impact_strength_z": [ - "88.7" - ], - "nozzle_temperature": [ - "230" - ], - "nozzle_temperature_initial_layer": [ - "230" - ] -} diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 98A @base.json b/resources/profiles/BBL/filament/BETA/BETA TPU 98A @base.json deleted file mode 100644 index cd106a6bf6..0000000000 --- a/resources/profiles/BBL/filament/BETA/BETA TPU 98A @base.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "filament", - "name": "BETA TPU 98A @base", - "inherits": "fdm_filament_tpu", - "from": "system", - "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": [ - "41.99" - ], - "filament_density": [ - "1.22" - ], - "filament_vendor": [ - "BETA" - ], - "impact_strength_z": [ - "88.7" - ], - "nozzle_temperature": [ - "230" - ], - "nozzle_temperature_initial_layer": [ - "230" - ] -} diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU Matte @base.json b/resources/profiles/BBL/filament/BETA/BETA TPU Matte @base.json deleted file mode 100644 index 272e9be1ed..0000000000 --- a/resources/profiles/BBL/filament/BETA/BETA TPU Matte @base.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "filament", - "name": "BETA TPU Matte @base", - "inherits": "fdm_filament_tpu", - "from": "system", - "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": [ - "59.99" - ], - "filament_max_volumetric_speed": [ - "2.8" - ], - "filament_vendor": [ - "BETA" - ], - "impact_strength_z": [ - "87.3" - ], - "nozzle_temperature": [ - "225" - ], - "nozzle_temperature_initial_layer": [ - "225" - ], - "nozzle_temperature_range_high": [ - "240" - ], - "slow_down_layer_time": [ - "14" - ] -} diff --git a/resources/profiles/BBL/filament/FusRock/FusRock ABS-GF @base.json b/resources/profiles/BBL/filament/FusRock/FusRock ABS-GF @base.json deleted file mode 100644 index 95a8fd47ea..0000000000 --- a/resources/profiles/BBL/filament/FusRock/FusRock ABS-GF @base.json +++ /dev/null @@ -1,163 +0,0 @@ -{ - "type": "filament", - "name": "FusRock ABS-GF @base", - "inherits": "fdm_filament_common", - "from": "system", - "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": [ - "Direct Drive Standard" - ], - "filament_adhesiveness_category": [ - "200" - ], - "filament_type": [ - "ABS-GF" - ], - "filament_vendor": [ - "FusRock" - ], - "filament_flow_ratio": [ - "0.92" - ], - "filament_density": [ - "1.08" - ], - "filament_cost": [ - "13" - ], - "nozzle_temperature_range_low": [ - "240" - ], - "nozzle_temperature_range_high": [ - "280" - ], - "cool_plate_temp_initial_layer": [ - "0" - ], - "cool_plate_temp": [ - "0" - ], - "supertack_plate_temp_initial_layer": [ - "0" - ], - "supertack_plate_temp": [ - "0" - ], - "eng_plate_temp_initial_layer": [ - "105" - ], - "eng_plate_temp": [ - "105" - ], - "hot_plate_temp_initial_layer": [ - "105" - ], - "hot_plate_temp": [ - "105" - ], - "textured_plate_temp_initial_layer": [ - "105" - ], - "textured_plate_temp": [ - "105" - ], - "nozzle_temperature_initial_layer": [ - "260" - ], - "nozzle_temperature": [ - "270" - ], - "filament_max_volumetric_speed": [ - "18" - ], - "close_fan_the_first_x_layers": [ - "3" - ], - "fan_min_speed": [ - "10" - ], - "fan_cooling_layer_time": [ - "12" - ], - "fan_max_speed": [ - "30" - ], - "slow_down_layer_time": [ - "4" - ], - "reduce_fan_stop_start_freq": [ - "0" - ], - "slow_down_for_layer_cooling": [ - "1" - ], - "slow_down_min_speed": [ - "20" - ], - "enable_overhang_bridge_fan": [ - "1" - ], - "overhang_fan_threshold": [ - "10%" - ], - "overhang_threshold_participating_cooling": [ - "100%" - ], - "overhang_fan_speed": [ - "30" - ], - "pre_start_fan_time": [ - "0" - ], - "additional_cooling_fan_speed": [ - "0" - ], - "activate_air_filtration": [ - "1" - ], - "during_print_exhaust_fan_speed": [ - "30" - ], - "complete_print_exhaust_fan_speed": [ - "10" - ], - "filament_retraction_length": [ - "0.8" - ], - "filament_z_hop": [ - "0.4" - ], - "filament_z_hop_types": [ - "Spiral Lift" - ], - "filament_retraction_speed": [ - "30" - ], - "filament_deretraction_speed": [ - "0" - ], - "filament_retraction_minimum_travel": [ - "2" - ], - "filament_retract_when_changing_layer": [ - "0" - ], - "filament_wipe": [ - "0" - ], - "filament_wipe_distance": [ - "2" - ], - "filament_retract_before_wipe": [ - "100%" - ], - "filament_end_gcode": [ - "; filament end gcode \n\n" - ], - "filament_notes": "//EN\n1.Be sure to read it carefully before using (https://wiki.fusrock.com).\n2.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）.\\n3.Thank you for choosing us FusRock.\n*This setting may not be able to adapt to all models. In some cases, you need to modify and adjust the parameters by yourself to improve the printing effect.\n*FusRock 3D printing filaments are intended for general-purpose printing and have been tested under standard conditions. However, the performance and safety of printed objects are affected by multiple factors, including printing parameters, model design, usage environment, and the specific application.\n*By using FusRock materials, the user acknowledges and agrees to independently evaluate whether the printed parts are suitable for their intended use, and assumes all associated risks.\n*FusRock shall not be held liable for any damage, injury, or loss that may result from the use of printed products made with our materials, including but not limited to structural failure, functional defects, or safety hazards under actual usage conditions.Before applying printed parts in any critical, functional, or commercial context, thorough testing must be conducted. Except for the certifications explicitly stated for specific FusRock materials, our products are not certified for medical, aerospace, or life-support applications.\n//CN\n1.使用前请务必仔细阅读（https://wiki.fusrock.com）。\n2.打印该耗材时，可能会出现喷嘴堵塞、拉丝、翘边以及层间附着力不足等问题。为了获得更好的打印效果，请参考此维基页面：高温 / 工程材料打印技巧（https://wiki.fusrock.com）。\n3.感谢您选择FusRock。\n*此设置不一定能够适配所有模型，存在部分情况下需要您自行修改调整参数来提升打印效果。\n*FusRock 3D打印耗材适用于通用打印用途，已在标准条件下进行测试。然而，打印成品的性能与安全性受多种因素影响，包括打印参数、模型设计、使用环境及实际用途。\n*使用FusRock材料即表示用户已知悉并同意，自行评估打印件是否适用于其具体应用，并承担由此产生的全部风险。\n*FusRock对使用本公司耗材打印的产品在实际应用中可能导致的任何损害、伤害或损失不承担任何责任，包括但不限于结构失效、功能异常或使用环境中的安全隐患。在将打印件应用于关键、功能性或商业性场景前，请务必进行充分测试。除FusRock已标明材料所获得的各项认证资质外，FusRock产品未取得医疗、航天或生命支持系统认证资质。", - "impact_strength_z": [ - "5.3" - ] -} diff --git a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @base.json b/resources/profiles/BBL/filament/Overture/Overture PLA Pro @base.json deleted file mode 100644 index 454c36e7b0..0000000000 --- a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @base.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "type": "filament", - "name": "Overture PLA Pro @base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "OFxA1p01", - "instantiation": "false", - "filament_cost": [ - "26.99" - ], - "filament_density": [ - "1.27" - ], - "filament_flow_ratio": [ - "0.98" - ], - "filament_max_volumetric_speed": [ - "16" - ], - "filament_vendor": [ - "Overture" - ], - "nozzle_temperature": [ - "220" - ], - "nozzle_temperature_initial_layer": [ - "220" - ], - "nozzle_temperature_range_high": [ - "220" - ], - "nozzle_temperature_range_low": [ - "190" - ], - "slow_down_layer_time": [ - "4" - ], - "temperature_vitrification": [ - "64" - ] -} diff --git a/resources/profiles/BBL/filament/Polymaker/Fiberon PA612-CF15 @base.json b/resources/profiles/BBL/filament/Polymaker/Fiberon PA612-CF15 @base.json deleted file mode 100644 index 310a2229d9..0000000000 --- a/resources/profiles/BBL/filament/Polymaker/Fiberon PA612-CF15 @base.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "type": "filament", - "name": "Fiberon PA612-CF15 @base", - "inherits": "fdm_filament_pa", - "from": "system", - "filament_id": "OFcBl0nJ", - "instantiation": "false", - "bed_type": [ - "Cool Plate" - ], - "fan_cooling_layer_time": [ - "5" - ], - "fan_max_speed": [ - "30" - ], - "fan_min_speed": [ - "10" - ], - "filament_cost": [ - "94.99" - ], - "filament_density": [ - "1.03" - ], - "filament_flow_ratio": [ - "0.96" - ], - "filament_type": [ - "PA-CF" - ], - "filament_vendor": [ - "Polymaker" - ], - "full_fan_speed_layer": [ - "2" - ], - "nozzle_temperature_range_low": [ - "250" - ], - "overhang_fan_speed": [ - "40" - ], - "overhang_fan_threshold": [ - "0%" - ], - "slow_down_min_speed": [ - "10" - ], - "temperature_vitrification": [ - "206.2" - ] -} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @base.json b/resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @base.json deleted file mode 100644 index e3e21d17a1..0000000000 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @base.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "type": "filament", - "name": "Panchroma CoPE @base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "OFqw2PQA", - "instantiation": "false", - "filament_cost": [ - "19.99" - ], - "filament_density": [ - "1.29" - ], - "filament_flow_ratio": [ - "0.98" - ], - "filament_max_volumetric_speed": [ - "24" - ], - "filament_vendor": [ - "Polymaker" - ], - "nozzle_temperature": [ - "230" - ], - "nozzle_temperature_initial_layer": [ - "230" - ], - "nozzle_temperature_range_high": [ - "240" - ], - "nozzle_temperature_range_low": [ - "190" - ], - "slow_down_layer_time": [ - "4" - ], - "temperature_vitrification": [ - "58" - ] -} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA @base.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA @base.json deleted file mode 100644 index 5f4c2682db..0000000000 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA @base.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "type": "filament", - "name": "Panchroma PLA @base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "OFsRDvTM", - "instantiation": "false", - "filament_cost": [ - "19.99" - ], - "filament_density": [ - "1.32" - ], - "filament_flow_ratio": [ - "0.95" - ], - "filament_max_volumetric_speed": [ - "16" - ], - "filament_vendor": [ - "Polymaker" - ], - "filament_wipe": [ - "0" - ], - "nozzle_temperature": [ - "220" - ], - "nozzle_temperature_initial_layer": [ - "220" - ], - "nozzle_temperature_range_high": [ - "240" - ], - "nozzle_temperature_range_low": [ - "190" - ], - "slow_down_layer_time": [ - "4" - ], - "temperature_vitrification": [ - "58" - ] -} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @base.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @base.json deleted file mode 100644 index 18382eb7a0..0000000000 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @base.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "type": "filament", - "name": "Panchroma PLA Celestial @base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "OFRiYgMK", - "instantiation": "false", - "filament_cost": [ - "29.99" - ], - "filament_density": [ - "1.17" - ], - "filament_flow_ratio": [ - "0.98" - ], - "filament_max_volumetric_speed": [ - "20" - ], - "filament_vendor": [ - "Polymaker" - ], - "nozzle_temperature": [ - "220" - ], - "nozzle_temperature_initial_layer": [ - "220" - ], - "nozzle_temperature_range_high": [ - "240" - ], - "nozzle_temperature_range_low": [ - "190" - ], - "slow_down_layer_time": [ - "4" - ], - "temperature_vitrification": [ - "61" - ] -} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @base.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @base.json deleted file mode 100644 index bf84a536a4..0000000000 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @base.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "type": "filament", - "name": "Panchroma PLA Galaxy @base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "OFFkCLBl", - "instantiation": "false", - "filament_cost": [ - "29.99" - ], - "filament_density": [ - "1.17" - ], - "filament_flow_ratio": [ - "0.98" - ], - "filament_max_volumetric_speed": [ - "20" - ], - "filament_vendor": [ - "Polymaker" - ], - "nozzle_temperature": [ - "220" - ], - "nozzle_temperature_initial_layer": [ - "220" - ], - "nozzle_temperature_range_high": [ - "240" - ], - "nozzle_temperature_range_low": [ - "190" - ], - "slow_down_layer_time": [ - "4" - ], - "temperature_vitrification": [ - "61" - ] -} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @base.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @base.json deleted file mode 100644 index ab3032ad57..0000000000 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @base.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "type": "filament", - "name": "Panchroma PLA Glow @base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "OF0gGRWk", - "instantiation": "false", - "filament_cost": [ - "29.99" - ], - "filament_density": [ - "1.17" - ], - "filament_flow_ratio": [ - "0.98" - ], - "filament_max_volumetric_speed": [ - "20" - ], - "filament_vendor": [ - "Polymaker" - ], - "nozzle_temperature": [ - "220" - ], - "nozzle_temperature_initial_layer": [ - "220" - ], - "nozzle_temperature_range_high": [ - "240" - ], - "nozzle_temperature_range_low": [ - "190" - ], - "slow_down_layer_time": [ - "4" - ], - "temperature_vitrification": [ - "61" - ] -} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @base.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @base.json deleted file mode 100644 index 14a805212e..0000000000 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @base.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "type": "filament", - "name": "Panchroma PLA Luminous @base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "OF0kCNDK", - "instantiation": "false", - "filament_cost": [ - "29.99" - ], - "filament_density": [ - "1.17" - ], - "filament_flow_ratio": [ - "0.98" - ], - "filament_max_volumetric_speed": [ - "20" - ], - "filament_vendor": [ - "Polymaker" - ], - "nozzle_temperature": [ - "220" - ], - "nozzle_temperature_initial_layer": [ - "220" - ], - "nozzle_temperature_range_high": [ - "240" - ], - "nozzle_temperature_range_low": [ - "190" - ], - "slow_down_layer_time": [ - "4" - ], - "temperature_vitrification": [ - "61" - ] -} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @base.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @base.json deleted file mode 100644 index 63680ba1b7..0000000000 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @base.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "type": "filament", - "name": "Panchroma PLA Marble @base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "OFKiSMWR", - "instantiation": "false", - "filament_cost": [ - "21.99" - ], - "filament_density": [ - "1.31" - ], - "filament_flow_ratio": [ - "0.98" - ], - "filament_max_volumetric_speed": [ - "22" - ], - "filament_vendor": [ - "Polymaker" - ], - "nozzle_temperature": [ - "220" - ], - "nozzle_temperature_initial_layer": [ - "220" - ], - "nozzle_temperature_range_high": [ - "240" - ], - "nozzle_temperature_range_low": [ - "190" - ], - "slow_down_layer_time": [ - "8" - ], - "temperature_vitrification": [ - "61" - ] -} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @base.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @base.json deleted file mode 100644 index 33d880ac08..0000000000 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @base.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "type": "filament", - "name": "Panchroma PLA Matte @base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "OFrOh600", - "instantiation": "false", - "filament_cost": [ - "20.99" - ], - "filament_density": [ - "1.31" - ], - "filament_flow_ratio": [ - "0.98" - ], - "filament_max_volumetric_speed": [ - "22" - ], - "filament_vendor": [ - "Polymaker" - ], - "nozzle_temperature": [ - "220" - ], - "nozzle_temperature_initial_layer": [ - "220" - ], - "nozzle_temperature_range_high": [ - "240" - ], - "nozzle_temperature_range_low": [ - "190" - ], - "slow_down_layer_time": [ - "8" - ], - "temperature_vitrification": [ - "61" - ] -} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @base.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @base.json deleted file mode 100644 index 89ce745162..0000000000 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @base.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "type": "filament", - "name": "Panchroma PLA Metallic @base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "OFjb0wos", - "instantiation": "false", - "filament_cost": [ - "29.99" - ], - "filament_density": [ - "1.17" - ], - "filament_flow_ratio": [ - "0.98" - ], - "filament_max_volumetric_speed": [ - "20" - ], - "filament_vendor": [ - "Polymaker" - ], - "nozzle_temperature": [ - "220" - ], - "nozzle_temperature_initial_layer": [ - "220" - ], - "nozzle_temperature_range_high": [ - "240" - ], - "nozzle_temperature_range_low": [ - "190" - ], - "slow_down_layer_time": [ - "4" - ], - "temperature_vitrification": [ - "61" - ] -} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @base.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @base.json deleted file mode 100644 index bd8f5fc0d6..0000000000 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @base.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "type": "filament", - "name": "Panchroma PLA Neon @base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "OFO1GEq6", - "instantiation": "false", - "filament_cost": [ - "24.99" - ], - "filament_density": [ - "1.17" - ], - "filament_flow_ratio": [ - "0.98" - ], - "filament_max_volumetric_speed": [ - "20" - ], - "filament_vendor": [ - "Polymaker" - ], - "nozzle_temperature": [ - "220" - ], - "nozzle_temperature_initial_layer": [ - "220" - ], - "nozzle_temperature_range_high": [ - "240" - ], - "nozzle_temperature_range_low": [ - "190" - ], - "slow_down_layer_time": [ - "4" - ], - "temperature_vitrification": [ - "61" - ] -} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @base.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @base.json deleted file mode 100644 index c8ef69cf88..0000000000 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @base.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "type": "filament", - "name": "Panchroma PLA Satin @base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "OFPkCJKE", - "instantiation": "false", - "filament_cost": [ - "20.99" - ], - "filament_density": [ - "1.24" - ], - "filament_flow_ratio": [ - "0.95" - ], - "filament_max_volumetric_speed": [ - "16" - ], - "filament_vendor": [ - "Polymaker" - ], - "nozzle_temperature": [ - "230" - ], - "nozzle_temperature_initial_layer": [ - "230" - ], - "nozzle_temperature_range_high": [ - "240" - ], - "nozzle_temperature_range_low": [ - "190" - ], - "slow_down_layer_time": [ - "5" - ], - "temperature_vitrification": [ - "59" - ] -} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @base.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @base.json deleted file mode 100644 index 94c2cb7c0b..0000000000 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @base.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "type": "filament", - "name": "Panchroma PLA Silk @base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "OFS8lTQt", - "instantiation": "false", - "filament_cost": [ - "24.99" - ], - "filament_density": [ - "1.31" - ], - "filament_flow_ratio": [ - "0.98" - ], - "filament_max_volumetric_speed": [ - "16" - ], - "filament_vendor": [ - "Polymaker" - ], - "nozzle_temperature": [ - "230" - ], - "nozzle_temperature_initial_layer": [ - "230" - ], - "nozzle_temperature_range_high": [ - "240" - ], - "nozzle_temperature_range_low": [ - "190" - ], - "slow_down_layer_time": [ - "8" - ], - "temperature_vitrification": [ - "58" - ] -} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @base.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @base.json deleted file mode 100644 index 8622a109f2..0000000000 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @base.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "type": "filament", - "name": "Panchroma PLA Starlight @base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "OFC78WGQ", - "instantiation": "false", - "filament_cost": [ - "29.99" - ], - "filament_density": [ - "1.17" - ], - "filament_flow_ratio": [ - "0.98" - ], - "filament_max_volumetric_speed": [ - "20" - ], - "filament_vendor": [ - "Polymaker" - ], - "nozzle_temperature": [ - "220" - ], - "nozzle_temperature_initial_layer": [ - "220" - ], - "nozzle_temperature_range_high": [ - "240" - ], - "nozzle_temperature_range_low": [ - "190" - ], - "slow_down_layer_time": [ - "4" - ], - "temperature_vitrification": [ - "61" - ] -} 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 deleted file mode 100644 index d0d6f6b057..0000000000 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @base.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "type": "filament", - "name": "Panchroma PLA Temp Shift @base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "OFhASRWj", - "instantiation": "false", - "filament_cost": [ - "29.99" - ], - "filament_density": [ - "1.17" - ], - "filament_flow_ratio": [ - "0.98" - ], - "filament_max_volumetric_speed": [ - "20" - ], - "filament_vendor": [ - "Polymaker" - ], - "nozzle_temperature": [ - "220" - ], - "nozzle_temperature_initial_layer": [ - "220" - ], - "nozzle_temperature_range_high": [ - "240" - ], - "nozzle_temperature_range_low": [ - "190" - ], - "slow_down_layer_time": [ - "4" - ], - "temperature_vitrification": [ - "61" - ] -} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @base.json b/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @base.json deleted file mode 100644 index ac8842d912..0000000000 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @base.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "type": "filament", - "name": "Panchroma PLA Translucent @base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "OFCIUsWh", - "instantiation": "false", - "filament_cost": [ - "24.99" - ], - "filament_density": [ - "1.17" - ], - "filament_flow_ratio": [ - "0.98" - ], - "filament_max_volumetric_speed": [ - "16" - ], - "filament_vendor": [ - "Polymaker" - ], - "nozzle_temperature": [ - "220" - ], - "nozzle_temperature_initial_layer": [ - "220" - ], - "nozzle_temperature_range_high": [ - "240" - ], - "nozzle_temperature_range_low": [ - "190" - ], - "slow_down_layer_time": [ - "4" - ], - "temperature_vitrification": [ - "61" - ] -} 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 deleted file mode 100644 index 986b46fd5d..0000000000 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @base.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "type": "filament", - "name": "Panchroma PLA UV Shift @base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "OF1N1qMK", - "instantiation": "false", - "filament_cost": [ - "29.99" - ], - "filament_density": [ - "1.17" - ], - "filament_flow_ratio": [ - "0.98" - ], - "filament_max_volumetric_speed": [ - "20" - ], - "filament_vendor": [ - "Polymaker" - ], - "nozzle_temperature": [ - "220" - ], - "nozzle_temperature_initial_layer": [ - "220" - ], - "nozzle_temperature_range_high": [ - "240" - ], - "nozzle_temperature_range_low": [ - "190" - ], - "slow_down_layer_time": [ - "4" - ], - "temperature_vitrification": [ - "61" - ] -} diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Galaxy @base.json b/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Galaxy @base.json deleted file mode 100644 index 90996083f1..0000000000 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Galaxy @base.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "type": "filament", - "name": "PolyLite PLA Galaxy @base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "OFvyB0Bz", - "instantiation": "false", - "bed_type": [ - "Cool Plate" - ], - "cool_plate_temp": [ - "60" - ], - "cool_plate_temp_initial_layer": [ - "60" - ], - "eng_plate_temp": [ - "60" - ], - "eng_plate_temp_initial_layer": [ - "60" - ], - "filament_cost": [ - "29.99" - ], - "filament_density": [ - "1.17" - ], - "filament_flow_ratio": [ - "0.98" - ], - "filament_max_volumetric_speed": [ - "20" - ], - "filament_vendor": [ - "Polymaker" - ], - "hot_plate_temp": [ - "60" - ], - "hot_plate_temp_initial_layer": [ - "60" - ], - "nozzle_temperature_range_high": [ - "230" - ], - "overhang_fan_speed": [ - "75" - ], - "slow_down_layer_time": [ - "2" - ], - "slow_down_min_speed": [ - "5" - ], - "temperature_vitrification": [ - "61" - ], - "textured_plate_temp": [ - "60" - ], - "textured_plate_temp_initial_layer": [ - "60" - ], - "filament_type": [ - "PLA" - ] -} diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Glow @base.json b/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Glow @base.json deleted file mode 100644 index 3a70d3a83f..0000000000 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Glow @base.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "type": "filament", - "name": "PolyLite PLA Glow @base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "OF5umxxT", - "instantiation": "false", - "bed_type": [ - "Cool Plate" - ], - "cool_plate_temp": [ - "60" - ], - "cool_plate_temp_initial_layer": [ - "60" - ], - "eng_plate_temp": [ - "60" - ], - "eng_plate_temp_initial_layer": [ - "60" - ], - "filament_cost": [ - "29.99" - ], - "filament_density": [ - "1.17" - ], - "filament_flow_ratio": [ - "0.98" - ], - "filament_max_volumetric_speed": [ - "20" - ], - "filament_vendor": [ - "Polymaker" - ], - "hot_plate_temp": [ - "60" - ], - "hot_plate_temp_initial_layer": [ - "60" - ], - "nozzle_temperature_range_high": [ - "230" - ], - "overhang_fan_speed": [ - "75" - ], - "slow_down_layer_time": [ - "2" - ], - "slow_down_min_speed": [ - "5" - ], - "temperature_vitrification": [ - "61" - ], - "textured_plate_temp": [ - "60" - ], - "textured_plate_temp_initial_layer": [ - "60" - ], - "filament_type": [ - "PLA" - ] -} diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Luminous @base.json b/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Luminous @base.json deleted file mode 100644 index 14131c0348..0000000000 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Luminous @base.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "type": "filament", - "name": "PolyLite PLA Luminous @base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "OFBoSWxb", - "instantiation": "false", - "bed_type": [ - "Cool Plate" - ], - "cool_plate_temp": [ - "60" - ], - "cool_plate_temp_initial_layer": [ - "60" - ], - "eng_plate_temp": [ - "60" - ], - "eng_plate_temp_initial_layer": [ - "60" - ], - "filament_cost": [ - "29.99" - ], - "filament_density": [ - "1.17" - ], - "filament_flow_ratio": [ - "0.98" - ], - "filament_max_volumetric_speed": [ - "20" - ], - "filament_vendor": [ - "Polymaker" - ], - "hot_plate_temp": [ - "60" - ], - "hot_plate_temp_initial_layer": [ - "60" - ], - "nozzle_temperature_range_high": [ - "230" - ], - "overhang_fan_speed": [ - "75" - ], - "slow_down_layer_time": [ - "2" - ], - "slow_down_min_speed": [ - "5" - ], - "temperature_vitrification": [ - "61" - ], - "textured_plate_temp": [ - "60" - ], - "textured_plate_temp_initial_layer": [ - "60" - ], - "filament_type": [ - "PLA" - ] -} diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Neon @base.json b/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Neon @base.json deleted file mode 100644 index b9fc01a700..0000000000 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Neon @base.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "type": "filament", - "name": "PolyLite PLA Neon @base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "OFitS8al", - "instantiation": "false", - "bed_type": [ - "Cool Plate" - ], - "cool_plate_temp": [ - "60" - ], - "cool_plate_temp_initial_layer": [ - "60" - ], - "eng_plate_temp": [ - "60" - ], - "eng_plate_temp_initial_layer": [ - "60" - ], - "filament_cost": [ - "29.99" - ], - "filament_density": [ - "1.17" - ], - "filament_flow_ratio": [ - "0.98" - ], - "filament_max_volumetric_speed": [ - "20" - ], - "filament_vendor": [ - "Polymaker" - ], - "hot_plate_temp": [ - "60" - ], - "hot_plate_temp_initial_layer": [ - "60" - ], - "nozzle_temperature_range_high": [ - "230" - ], - "overhang_fan_speed": [ - "75" - ], - "slow_down_layer_time": [ - "2" - ], - "slow_down_min_speed": [ - "5" - ], - "temperature_vitrification": [ - "61" - ], - "textured_plate_temp": [ - "60" - ], - "textured_plate_temp_initial_layer": [ - "60" - ], - "filament_type": [ - "PLA" - ] -} diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @base.json b/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @base.json deleted file mode 100644 index 93c6cf8c9f..0000000000 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @base.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "type": "filament", - "name": "PolyLite PLA Pro @base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "OFF9OKoY", - "instantiation": "false", - "filament_cost": [ - "24.99" - ], - "filament_density": [ - "1.22" - ], - "filament_flow_ratio": [ - "0.95" - ], - "filament_max_volumetric_speed": [ - "16" - ], - "filament_vendor": [ - "Polymaker" - ], - "nozzle_temperature": [ - "220" - ], - "nozzle_temperature_initial_layer": [ - "220" - ], - "nozzle_temperature_range_high": [ - "220" - ], - "nozzle_temperature_range_low": [ - "190" - ], - "slow_down_layer_time": [ - "4" - ], - "temperature_vitrification": [ - "62" - ] -} diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Starlight @base.json b/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Starlight @base.json deleted file mode 100644 index 3c8a79ed3f..0000000000 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Starlight @base.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "type": "filament", - "name": "PolyLite PLA Starlight @base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "OFIxOuOu", - "instantiation": "false", - "bed_type": [ - "Cool Plate" - ], - "cool_plate_temp": [ - "60" - ], - "cool_plate_temp_initial_layer": [ - "60" - ], - "eng_plate_temp": [ - "60" - ], - "eng_plate_temp_initial_layer": [ - "60" - ], - "filament_cost": [ - "29.99" - ], - "filament_density": [ - "1.17" - ], - "filament_flow_ratio": [ - "0.98" - ], - "filament_max_volumetric_speed": [ - "20" - ], - "filament_vendor": [ - "Polymaker" - ], - "hot_plate_temp": [ - "60" - ], - "hot_plate_temp_initial_layer": [ - "60" - ], - "nozzle_temperature_range_high": [ - "230" - ], - "overhang_fan_speed": [ - "75" - ], - "slow_down_layer_time": [ - "2" - ], - "slow_down_min_speed": [ - "5" - ], - "temperature_vitrification": [ - "61" - ], - "textured_plate_temp": [ - "60" - ], - "textured_plate_temp_initial_layer": [ - "60" - ], - "filament_type": [ - "PLA" - ] -} diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Translucent @base.json b/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Translucent @base.json deleted file mode 100644 index 9a6155e283..0000000000 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Translucent @base.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "type": "filament", - "name": "PolyLite PLA Translucent @base", - "inherits": "fdm_filament_pla", - "from": "system", - "filament_id": "OFy02QHU", - "instantiation": "false", - "bed_type": [ - "Cool Plate" - ], - "cool_plate_temp": [ - "60" - ], - "cool_plate_temp_initial_layer": [ - "60" - ], - "eng_plate_temp": [ - "60" - ], - "eng_plate_temp_initial_layer": [ - "60" - ], - "filament_cost": [ - "29.99" - ], - "filament_density": [ - "1.17" - ], - "filament_flow_ratio": [ - "0.98" - ], - "filament_max_volumetric_speed": [ - "20" - ], - "filament_vendor": [ - "Polymaker" - ], - "hot_plate_temp": [ - "60" - ], - "hot_plate_temp_initial_layer": [ - "60" - ], - "nozzle_temperature_range_high": [ - "230" - ], - "overhang_fan_speed": [ - "75" - ], - "slow_down_layer_time": [ - "2" - ], - "slow_down_min_speed": [ - "5" - ], - "temperature_vitrification": [ - "61" - ], - "textured_plate_temp": [ - "60" - ], - "textured_plate_temp_initial_layer": [ - "60" - ], - "filament_type": [ - "PLA" - ] -} diff --git a/resources/profiles/CoLiDo.json b/resources/profiles/CoLiDo.json index f27623c7bc..3333d2e71c 100644 --- a/resources/profiles/CoLiDo.json +++ b/resources/profiles/CoLiDo.json @@ -1,6 +1,6 @@ { "name": "CoLiDo", - "version": "02.04.00.05", + "version": "02.04.00.06", "force_update": "0", "description": "CoLiDo configurations", "machine_model_list": [ diff --git a/resources/profiles/CoLiDo/CoLiDo SR1_cover.png b/resources/profiles/CoLiDo/CoLiDo SR1_cover.png index 79bf3e9cfb..ca4cdca253 100644 Binary files a/resources/profiles/CoLiDo/CoLiDo SR1_cover.png and b/resources/profiles/CoLiDo/CoLiDo SR1_cover.png differ diff --git a/resources/profiles/Creality.json b/resources/profiles/Creality.json index b5d5b420bd..11647d86da 100644 --- a/resources/profiles/Creality.json +++ b/resources/profiles/Creality.json @@ -1,6 +1,6 @@ { "name": "Creality", - "version": "02.03.02.84", + "version": "02.03.02.85", "force_update": "0", "description": "Creality configurations", "machine_model_list": [ diff --git a/resources/profiles/Creality/Creality Ender-3 V4_cover.png b/resources/profiles/Creality/Creality Ender-3 V4_cover.png index ac4526fed0..60b5b3d3a6 100644 Binary files a/resources/profiles/Creality/Creality Ender-3 V4_cover.png and b/resources/profiles/Creality/Creality Ender-3 V4_cover.png differ diff --git a/resources/profiles/Creality/Creality K1 Max_CFS-C_cover.png b/resources/profiles/Creality/Creality K1 Max_CFS-C_cover.png index 52499b572b..fd7e344043 100644 Binary files a/resources/profiles/Creality/Creality K1 Max_CFS-C_cover.png and b/resources/profiles/Creality/Creality K1 Max_CFS-C_cover.png differ diff --git a/resources/profiles/Creality/Creality K1 SE_CFS-C_cover.png b/resources/profiles/Creality/Creality K1 SE_CFS-C_cover.png index f7ce98e840..6cb63c833c 100644 Binary files a/resources/profiles/Creality/Creality K1 SE_CFS-C_cover.png and b/resources/profiles/Creality/Creality K1 SE_CFS-C_cover.png differ diff --git a/resources/profiles/Creality/Creality K1C_CFS-C_cover.png b/resources/profiles/Creality/Creality K1C_CFS-C_cover.png index 2d49bc6f46..5ac50899ec 100644 Binary files a/resources/profiles/Creality/Creality K1C_CFS-C_cover.png and b/resources/profiles/Creality/Creality K1C_CFS-C_cover.png differ diff --git a/resources/profiles/Creality/Creality K1_CFS-C_cover.png b/resources/profiles/Creality/Creality K1_CFS-C_cover.png index f91158f668..e1c02f0c48 100644 Binary files a/resources/profiles/Creality/Creality K1_CFS-C_cover.png and b/resources/profiles/Creality/Creality K1_CFS-C_cover.png differ diff --git a/resources/profiles/Creality/Creality K2 SE_cover.png b/resources/profiles/Creality/Creality K2 SE_cover.png index c335885597..d5d53937fc 100644 Binary files a/resources/profiles/Creality/Creality K2 SE_cover.png and b/resources/profiles/Creality/Creality K2 SE_cover.png differ diff --git a/resources/profiles/Creality/Creality SPARKX i7_cover.png b/resources/profiles/Creality/Creality SPARKX i7_cover.png index 076d521faa..20b8042f61 100644 Binary files a/resources/profiles/Creality/Creality SPARKX i7_cover.png and b/resources/profiles/Creality/Creality SPARKX i7_cover.png differ diff --git a/resources/profiles/Creality/creality_SPARKX_buildplate_model.stl b/resources/profiles/Creality/creality_SPARKX_buildplate_model.stl index 91de14606e..6b9935aff5 100644 Binary files a/resources/profiles/Creality/creality_SPARKX_buildplate_model.stl and b/resources/profiles/Creality/creality_SPARKX_buildplate_model.stl differ diff --git a/resources/profiles/Creality/creality_SPARKX_buildplate_texture.svg b/resources/profiles/Creality/creality_SPARKX_buildplate_texture.svg new file mode 100644 index 0000000000..53f9ee4f54 --- /dev/null +++ b/resources/profiles/Creality/creality_SPARKX_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Creality/creality_ender3v4_buildplate_model.stl b/resources/profiles/Creality/creality_ender3v4_buildplate_model.stl new file mode 100644 index 0000000000..4e9ed9b65b Binary files /dev/null and b/resources/profiles/Creality/creality_ender3v4_buildplate_model.stl differ diff --git a/resources/profiles/Creality/creality_ender3v4_buildplate_texture.svg b/resources/profiles/Creality/creality_ender3v4_buildplate_texture.svg new file mode 100644 index 0000000000..53f9ee4f54 --- /dev/null +++ b/resources/profiles/Creality/creality_ender3v4_buildplate_texture.svg @@ -0,0 +1 @@ + \ 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 10bdfa06e1..0cf3dfb96d 100644 --- a/resources/profiles/Creality/filament/CR-ABS @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/CR-ABS @K2 Plus-all.json @@ -46,7 +46,7 @@ "0" ], "filament_max_volumetric_speed": [ - "10" + "18" ], "filament_minimal_purge_on_wipe_tower": [ "15" 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 4a9e23750b..622e88b93d 100644 --- a/resources/profiles/Creality/filament/CR-PETG @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/CR-PETG @K2 Plus-all.json @@ -40,7 +40,7 @@ "14" ], "filament_density": [ - "1.23" + "1.24" ], "filament_flow_ratio": [ "0.95" @@ -49,10 +49,10 @@ "0" ], "filament_max_volumetric_speed": [ - "12" + "18" ], "filament_retraction_length": [ - "0.8" + "1.2" ], "filament_type": [ "PETG" @@ -67,10 +67,10 @@ "70" ], "nozzle_temperature": [ - "250" + "240" ], "nozzle_temperature_initial_layer": [ - "250" + "240" ], "nozzle_temperature_range_high": [ "270" @@ -79,7 +79,7 @@ "220" ], "overhang_fan_speed": [ - "90" + "100" ], "overhang_fan_threshold": [ "25%" @@ -94,7 +94,7 @@ "20" ], "temperature_vitrification": [ - "80" + "60" ], "textured_plate_temp": [ "70" 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 48d6542c23..67b418e22f 100644 --- a/resources/profiles/Creality/filament/CR-PLA @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/CR-PLA @K2 Plus-all.json @@ -46,7 +46,7 @@ "0" ], "filament_max_volumetric_speed": [ - "16" + "18" ], "filament_minimal_purge_on_wipe_tower": [ "15" 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 fc0b3e724a..4935d41c7d 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 @@ -46,7 +46,7 @@ "0" ], "filament_max_volumetric_speed": [ - "16" + "18" ], "filament_minimal_purge_on_wipe_tower": [ "15" 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 ae46802d71..23239f3115 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 @@ -49,7 +49,7 @@ "0" ], "filament_max_volumetric_speed": [ - "12" + "18" ], "filament_minimal_purge_on_wipe_tower": [ "15" 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 d1d211884e..a157181008 100644 --- a/resources/profiles/Creality/filament/CR-Silk @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/CR-Silk @K2 Plus-all.json @@ -49,7 +49,7 @@ "0" ], "filament_max_volumetric_speed": [ - "12" + "10" ], "filament_minimal_purge_on_wipe_tower": [ "15" @@ -100,10 +100,10 @@ "50" ], "nozzle_temperature": [ - "230" + "220" ], "nozzle_temperature_initial_layer": [ - "230" + "220" ], "nozzle_temperature_range_high": [ "240" 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 cf7a5ef46a..8830fb9d0c 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 @@ -49,7 +49,7 @@ "0" ], "filament_max_volumetric_speed": [ - "16" + "23" ], "filament_minimal_purge_on_wipe_tower": [ "15" @@ -155,7 +155,7 @@ "filament_unloading_speed_start": "100", "material_flow_dependent_temperature": "0", "material_flow_temp_graph": "[[3.0,210],[10.0,220],[12.0,230]]", - "pressure_advance": "0.05", + "pressure_advance": "0.04", "support_material_interface_fan_speed": "-1", "compatible_printers": [ "Creality K2 Plus 0.2 nozzle", 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 6aadd53bf2..35490b244a 100644 --- a/resources/profiles/Creality/filament/HP-ASA @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/HP-ASA @K2 Plus-all.json @@ -58,7 +58,7 @@ "0" ], "filament_max_volumetric_speed": [ - "10" + "14" ], "filament_minimal_purge_on_wipe_tower": [ "15" 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 18a4380b95..6080aee780 100644 --- a/resources/profiles/Creality/filament/Hyper PETG @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Hyper PETG @K2 Plus-all.json @@ -40,7 +40,7 @@ "40" ], "filament_cost": [ - "24.99" + "25" ], "filament_density": [ "1.28" @@ -52,13 +52,13 @@ "0" ], "filament_max_volumetric_speed": [ - "18" + "23" ], "filament_retract_before_wipe": [ "100" ], "filament_retraction_length": [ - "0.8" + "1.2" ], "filament_type": [ "PETG" @@ -97,7 +97,7 @@ "20" ], "temperature_vitrification": [ - "74.3" + "75" ], "textured_plate_temp": [ "70" @@ -136,7 +136,7 @@ "filament_unloading_speed": "90", "filament_unloading_speed_start": "100", "material_flow_dependent_temperature": "0", - "pressure_advance": "0.07", + "pressure_advance": "0.05", "support_material_interface_fan_speed": "-1", "compatible_printers": [ "Creality K2 Plus 0.2 nozzle", 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 a56f03f226..4f7e0130f6 100644 --- a/resources/profiles/Creality/filament/Hyper PLA @K2 Plus-all.json +++ b/resources/profiles/Creality/filament/Hyper PLA @K2 Plus-all.json @@ -31,7 +31,7 @@ "50" ], "filament_cost": [ - "30" + "20" ], "filament_deretraction_speed": [ "nil" @@ -46,7 +46,7 @@ "0" ], "filament_max_volumetric_speed": [ - "21" + "23" ], "filament_minimal_purge_on_wipe_tower": [ "15" @@ -146,7 +146,7 @@ "filament_unloading_speed_start": "100", "material_flow_dependent_temperature": "0", "material_flow_temp_graph": "[[3.0,210],[10.0,220],[12.0,230]]", - "pressure_advance": "0.04", + "pressure_advance": "0.044", "support_material_interface_fan_speed": "-1", "compatible_printers": [ "Creality K2 Plus 0.2 nozzle", diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V4.json b/resources/profiles/Creality/machine/Creality Ender-3 V4.json index 3229f33792..baa9cec0af 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V4.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V4.json @@ -2,9 +2,9 @@ "type": "machine_model", "name": "Creality Ender-3 V4", "nozzle_diameter": "0.4", - "bed_model": "creality_ender3v3_buildplate_model.stl", + "bed_model": "creality_ender3v4_buildplate_model.stl", "default_bed_type": "Textured PEI Plate", - "bed_texture": "creality_ender3v3_buildplate_texture.svg", + "bed_texture": "creality_ender3v4_buildplate_texture.svg", "family": "Creality", "hotend_model": "", "machine_tech": "FFF", diff --git a/resources/profiles/Creality/machine/Creality SPARKX i7.json b/resources/profiles/Creality/machine/Creality SPARKX i7.json index 4ec6a2a935..180f042129 100644 --- a/resources/profiles/Creality/machine/Creality SPARKX i7.json +++ b/resources/profiles/Creality/machine/Creality SPARKX i7.json @@ -4,7 +4,7 @@ "nozzle_diameter": "0.8;0.6;0.4;0.2", "bed_model": "creality_SPARKX_buildplate_model.stl", "default_bed_type": "Textured PEI Plate", - "bed_texture": "creality_hi_buildplate_texture.svg", + "bed_texture": "creality_SPARKX_buildplate_texture.svg", "family": "Creality", "hotend_model": "", "machine_tech": "FFF", diff --git a/resources/profiles/Cubicon.json b/resources/profiles/Cubicon.json index 57f9da37d6..81601bc83e 100644 --- a/resources/profiles/Cubicon.json +++ b/resources/profiles/Cubicon.json @@ -1,6 +1,6 @@ { "name": "Cubicon", - "version": "02.04.00.06", + "version": "02.04.00.07", "force_update": "0", "description": "Cubicon configurations", "machine_model_list": [ diff --git a/resources/profiles/Cubicon/Cubicon xCeler-Mini_cover.png b/resources/profiles/Cubicon/Cubicon xCeler-Mini_cover.png index 9474c2d5ed..eb9f73c5ea 100644 Binary files a/resources/profiles/Cubicon/Cubicon xCeler-Mini_cover.png and b/resources/profiles/Cubicon/Cubicon xCeler-Mini_cover.png differ diff --git a/resources/profiles/Elegoo.json b/resources/profiles/Elegoo.json index b2e2c21f14..38d3577b87 100644 --- a/resources/profiles/Elegoo.json +++ b/resources/profiles/Elegoo.json @@ -1,6 +1,6 @@ { "name": "Elegoo", - "version": "02.04.00.09", + "version": "02.04.00.10", "force_update": "0", "description": "Elegoo configurations", "machine_model_list": [ diff --git a/resources/profiles/Elegoo/Elegoo Centauri 2_cover.png b/resources/profiles/Elegoo/Elegoo Centauri 2_cover.png index d836650597..197aab0111 100644 Binary files a/resources/profiles/Elegoo/Elegoo Centauri 2_cover.png and b/resources/profiles/Elegoo/Elegoo Centauri 2_cover.png differ diff --git a/resources/profiles/Eryone.json b/resources/profiles/Eryone.json index 1ee1f88ed8..ea9ce20a44 100644 --- a/resources/profiles/Eryone.json +++ b/resources/profiles/Eryone.json @@ -1,6 +1,6 @@ { "name": "Eryone", - "version": "02.04.00.05", + "version": "02.04.00.06", "force_update": "0", "description": "Eryone configurations", "machine_model_list": [ @@ -432,10 +432,18 @@ "name": "Eryone ABS", "sub_path": "filament/Eryone ABS.json" }, + { + "name": "Eryone ABS+-HS @Thinker X400 0.4 nozzle", + "sub_path": "filament/Eryone ABS+-HS @Thinker X400 0.4 nozzle.json" + }, { "name": "Eryone ABS-CF", "sub_path": "filament/Eryone ABS-CF.json" }, + { + "name": "Eryone ABS-GF @Thinker X400 0.4 nozzle", + "sub_path": "filament/Eryone ABS-GF @Thinker X400 0.4 nozzle.json" + }, { "name": "Eryone ASA", "sub_path": "filament/Eryone ASA.json" @@ -444,6 +452,10 @@ "name": "Eryone ASA-CF", "sub_path": "filament/Eryone ASA-CF.json" }, + { + "name": "Eryone ASA-HS @Thinker X400 0.4 nozzle", + "sub_path": "filament/Eryone ASA-HS @Thinker X400 0.4 nozzle.json" + }, { "name": "Eryone PA", "sub_path": "filament/Eryone PA.json" @@ -460,18 +472,50 @@ "name": "Eryone PETG", "sub_path": "filament/Eryone PETG.json" }, + { + "name": "Eryone PETG HS @Thinker X400 0.4 nozzle", + "sub_path": "filament/Eryone PETG HS @Thinker X400 0.4 nozzle.json" + }, { "name": "Eryone PETG-CF", "sub_path": "filament/Eryone PETG-CF.json" }, + { + "name": "Eryone PETG-GF @Thinker X400 0.4 nozzle", + "sub_path": "filament/Eryone PETG-GF @Thinker X400 0.4 nozzle.json" + }, + { + "name": "Eryone PETG-Lite @Thinker X400 0.4 nozzle", + "sub_path": "filament/Eryone PETG-Lite @Thinker X400 0.4 nozzle.json" + }, + { + "name": "Eryone PETG-Matte @Thinker X400 0.4 nozzle", + "sub_path": "filament/Eryone PETG-Matte @Thinker X400 0.4 nozzle.json" + }, + { + "name": "Eryone PETG-Translucent @Thinker X400 0.4 nozzle", + "sub_path": "filament/Eryone PETG-Translucent @Thinker X400 0.4 nozzle.json" + }, { "name": "Eryone PLA", "sub_path": "filament/Eryone PLA.json" }, + { + "name": "Eryone PLA+HS @Thinker X400 0.4 nozzle", + "sub_path": "filament/Eryone PLA+HS @Thinker X400 0.4 nozzle.json" + }, { "name": "Eryone PLA-CF", "sub_path": "filament/Eryone PLA-CF.json" }, + { + "name": "Eryone PLA-Matte @Thinker X400 0.4 nozzle", + "sub_path": "filament/Eryone PLA-Matte @Thinker X400 0.4 nozzle.json" + }, + { + "name": "Eryone PLA-Matte HS @Thinker X400 0.4 nozzle", + "sub_path": "filament/Eryone PLA-Matte HS @Thinker X400 0.4 nozzle.json" + }, { "name": "Eryone PP", "sub_path": "filament/Eryone PP.json" @@ -488,6 +532,14 @@ "name": "Eryone TPU", "sub_path": "filament/Eryone TPU.json" }, + { + "name": "Eryone petg-Galaxy @Thinker X400 0.4 nozzle", + "sub_path": "filament/Eryone petg-Galaxy @Thinker X400 0.4 nozzle.json" + }, + { + "name": "Eryone pla-Ultra Silk @Thinker X400 0.4 nozzle", + "sub_path": "filament/Eryone pla-Ultra Silk @Thinker X400 0.4 nozzle.json" + }, { "name": "fdm_filament_pla", "sub_path": "filament/fdm_filament_pla.json" diff --git a/resources/profiles/Eryone/filament/Eryone ABS+-HS @Thinker X400 0.4 nozzle.json b/resources/profiles/Eryone/filament/Eryone ABS+-HS @Thinker X400 0.4 nozzle.json new file mode 100644 index 0000000000..fb0f39861c --- /dev/null +++ b/resources/profiles/Eryone/filament/Eryone ABS+-HS @Thinker X400 0.4 nozzle.json @@ -0,0 +1,54 @@ +{ + "type": "filament", + "name": "Eryone ABS+-HS @Thinker X400 0.4 nozzle", + "inherits": "Eryone Standard PLA", + "from": "system", + "setting_id": "aUH1I90BFXa0C84r", + "filament_id": "OFRgjTRp", + "instantiation": "true", + "compatible_printers": [ + "Thinker X400 0.4 nozzle" + ], + "filament_settings_id": [ + "Eryone ABS+-HS @Thinker X400 0.4 nozzle" + ], + "fan_max_speed": [ + "20" + ], + "fan_min_speed": [ + "0" + ], + "filament_end_gcode": [ + "; filament end gcode \nSET_FAN_SPEED FAN=filter_fan SPEED=0" + ], + "filament_flow_ratio": [ + "0.96" + ], + "filament_max_volumetric_speed": [ + "25" + ], + "filament_start_gcode": [ + "; filament start gcode\nSET_FAN_SPEED FAN=filter_fan SPEED=1" + ], + "filament_type": [ + "ABS" + ], + "hot_plate_temp": [ + "90" + ], + "hot_plate_temp_initial_layer": [ + "90" + ], + "nozzle_temperature": [ + "255" + ], + "nozzle_temperature_initial_layer": [ + "255" + ], + "slow_down_layer_time": [ + "4" + ], + "slow_down_min_speed": [ + "15" + ] +} diff --git a/resources/profiles/Eryone/filament/Eryone ABS-GF @Thinker X400 0.4 nozzle.json b/resources/profiles/Eryone/filament/Eryone ABS-GF @Thinker X400 0.4 nozzle.json new file mode 100644 index 0000000000..f3ff63ea2d --- /dev/null +++ b/resources/profiles/Eryone/filament/Eryone ABS-GF @Thinker X400 0.4 nozzle.json @@ -0,0 +1,54 @@ +{ + "type": "filament", + "name": "Eryone ABS-GF @Thinker X400 0.4 nozzle", + "inherits": "Eryone Standard PLA", + "from": "system", + "setting_id": "WnsZC7HYi5Z1MOcn", + "filament_id": "OFenMm2Y", + "instantiation": "true", + "compatible_printers": [ + "Thinker X400 0.4 nozzle" + ], + "filament_settings_id": [ + "Eryone ABS-GF @Thinker X400 0.4 nozzle" + ], + "fan_max_speed": [ + "20" + ], + "fan_min_speed": [ + "0" + ], + "filament_end_gcode": [ + "; filament end gcode \nSET_FAN_SPEED FAN=filter_fan SPEED=0" + ], + "filament_flow_ratio": [ + "0.96" + ], + "filament_max_volumetric_speed": [ + "18" + ], + "filament_start_gcode": [ + "; filament start gcode\nSET_FAN_SPEED FAN=filter_fan SPEED=1" + ], + "filament_type": [ + "ABS" + ], + "hot_plate_temp": [ + "90" + ], + "hot_plate_temp_initial_layer": [ + "90" + ], + "nozzle_temperature": [ + "265" + ], + "nozzle_temperature_initial_layer": [ + "265" + ], + "slow_down_layer_time": [ + "4" + ], + "slow_down_min_speed": [ + "15" + ] +} diff --git a/resources/profiles/Eryone/filament/Eryone ASA-HS @Thinker X400 0.4 nozzle.json b/resources/profiles/Eryone/filament/Eryone ASA-HS @Thinker X400 0.4 nozzle.json new file mode 100644 index 0000000000..40b5d6da1b --- /dev/null +++ b/resources/profiles/Eryone/filament/Eryone ASA-HS @Thinker X400 0.4 nozzle.json @@ -0,0 +1,54 @@ +{ + "type": "filament", + "name": "Eryone ASA-HS @Thinker X400 0.4 nozzle", + "inherits": "Eryone Standard PLA", + "from": "system", + "setting_id": "xw8zqUsFb2WVaSo1", + "filament_id": "OFIzY5sP", + "instantiation": "true", + "compatible_printers": [ + "Thinker X400 0.4 nozzle" + ], + "filament_settings_id": [ + "Eryone ASA-HS @Thinker X400 0.4 nozzle" + ], + "fan_max_speed": [ + "20" + ], + "fan_min_speed": [ + "0" + ], + "filament_end_gcode": [ + "; filament end gcode \nSET_FAN_SPEED FAN=filter_fan SPEED=0" + ], + "filament_flow_ratio": [ + "1" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "filament_start_gcode": [ + "; filament start gcode\nSET_FAN_SPEED FAN=filter_fan SPEED=1" + ], + "filament_type": [ + "ASA" + ], + "hot_plate_temp": [ + "90" + ], + "hot_plate_temp_initial_layer": [ + "90" + ], + "nozzle_temperature": [ + "260" + ], + "nozzle_temperature_initial_layer": [ + "260" + ], + "slow_down_layer_time": [ + "4" + ], + "slow_down_min_speed": [ + "15" + ] +} diff --git a/resources/profiles/Eryone/filament/Eryone PETG HS @Thinker X400 0.4 nozzle.json b/resources/profiles/Eryone/filament/Eryone PETG HS @Thinker X400 0.4 nozzle.json new file mode 100644 index 0000000000..d0716a6d94 --- /dev/null +++ b/resources/profiles/Eryone/filament/Eryone PETG HS @Thinker X400 0.4 nozzle.json @@ -0,0 +1,60 @@ +{ + "type": "filament", + "name": "Eryone PETG HS @Thinker X400 0.4 nozzle", + "inherits": "Eryone Standard PLA", + "from": "system", + "setting_id": "GtPiiNgHAnxrR9Tj", + "filament_id": "OFtqfvcE", + "instantiation": "true", + "compatible_printers": [ + "Thinker X400 0.4 nozzle" + ], + "filament_settings_id": [ + "Eryone PETG HS @Thinker X400 0.4 nozzle" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "fan_max_speed": [ + "50" + ], + "fan_min_speed": [ + "30" + ], + "filament_end_gcode": [ + "; filament end gcode \nSET_FAN_SPEED FAN=filter_fan SPEED=0" + ], + "filament_flow_ratio": [ + "0.97" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_start_gcode": [ + "; filament start gcode\nSET_FAN_SPEED FAN=filter_fan SPEED=1" + ], + "filament_type": [ + "PETG" + ], + "full_fan_speed_layer": [ + "2" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "nozzle_temperature": [ + "240" + ], + "nozzle_temperature_initial_layer": [ + "240" + ], + "slow_down_layer_time": [ + "4" + ], + "slow_down_min_speed": [ + "15" + ] +} diff --git a/resources/profiles/Eryone/filament/Eryone PETG-CF.json b/resources/profiles/Eryone/filament/Eryone PETG-CF.json index 3dc02ddf00..c0823b73fe 100644 --- a/resources/profiles/Eryone/filament/Eryone PETG-CF.json +++ b/resources/profiles/Eryone/filament/Eryone PETG-CF.json @@ -40,7 +40,7 @@ "14" ], "filament_settings_id": [ - "Eryone PETG" + "Eryone PETG-CF" ], "filament_type": [ "PETG-CF" diff --git a/resources/profiles/Eryone/filament/Eryone PETG-GF @Thinker X400 0.4 nozzle.json b/resources/profiles/Eryone/filament/Eryone PETG-GF @Thinker X400 0.4 nozzle.json new file mode 100644 index 0000000000..0bdb2eacd3 --- /dev/null +++ b/resources/profiles/Eryone/filament/Eryone PETG-GF @Thinker X400 0.4 nozzle.json @@ -0,0 +1,60 @@ +{ + "type": "filament", + "name": "Eryone PETG-GF @Thinker X400 0.4 nozzle", + "inherits": "Eryone Standard PLA", + "from": "system", + "setting_id": "S1FBfw93PzYJMhCa", + "filament_id": "OFbzOkXX", + "instantiation": "true", + "compatible_printers": [ + "Thinker X400 0.4 nozzle" + ], + "filament_settings_id": [ + "Eryone PETG-GF @Thinker X400 0.4 nozzle" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "fan_max_speed": [ + "50" + ], + "fan_min_speed": [ + "30" + ], + "filament_end_gcode": [ + "; filament end gcode \nSET_FAN_SPEED FAN=filter_fan SPEED=0" + ], + "filament_flow_ratio": [ + "0.96" + ], + "filament_max_volumetric_speed": [ + "13" + ], + "filament_start_gcode": [ + "; filament start gcode\nSET_FAN_SPEED FAN=filter_fan SPEED=1" + ], + "filament_type": [ + "PETG" + ], + "full_fan_speed_layer": [ + "2" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "nozzle_temperature": [ + "250" + ], + "nozzle_temperature_initial_layer": [ + "250" + ], + "slow_down_layer_time": [ + "4" + ], + "slow_down_min_speed": [ + "15" + ] +} diff --git a/resources/profiles/Eryone/filament/Eryone PETG-Lite @Thinker X400 0.4 nozzle.json b/resources/profiles/Eryone/filament/Eryone PETG-Lite @Thinker X400 0.4 nozzle.json new file mode 100644 index 0000000000..d23aeae081 --- /dev/null +++ b/resources/profiles/Eryone/filament/Eryone PETG-Lite @Thinker X400 0.4 nozzle.json @@ -0,0 +1,60 @@ +{ + "type": "filament", + "name": "Eryone PETG-Lite @Thinker X400 0.4 nozzle", + "inherits": "Eryone Standard PLA", + "from": "system", + "setting_id": "CWHhUswq3j9XHAuC", + "filament_id": "OFyWb8AA", + "instantiation": "true", + "compatible_printers": [ + "Thinker X400 0.4 nozzle" + ], + "filament_settings_id": [ + "Eryone PETG-Lite @Thinker X400 0.4 nozzle" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "fan_max_speed": [ + "50" + ], + "fan_min_speed": [ + "30" + ], + "filament_end_gcode": [ + "; filament end gcode \nSET_FAN_SPEED FAN=filter_fan SPEED=0" + ], + "filament_flow_ratio": [ + "0.9796" + ], + "filament_max_volumetric_speed": [ + "13" + ], + "filament_start_gcode": [ + "; filament start gcode\nSET_FAN_SPEED FAN=filter_fan SPEED=1" + ], + "filament_type": [ + "PETG" + ], + "full_fan_speed_layer": [ + "2" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "nozzle_temperature": [ + "245" + ], + "nozzle_temperature_initial_layer": [ + "245" + ], + "slow_down_layer_time": [ + "4" + ], + "slow_down_min_speed": [ + "15" + ] +} diff --git a/resources/profiles/Eryone/filament/Eryone PETG-Matte @Thinker X400 0.4 nozzle.json b/resources/profiles/Eryone/filament/Eryone PETG-Matte @Thinker X400 0.4 nozzle.json new file mode 100644 index 0000000000..5d7793b549 --- /dev/null +++ b/resources/profiles/Eryone/filament/Eryone PETG-Matte @Thinker X400 0.4 nozzle.json @@ -0,0 +1,60 @@ +{ + "type": "filament", + "name": "Eryone PETG-Matte @Thinker X400 0.4 nozzle", + "inherits": "Eryone Standard PLA", + "from": "system", + "setting_id": "pzceBG5k2u3X9TLO", + "filament_id": "OFSvr7Aj", + "instantiation": "true", + "compatible_printers": [ + "Thinker X400 0.4 nozzle" + ], + "filament_settings_id": [ + "Eryone PETG-Matte @Thinker X400 0.4 nozzle" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "fan_max_speed": [ + "50" + ], + "fan_min_speed": [ + "30" + ], + "filament_end_gcode": [ + "; filament end gcode \nSET_FAN_SPEED FAN=filter_fan SPEED=0" + ], + "filament_flow_ratio": [ + "1" + ], + "filament_max_volumetric_speed": [ + "22" + ], + "filament_start_gcode": [ + "; filament start gcode\nSET_FAN_SPEED FAN=filter_fan SPEED=1" + ], + "filament_type": [ + "PETG" + ], + "full_fan_speed_layer": [ + "2" + ], + "hot_plate_temp": [ + "80" + ], + "hot_plate_temp_initial_layer": [ + "80" + ], + "nozzle_temperature": [ + "250" + ], + "nozzle_temperature_initial_layer": [ + "250" + ], + "slow_down_layer_time": [ + "4" + ], + "slow_down_min_speed": [ + "15" + ] +} diff --git a/resources/profiles/Eryone/filament/Eryone PETG-Translucent @Thinker X400 0.4 nozzle.json b/resources/profiles/Eryone/filament/Eryone PETG-Translucent @Thinker X400 0.4 nozzle.json new file mode 100644 index 0000000000..f195328495 --- /dev/null +++ b/resources/profiles/Eryone/filament/Eryone PETG-Translucent @Thinker X400 0.4 nozzle.json @@ -0,0 +1,60 @@ +{ + "type": "filament", + "name": "Eryone PETG-Translucent @Thinker X400 0.4 nozzle", + "inherits": "Eryone Standard PLA", + "from": "system", + "setting_id": "jN64L5SUnQB5dG1x", + "filament_id": "OFY2E8cd", + "instantiation": "true", + "compatible_printers": [ + "Thinker X400 0.4 nozzle" + ], + "filament_settings_id": [ + "Eryone PETG-Translucent @Thinker X400 0.4 nozzle" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "fan_max_speed": [ + "50" + ], + "fan_min_speed": [ + "30" + ], + "filament_end_gcode": [ + "; filament end gcode \nSET_FAN_SPEED FAN=filter_fan SPEED=0" + ], + "filament_flow_ratio": [ + "0.99" + ], + "filament_max_volumetric_speed": [ + "24" + ], + "filament_start_gcode": [ + "; filament start gcode\nSET_FAN_SPEED FAN=filter_fan SPEED=1" + ], + "filament_type": [ + "PETG" + ], + "full_fan_speed_layer": [ + "2" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "nozzle_temperature": [ + "215" + ], + "nozzle_temperature_initial_layer": [ + "215" + ], + "slow_down_layer_time": [ + "4" + ], + "slow_down_min_speed": [ + "15" + ] +} diff --git a/resources/profiles/Eryone/filament/Eryone PLA+HS @Thinker X400 0.4 nozzle.json b/resources/profiles/Eryone/filament/Eryone PLA+HS @Thinker X400 0.4 nozzle.json new file mode 100644 index 0000000000..13708aa4c4 --- /dev/null +++ b/resources/profiles/Eryone/filament/Eryone PLA+HS @Thinker X400 0.4 nozzle.json @@ -0,0 +1,48 @@ +{ + "type": "filament", + "name": "Eryone PLA+HS @Thinker X400 0.4 nozzle", + "inherits": "Eryone Standard PLA", + "from": "system", + "setting_id": "AfUEns6VhCXsj9Ft", + "filament_id": "OFeRoHy3", + "instantiation": "true", + "compatible_printers": [ + "Thinker X400 0.4 nozzle" + ], + "filament_settings_id": [ + "Eryone PLA+HS @Thinker X400 0.4 nozzle" + ], + "fan_min_speed": [ + "80" + ], + "filament_end_gcode": [ + "; filament end gcode \nSET_FAN_SPEED FAN=filter_fan SPEED=0" + ], + "filament_flow_ratio": [ + "0.99" + ], + "filament_max_volumetric_speed": [ + "18" + ], + "filament_start_gcode": [ + "; filament start gcode\nSET_FAN_SPEED FAN=filter_fan SPEED=1" + ], + "hot_plate_temp": [ + "55" + ], + "hot_plate_temp_initial_layer": [ + "55" + ], + "nozzle_temperature": [ + "210" + ], + "nozzle_temperature_initial_layer": [ + "210" + ], + "slow_down_layer_time": [ + "4" + ], + "slow_down_min_speed": [ + "15" + ] +} diff --git a/resources/profiles/Eryone/filament/Eryone PLA-Matte @Thinker X400 0.4 nozzle.json b/resources/profiles/Eryone/filament/Eryone PLA-Matte @Thinker X400 0.4 nozzle.json new file mode 100644 index 0000000000..f4d0667f5f --- /dev/null +++ b/resources/profiles/Eryone/filament/Eryone PLA-Matte @Thinker X400 0.4 nozzle.json @@ -0,0 +1,48 @@ +{ + "type": "filament", + "name": "Eryone PLA-Matte @Thinker X400 0.4 nozzle", + "inherits": "Eryone Standard PLA", + "from": "system", + "setting_id": "Ho1nQYsweqTTte0g", + "filament_id": "OFFMWFWL", + "instantiation": "true", + "compatible_printers": [ + "Thinker X400 0.4 nozzle" + ], + "filament_settings_id": [ + "Eryone PLA-Matte @Thinker X400 0.4 nozzle" + ], + "fan_min_speed": [ + "80" + ], + "filament_end_gcode": [ + "; filament end gcode \nSET_FAN_SPEED FAN=filter_fan SPEED=0" + ], + "filament_flow_ratio": [ + "0.99" + ], + "filament_max_volumetric_speed": [ + "21" + ], + "filament_start_gcode": [ + "; filament start gcode\nSET_FAN_SPEED FAN=filter_fan SPEED=1" + ], + "hot_plate_temp": [ + "55" + ], + "hot_plate_temp_initial_layer": [ + "55" + ], + "nozzle_temperature": [ + "215" + ], + "nozzle_temperature_initial_layer": [ + "215" + ], + "slow_down_layer_time": [ + "4" + ], + "slow_down_min_speed": [ + "15" + ] +} diff --git a/resources/profiles/Eryone/filament/Eryone PLA-Matte HS @Thinker X400 0.4 nozzle.json b/resources/profiles/Eryone/filament/Eryone PLA-Matte HS @Thinker X400 0.4 nozzle.json new file mode 100644 index 0000000000..4a705e04bd --- /dev/null +++ b/resources/profiles/Eryone/filament/Eryone PLA-Matte HS @Thinker X400 0.4 nozzle.json @@ -0,0 +1,48 @@ +{ + "type": "filament", + "name": "Eryone PLA-Matte HS @Thinker X400 0.4 nozzle", + "inherits": "Eryone Standard PLA", + "from": "system", + "setting_id": "8W0yhuRu7OBJkSOS", + "filament_id": "OF9mNFSM", + "instantiation": "true", + "compatible_printers": [ + "Thinker X400 0.4 nozzle" + ], + "filament_settings_id": [ + "Eryone PLA-Matte HS @Thinker X400 0.4 nozzle" + ], + "fan_min_speed": [ + "80" + ], + "filament_end_gcode": [ + "; filament end gcode \nSET_FAN_SPEED FAN=filter_fan SPEED=0" + ], + "filament_flow_ratio": [ + "1.1" + ], + "filament_max_volumetric_speed": [ + "28" + ], + "filament_start_gcode": [ + "; filament start gcode\nSET_FAN_SPEED FAN=filter_fan SPEED=1" + ], + "hot_plate_temp": [ + "55" + ], + "hot_plate_temp_initial_layer": [ + "55" + ], + "nozzle_temperature": [ + "225" + ], + "nozzle_temperature_initial_layer": [ + "225" + ], + "slow_down_layer_time": [ + "4" + ], + "slow_down_min_speed": [ + "15" + ] +} diff --git a/resources/profiles/Eryone/filament/Eryone petg-Galaxy @Thinker X400 0.4 nozzle.json b/resources/profiles/Eryone/filament/Eryone petg-Galaxy @Thinker X400 0.4 nozzle.json new file mode 100644 index 0000000000..e0cbb34d8e --- /dev/null +++ b/resources/profiles/Eryone/filament/Eryone petg-Galaxy @Thinker X400 0.4 nozzle.json @@ -0,0 +1,60 @@ +{ + "type": "filament", + "name": "Eryone petg-Galaxy @Thinker X400 0.4 nozzle", + "inherits": "Eryone Standard PLA", + "from": "system", + "setting_id": "R4BPYs8aAc9DFf0n", + "filament_id": "OFWDDu8u", + "instantiation": "true", + "compatible_printers": [ + "Thinker X400 0.4 nozzle" + ], + "filament_settings_id": [ + "Eryone petg-Galaxy @Thinker X400 0.4 nozzle" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "fan_max_speed": [ + "50" + ], + "fan_min_speed": [ + "30" + ], + "filament_end_gcode": [ + "; filament end gcode \nSET_FAN_SPEED FAN=filter_fan SPEED=0" + ], + "filament_flow_ratio": [ + "0.96" + ], + "filament_max_volumetric_speed": [ + "21" + ], + "filament_start_gcode": [ + "; filament start gcode\nSET_FAN_SPEED FAN=filter_fan SPEED=1" + ], + "filament_type": [ + "PETG" + ], + "full_fan_speed_layer": [ + "2" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "nozzle_temperature": [ + "245" + ], + "nozzle_temperature_initial_layer": [ + "245" + ], + "slow_down_layer_time": [ + "4" + ], + "slow_down_min_speed": [ + "15" + ] +} diff --git a/resources/profiles/Eryone/filament/Eryone pla-Ultra Silk @Thinker X400 0.4 nozzle.json b/resources/profiles/Eryone/filament/Eryone pla-Ultra Silk @Thinker X400 0.4 nozzle.json new file mode 100644 index 0000000000..0801863e0e --- /dev/null +++ b/resources/profiles/Eryone/filament/Eryone pla-Ultra Silk @Thinker X400 0.4 nozzle.json @@ -0,0 +1,48 @@ +{ + "type": "filament", + "name": "Eryone pla-Ultra Silk @Thinker X400 0.4 nozzle", + "inherits": "Eryone Standard PLA", + "from": "system", + "setting_id": "jCbto64oaAKrDaN0", + "filament_id": "OF99Cc22", + "instantiation": "true", + "compatible_printers": [ + "Thinker X400 0.4 nozzle" + ], + "filament_settings_id": [ + "Eryone pla-Ultra Silk @Thinker X400 0.4 nozzle" + ], + "fan_min_speed": [ + "80" + ], + "filament_end_gcode": [ + "; filament end gcode \nSET_FAN_SPEED FAN=filter_fan SPEED=0" + ], + "filament_flow_ratio": [ + "0.97" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_start_gcode": [ + "; filament start gcode\nSET_FAN_SPEED FAN=filter_fan SPEED=1" + ], + "hot_plate_temp": [ + "55" + ], + "hot_plate_temp_initial_layer": [ + "55" + ], + "nozzle_temperature": [ + "230" + ], + "nozzle_temperature_initial_layer": [ + "230" + ], + "slow_down_layer_time": [ + "4" + ], + "slow_down_min_speed": [ + "15" + ] +} diff --git a/resources/profiles/Flashforge.json b/resources/profiles/Flashforge.json index 5bccaf9dfb..40e37cba03 100644 --- a/resources/profiles/Flashforge.json +++ b/resources/profiles/Flashforge.json @@ -1,7 +1,7 @@ { "name": "Flashforge", "url": "", - "version": "02.04.00.08", + "version": "02.04.00.10", "force_update": "0", "description": "Flashforge configurations", "machine_model_list": [ @@ -25,6 +25,10 @@ "name": "Flashforge Adventurer 5M Pro", "sub_path": "machine/Flashforge Adventurer 5M Pro.json" }, + { + "name": "Flashforge Adventurer A5", + "sub_path": "machine/Flashforge Adventurer A5.json" + }, { "name": "Flashforge Artemis", "sub_path": "machine/Flashforge Artemis.json" @@ -199,6 +203,10 @@ "name": "0.20mm Standard @FF AD5X", "sub_path": "process/0.20mm Standard @FF AD5X.json" }, + { + "name": "0.20mm Standard @FF Adventurer A5 0.4 nozzle", + "sub_path": "process/0.20mm Standard @FF Adventurer A5 0.4 nozzle.json" + }, { "name": "0.20mm Standard @FF C5", "sub_path": "process/0.20mm Standard @FF C5.json" @@ -311,6 +319,10 @@ "name": "0.30mm Standard @FF AD5X 0.6 nozzle", "sub_path": "process/0.30mm Standard @FF AD5X 0.6 nozzle.json" }, + { + "name": "0.30mm Standard @FF Adventurer A5 0.6 nozzle", + "sub_path": "process/0.30mm Standard @FF Adventurer A5 0.6 nozzle.json" + }, { "name": "0.40mm Standard @Flashforge AD5M Pro 0.8 Nozzle", "sub_path": "process/0.40mm Standard @Flashforge AD5M Pro 0.8 Nozzle.json" @@ -443,6 +455,10 @@ "name": "0.14mm Standard @Flashforge AD5M 0.25 Nozzle", "sub_path": "process/0.14mm Standard @Flashforge AD5M 0.25 Nozzle.json" }, + { + "name": "0.12mm Fine @FF Adventurer A5 0.4 nozzle", + "sub_path": "process/0.12mm Fine @FF Adventurer A5 0.4 nozzle.json" + }, { "name": "0.06mm Standard @Flashforge AD5M Pro 0.25 Nozzle", "sub_path": "process/0.06mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json" @@ -463,6 +479,10 @@ "name": "0.10mm Standard @Flashforge AD5M Pro 0.25 Nozzle", "sub_path": "process/0.10mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json" }, + { + "name": "0.12mm Standard @FF Adventurer A5 0.25 nozzle", + "sub_path": "process/0.12mm Standard @FF Adventurer A5 0.25 nozzle.json" + }, { "name": "0.12mm Standard @FF G4 0.25 nozzle", "sub_path": "process/0.12mm Standard @FF G4 0.25 nozzle.json" @@ -483,6 +503,10 @@ "name": "0.14mm Standard @Flashforge AD5M Pro 0.25 Nozzle", "sub_path": "process/0.14mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json" }, + { + "name": "0.24mm Draft @FF Adventurer A5 0.4 nozzle", + "sub_path": "process/0.24mm Draft @FF Adventurer A5 0.4 nozzle.json" + }, { "name": "0.24mm Fine @Flashforge AD5M 0.8 Nozzle", "sub_path": "process/0.24mm Fine @Flashforge AD5M 0.8 Nozzle.json" @@ -495,6 +519,10 @@ "name": "0.18mm Fine @FF AD5X 0.6 nozzle", "sub_path": "process/0.18mm Fine @FF AD5X 0.6 nozzle.json" }, + { + "name": "0.18mm Fine @FF Adventurer A5 0.6 nozzle", + "sub_path": "process/0.18mm Fine @FF Adventurer A5 0.6 nozzle.json" + }, { "name": "0.24mm Fine @Flashforge AD5M Pro 0.8 Nozzle", "sub_path": "process/0.24mm Fine @Flashforge AD5M Pro 0.8 Nozzle.json" @@ -503,6 +531,10 @@ "name": "0.40mm Standard @FF AD5X 0.8 nozzle", "sub_path": "process/0.40mm Standard @FF AD5X 0.8 nozzle.json" }, + { + "name": "0.40mm Standard @FF Adventurer A5 0.8 nozzle", + "sub_path": "process/0.40mm Standard @FF Adventurer A5 0.8 nozzle.json" + }, { "name": "0.56mm Draft @Flashforge AD5M Pro 0.8 Nozzle", "sub_path": "process/0.56mm Draft @Flashforge AD5M Pro 0.8 Nozzle.json" @@ -511,6 +543,10 @@ "name": "0.42mm Draft @FF AD5X 0.6 nozzle", "sub_path": "process/0.42mm Draft @FF AD5X 0.6 nozzle.json" }, + { + "name": "0.42mm Draft @FF Adventurer A5 0.6 nozzle", + "sub_path": "process/0.42mm Draft @FF Adventurer A5 0.6 nozzle.json" + }, { "name": "0.08mm Standard @FF C5 0.25 nozzle", "sub_path": "process/0.08mm Standard @FF C5 0.25 nozzle.json" @@ -527,13 +563,37 @@ "name": "0.14mm Standard @FF C5 0.25 nozzle", "sub_path": "process/0.14mm Standard @FF C5 0.25 nozzle.json" }, + { + "name": "0.06mm Standard @FF Adventurer A5 0.25 nozzle", + "sub_path": "process/0.06mm Standard @FF Adventurer A5 0.25 nozzle.json" + }, + { + "name": "0.08mm Standard @FF Adventurer A5 0.25 nozzle", + "sub_path": "process/0.08mm Standard @FF Adventurer A5 0.25 nozzle.json" + }, + { + "name": "0.10mm Standard @FF Adventurer A5 0.25 nozzle", + "sub_path": "process/0.10mm Standard @FF Adventurer A5 0.25 nozzle.json" + }, + { + "name": "0.14mm Standard @FF Adventurer A5 0.25 nozzle", + "sub_path": "process/0.14mm Standard @FF Adventurer A5 0.25 nozzle.json" + }, { "name": "0.24mm Fine @FF AD5X 0.8 nozzle", "sub_path": "process/0.24mm Fine @FF AD5X 0.8 nozzle.json" }, + { + "name": "0.24mm Fine @FF Adventurer A5 0.8 nozzle", + "sub_path": "process/0.24mm Fine @FF Adventurer A5 0.8 nozzle.json" + }, { "name": "0.56mm Draft @FF AD5X 0.8 nozzle", "sub_path": "process/0.56mm Draft @FF AD5X 0.8 nozzle.json" + }, + { + "name": "0.56mm Draft @FF Adventurer A5 0.8 nozzle", + "sub_path": "process/0.56mm Draft @FF Adventurer A5 0.8 nozzle.json" } ], "filament_list": [ @@ -661,6 +721,10 @@ "name": "Flashforge ABS Basic @FF AD5X 0.8 nozzle", "sub_path": "filament/Flashforge ABS Basic @FF AD5X 0.8 nozzle.json" }, + { + "name": "Flashforge ABS Basic @FF Adventurer A5", + "sub_path": "filament/Flashforge ABS Basic @FF Adventurer A5.json" + }, { "name": "Flashforge ABS Basic @FF G4", "sub_path": "filament/Flashforge ABS Basic @FF G4.json" @@ -741,6 +805,10 @@ "name": "Flashforge ASA Basic", "sub_path": "filament/Flashforge ASA Basic.json" }, + { + "name": "Flashforge ASA Basic @FF Adventurer A5", + "sub_path": "filament/Flashforge ASA Basic @FF Adventurer A5.json" + }, { "name": "Generic ASA @FF AD5M 0.25 Nozzle", "sub_path": "filament/Generic ASA @FF AD5M 0.25 Nozzle.json" @@ -769,6 +837,10 @@ "name": "Flashforge HS PETG @FF AD5X 0.8 nozzle", "sub_path": "filament/Flashforge HS PETG @FF AD5X 0.8 nozzle.json" }, + { + "name": "Flashforge HS PETG @FF Adventurer A5", + "sub_path": "filament/Flashforge HS PETG @FF Adventurer A5.json" + }, { "name": "Flashforge HS PETG @FF G4", "sub_path": "filament/Flashforge HS PETG @FF G4.json" @@ -801,6 +873,10 @@ "name": "Flashforge PETG Pro @FF AD5X 0.8 nozzle", "sub_path": "filament/Flashforge PETG Pro @FF AD5X 0.8 nozzle.json" }, + { + "name": "Flashforge PETG Pro @FF Adventurer A5", + "sub_path": "filament/Flashforge PETG Pro @FF Adventurer A5.json" + }, { "name": "Flashforge PETG Pro @FF G4", "sub_path": "filament/Flashforge PETG Pro @FF G4.json" @@ -825,6 +901,10 @@ "name": "Flashforge PETG Transparent @FF AD5X 0.8 nozzle", "sub_path": "filament/Flashforge PETG Transparent @FF AD5X 0.8 nozzle.json" }, + { + "name": "Flashforge PETG Transparent @FF Adventurer A5", + "sub_path": "filament/Flashforge PETG Transparent @FF Adventurer A5.json" + }, { "name": "Flashforge PETG Transparent @FF G4", "sub_path": "filament/Flashforge PETG Transparent @FF G4.json" @@ -925,6 +1005,10 @@ "name": "Flashforge PETG-CF @FF AD5X 0.8 nozzle", "sub_path": "filament/Flashforge PETG-CF @FF AD5X 0.8 nozzle.json" }, + { + "name": "Flashforge PETG-CF @FF Adventurer A5", + "sub_path": "filament/Flashforge PETG-CF @FF Adventurer A5.json" + }, { "name": "Generic PETG-CF10 @Flashforge AD4", "sub_path": "filament/Generic PETG-CF10 @Flashforge AD4.json" @@ -1069,6 +1153,14 @@ "name": "Flashforge HS PLA @FF AD5X 0.8 nozzle", "sub_path": "filament/Flashforge HS PLA @FF AD5X 0.8 nozzle.json" }, + { + "name": "Flashforge HS PLA @FF Adventurer A5", + "sub_path": "filament/Flashforge HS PLA @FF Adventurer A5.json" + }, + { + "name": "Flashforge HS PLA+ @FF Adventurer A5", + "sub_path": "filament/Flashforge HS PLA+ @FF Adventurer A5.json" + }, { "name": "Flashforge PLA @FF AD5M 0.25 Nozzle", "sub_path": "filament/Flashforge PLA @FF AD5M 0.25 Nozzle.json" @@ -1089,6 +1181,10 @@ "name": "Flashforge PLA Basic @FF AD5X 0.8 nozzle", "sub_path": "filament/Flashforge PLA Basic @FF AD5X 0.8 nozzle.json" }, + { + "name": "Flashforge PLA Basic @FF Adventurer A5", + "sub_path": "filament/Flashforge PLA Basic @FF Adventurer A5.json" + }, { "name": "Flashforge PLA Color Change", "sub_path": "filament/Flashforge PLA Color Change.json" @@ -1105,6 +1201,10 @@ "name": "Flashforge PLA Color Change @FF AD5X 0.8 nozzle", "sub_path": "filament/Flashforge PLA Color Change @FF AD5X 0.8 nozzle.json" }, + { + "name": "Flashforge PLA Color Change @FF Adventurer A5", + "sub_path": "filament/Flashforge PLA Color Change @FF Adventurer A5.json" + }, { "name": "Flashforge PLA Galaxy", "sub_path": "filament/Flashforge PLA Galaxy.json" @@ -1121,6 +1221,14 @@ "name": "Flashforge PLA Galaxy @FF AD5X 0.8 nozzle", "sub_path": "filament/Flashforge PLA Galaxy @FF AD5X 0.8 nozzle.json" }, + { + "name": "Flashforge PLA Galaxy @FF Adventurer A5", + "sub_path": "filament/Flashforge PLA Galaxy @FF Adventurer A5.json" + }, + { + "name": "Flashforge PLA LITE @FF Adventurer A5", + "sub_path": "filament/Flashforge PLA LITE @FF Adventurer A5.json" + }, { "name": "Flashforge PLA Luminous", "sub_path": "filament/Flashforge PLA Luminous.json" @@ -1137,6 +1245,10 @@ "name": "Flashforge PLA Luminous @FF AD5X 0.8 nozzle", "sub_path": "filament/Flashforge PLA Luminous @FF AD5X 0.8 nozzle.json" }, + { + "name": "Flashforge PLA Luminous @FF Adventurer A5", + "sub_path": "filament/Flashforge PLA Luminous @FF Adventurer A5.json" + }, { "name": "Flashforge PLA Matte", "sub_path": "filament/Flashforge PLA Matte.json" @@ -1153,6 +1265,10 @@ "name": "Flashforge PLA Matte @FF AD5X 0.8 nozzle", "sub_path": "filament/Flashforge PLA Matte @FF AD5X 0.8 nozzle.json" }, + { + "name": "Flashforge PLA Matte @FF Adventurer A5", + "sub_path": "filament/Flashforge PLA Matte @FF Adventurer A5.json" + }, { "name": "Flashforge PLA Metal", "sub_path": "filament/Flashforge PLA Metal.json" @@ -1169,6 +1285,10 @@ "name": "Flashforge PLA Metal @FF AD5X 0.8 nozzle", "sub_path": "filament/Flashforge PLA Metal @FF AD5X 0.8 nozzle.json" }, + { + "name": "Flashforge PLA Metal @FF Adventurer A5", + "sub_path": "filament/Flashforge PLA Metal @FF Adventurer A5.json" + }, { "name": "Flashforge PLA Pro", "sub_path": "filament/Flashforge PLA Pro.json" @@ -1185,6 +1305,10 @@ "name": "Flashforge PLA Pro @FF AD5X 0.8 nozzle", "sub_path": "filament/Flashforge PLA Pro @FF AD5X 0.8 nozzle.json" }, + { + "name": "Flashforge PLA Pro @FF Adventurer A5", + "sub_path": "filament/Flashforge PLA Pro @FF Adventurer A5.json" + }, { "name": "Flashforge PLA Sparkle", "sub_path": "filament/Flashforge PLA Sparkle.json" @@ -1201,6 +1325,14 @@ "name": "Flashforge PLA Sparkle @FF AD5X 0.8 nozzle", "sub_path": "filament/Flashforge PLA Sparkle @FF AD5X 0.8 nozzle.json" }, + { + "name": "Flashforge PLA Sparkle @FF Adventurer A5", + "sub_path": "filament/Flashforge PLA Sparkle @FF Adventurer A5.json" + }, + { + "name": "Flashforge R PLA @FF Adventurer A5", + "sub_path": "filament/Flashforge R PLA @FF Adventurer A5.json" + }, { "name": "Generic PLA @FF AD5M 0.25 Nozzle", "sub_path": "filament/Generic PLA @FF AD5M 0.25 Nozzle.json" @@ -1269,6 +1401,10 @@ "name": "Flashforge PLA-CF @FF AD5X 0.8 nozzle", "sub_path": "filament/Flashforge PLA-CF @FF AD5X 0.8 nozzle.json" }, + { + "name": "Flashforge PLA-CF @FF Adventurer A5", + "sub_path": "filament/Flashforge PLA-CF @FF Adventurer A5.json" + }, { "name": "Flashforge PPS @FF G4", "sub_path": "filament/Flashforge PPS @FF G4.json" @@ -1313,6 +1449,10 @@ "name": "Flashforge PLA Silk @FF AD5X 0.8 nozzle", "sub_path": "filament/Flashforge PLA Silk @FF AD5X 0.8 nozzle.json" }, + { + "name": "Flashforge PLA Silk @FF Adventurer A5", + "sub_path": "filament/Flashforge PLA Silk @FF Adventurer A5.json" + }, { "name": "Flashforge PLA-SILK @FF AD5M 0.25 Nozzle", "sub_path": "filament/Flashforge PLA-SILK @FF AD5M 0.25 Nozzle.json" @@ -1413,6 +1553,10 @@ "name": "Flashforge TPU 95A @FF AD5X 0.8 nozzle", "sub_path": "filament/Flashforge TPU 95A @FF AD5X 0.8 nozzle.json" }, + { + "name": "Flashforge TPU 95A @FF Adventurer A5", + "sub_path": "filament/Flashforge TPU 95A @FF Adventurer A5.json" + }, { "name": "Flashforge TPU 95A @FF G4", "sub_path": "filament/Flashforge TPU 95A @FF G4.json" @@ -1453,6 +1597,10 @@ "name": "Generic TPU @Flashforge AD4", "sub_path": "filament/Generic TPU @Flashforge AD4.json" }, + { + "name": "Kexcelled TPU 64D @FF Adventurer A5", + "sub_path": "filament/Kexcelled TPU 64D @FF Adventurer A5.json" + }, { "name": "Flashforge ABS Basic @FF AD5M 0.25 nozzle", "sub_path": "filament/Flashforge ABS Basic @FF AD5M 0.25 nozzle.json" @@ -1949,6 +2097,10 @@ "name": "Polymaker CoPA @FF G4P 0.8 HF nozzle", "sub_path": "filament/Polymaker CoPA @FF G4P 0.8 HF nozzle.json" }, + { + "name": "Generic PETG @FF Adventurer A5 0.25 nozzle", + "sub_path": "filament/Generic PETG @FF Adventurer A5 0.25 nozzle.json" + }, { "name": "Flashforge HS PETG @FF G4 0.6 HF nozzle", "sub_path": "filament/Flashforge HS PETG @FF G4 0.6 HF nozzle.json" @@ -2045,6 +2197,10 @@ "name": "Flashforge PETG-CF @FF G4P 0.6 nozzle", "sub_path": "filament/Flashforge PETG-CF @FF G4P 0.6 nozzle.json" }, + { + "name": "Flashforge HS PLA @FF Adventurer A5 0.25 nozzle", + "sub_path": "filament/Flashforge HS PLA @FF Adventurer A5 0.25 nozzle.json" + }, { "name": "Flashforge HS PLA @FF AD5X 0.25 nozzle", "sub_path": "filament/Flashforge HS PLA @FF AD5X 0.25 nozzle.json" @@ -2057,6 +2213,10 @@ "name": "Flashforge HS PLA @FF G4P 0.25 nozzle", "sub_path": "filament/Flashforge HS PLA @FF G4P 0.25 nozzle.json" }, + { + "name": "Flashforge HS PLA+ @FF Adventurer A5 0.25 nozzle", + "sub_path": "filament/Flashforge HS PLA+ @FF Adventurer A5 0.25 nozzle.json" + }, { "name": "Flashforge PLA Basic @FF AD5M 0.25 nozzle", "sub_path": "filament/Flashforge PLA Basic @FF AD5M 0.25 nozzle.json" @@ -2105,6 +2265,10 @@ "name": "Flashforge PLA Galaxy @FF G4P 0.25 nozzle", "sub_path": "filament/Flashforge PLA Galaxy @FF G4P 0.25 nozzle.json" }, + { + "name": "Flashforge PLA LITE @FF Adventurer A5 0.25 nozzle", + "sub_path": "filament/Flashforge PLA LITE @FF Adventurer A5 0.25 nozzle.json" + }, { "name": "Flashforge PLA Luminous @FF AD5M 0.25 nozzle", "sub_path": "filament/Flashforge PLA Luminous @FF AD5M 0.25 nozzle.json" @@ -2197,6 +2361,14 @@ "name": "Flashforge PLA Sparkle @FF G4P 0.25 nozzle", "sub_path": "filament/Flashforge PLA Sparkle @FF G4P 0.25 nozzle.json" }, + { + "name": "Flashforge R PLA @FF Adventurer A5 0.25 nozzle", + "sub_path": "filament/Flashforge R PLA @FF Adventurer A5 0.25 nozzle.json" + }, + { + "name": "Generic PLA @FF Adventurer A5 0.25 nozzle", + "sub_path": "filament/Generic PLA @FF Adventurer A5 0.25 nozzle.json" + }, { "name": "Flashforge HS PLA @FF G4 0.6 HF nozzle", "sub_path": "filament/Flashforge HS PLA @FF G4 0.6 HF nozzle.json" @@ -2497,6 +2669,66 @@ "name": "Flashforge PLA Silk @FF AD5M 0.25 nozzle", "sub_path": "filament/Flashforge PLA Silk @FF AD5M 0.25 nozzle.json" }, + { + "name": "Flashforge ABS Basic @FF Adventurer A5 0.25 nozzle", + "sub_path": "filament/Flashforge ABS Basic @FF Adventurer A5 0.25 nozzle.json" + }, + { + "name": "Flashforge ASA Basic @FF Adventurer A5 0.25 nozzle", + "sub_path": "filament/Flashforge ASA Basic @FF Adventurer A5 0.25 nozzle.json" + }, + { + "name": "Flashforge HS PETG @FF Adventurer A5 0.25 nozzle", + "sub_path": "filament/Flashforge HS PETG @FF Adventurer A5 0.25 nozzle.json" + }, + { + "name": "Flashforge PETG Basic @FF Adventurer A5 0.25 nozzle", + "sub_path": "filament/Flashforge PETG Basic @FF Adventurer A5 0.25 nozzle.json" + }, + { + "name": "Flashforge PETG Pro @FF Adventurer A5 0.25 nozzle", + "sub_path": "filament/Flashforge PETG Pro @FF Adventurer A5 0.25 nozzle.json" + }, + { + "name": "Flashforge PETG Transparent @FF Adventurer A5 0.25 nozzle", + "sub_path": "filament/Flashforge PETG Transparent @FF Adventurer A5 0.25 nozzle.json" + }, + { + "name": "Flashforge PLA Basic @FF Adventurer A5 0.25 nozzle", + "sub_path": "filament/Flashforge PLA Basic @FF Adventurer A5 0.25 nozzle.json" + }, + { + "name": "Flashforge PLA Color Change @FF Adventurer A5 0.25 nozzle", + "sub_path": "filament/Flashforge PLA Color Change @FF Adventurer A5 0.25 nozzle.json" + }, + { + "name": "Flashforge PLA Galaxy @FF Adventurer A5 0.25 nozzle", + "sub_path": "filament/Flashforge PLA Galaxy @FF Adventurer A5 0.25 nozzle.json" + }, + { + "name": "Flashforge PLA Luminous @FF Adventurer A5 0.25 nozzle", + "sub_path": "filament/Flashforge PLA Luminous @FF Adventurer A5 0.25 nozzle.json" + }, + { + "name": "Flashforge PLA Matte @FF Adventurer A5 0.25 nozzle", + "sub_path": "filament/Flashforge PLA Matte @FF Adventurer A5 0.25 nozzle.json" + }, + { + "name": "Flashforge PLA Metal @FF Adventurer A5 0.25 nozzle", + "sub_path": "filament/Flashforge PLA Metal @FF Adventurer A5 0.25 nozzle.json" + }, + { + "name": "Flashforge PLA Pro @FF Adventurer A5 0.25 nozzle", + "sub_path": "filament/Flashforge PLA Pro @FF Adventurer A5 0.25 nozzle.json" + }, + { + "name": "Flashforge PLA Sparkle @FF Adventurer A5 0.25 nozzle", + "sub_path": "filament/Flashforge PLA Sparkle @FF Adventurer A5 0.25 nozzle.json" + }, + { + "name": "Flashforge PLA Silk @FF Adventurer A5 0.25 nozzle", + "sub_path": "filament/Flashforge PLA Silk @FF Adventurer A5 0.25 nozzle.json" + }, { "name": "Flashforge ABS Basic @FF C5", "sub_path": "filament/Flashforge ABS Basic @FF C5.json" @@ -2907,6 +3139,10 @@ "name": "Flashforge AD5X 0.25 nozzle", "sub_path": "machine/FlashForge AD5X 0.25 nozzle.json" }, + { + "name": "Flashforge Adventurer A5 0.25 nozzle", + "sub_path": "machine/Flashforge Adventurer A5 0.25 nozzle.json" + }, { "name": "Flashforge Guider4 0.25 nozzle", "sub_path": "machine/Flashforge Guider4 0.25 nozzle.json" @@ -2919,6 +3155,10 @@ "name": "Flashforge AD5X 0.4 nozzle", "sub_path": "machine/Flashforge AD5X 0.4 nozzle.json" }, + { + "name": "Flashforge Adventurer A5 0.4 nozzle", + "sub_path": "machine/Flashforge Adventurer A5 0.4 nozzle.json" + }, { "name": "Flashforge Creator 5 0.25 nozzle", "sub_path": "machine/Flashforge Creator 5 0.25 nozzle.json" @@ -2963,10 +3203,18 @@ "name": "Flashforge AD5X 0.6 nozzle", "sub_path": "machine/Flashforge AD5X 0.6 nozzle.json" }, + { + "name": "Flashforge Adventurer A5 0.6 nozzle", + "sub_path": "machine/Flashforge Adventurer A5 0.6 nozzle.json" + }, { "name": "Flashforge AD5X 0.8 nozzle", "sub_path": "machine/Flashforge AD5X 0.8 nozzle.json" }, + { + "name": "Flashforge Adventurer A5 0.8 nozzle", + "sub_path": "machine/Flashforge Adventurer A5 0.8 nozzle.json" + }, { "name": "Flashforge Guider4 0.4 HF nozzle", "sub_path": "machine/Flashforge Guider4 0.4 HF nozzle.json" diff --git a/resources/profiles/Flashforge/Flashforge Adventurer A5_cover.png b/resources/profiles/Flashforge/Flashforge Adventurer A5_cover.png new file mode 100644 index 0000000000..70966ac685 Binary files /dev/null and b/resources/profiles/Flashforge/Flashforge Adventurer A5_cover.png differ diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF Adventurer A5 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF Adventurer A5 0.25 nozzle.json new file mode 100644 index 0000000000..08b228c11a --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF Adventurer A5 0.25 nozzle.json @@ -0,0 +1,44 @@ +{ + "type": "filament", + "name": "Flashforge ABS Basic @FF Adventurer A5 0.25 nozzle", + "inherits": "Flashforge ABS Basic @FF AD5M 0.25 nozzle", + "from": "system", + "setting_id": "jRIJ0cO4GhaMg2By", + "instantiation": "true", + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "105" + ], + "eng_plate_temp_initial_layer": [ + "105" + ], + "filament_settings_id": [ + "Flashforge ABS Basic @FF Adventurer A5 0.25 nozzle" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.25 nozzle" + ], + "supertack_plate_temp": [ + "0" + ], + "supertack_plate_temp_initial_layer": [ + "0" + ], + "textured_cool_plate_temp": [ + "0" + ], + "textured_cool_plate_temp_initial_layer": [ + "0" + ], + "textured_plate_temp": [ + "105" + ], + "textured_plate_temp_initial_layer": [ + "105" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF Adventurer A5.json new file mode 100644 index 0000000000..0ea70e0bf4 --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge ABS Basic @FF Adventurer A5.json @@ -0,0 +1,50 @@ +{ + "type": "filament", + "name": "Flashforge ABS Basic @FF Adventurer A5", + "inherits": "Generic ABS @Flashforge", + "from": "system", + "setting_id": "rDW4AwKc7SD7WIxN", + "filament_id": "OFibWuBd", + "filament_vendor": [ + "Flashforge" + ], + "instantiation": "true", + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "105" + ], + "eng_plate_temp_initial_layer": [ + "105" + ], + "filament_settings_id": [ + "Flashforge ABS Basic @FF Adventurer A5" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.4 nozzle", + "Flashforge Adventurer A5 0.6 nozzle", + "Flashforge Adventurer A5 0.8 nozzle" + ], + "supertack_plate_temp": [ + "0" + ], + "supertack_plate_temp_initial_layer": [ + "0" + ], + "textured_cool_plate_temp": [ + "0" + ], + "textured_cool_plate_temp_initial_layer": [ + "0" + ], + "textured_plate_temp": [ + "105" + ], + "textured_plate_temp_initial_layer": [ + "105" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF Adventurer A5 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF Adventurer A5 0.25 nozzle.json new file mode 100644 index 0000000000..7d65841413 --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF Adventurer A5 0.25 nozzle.json @@ -0,0 +1,44 @@ +{ + "type": "filament", + "name": "Flashforge ASA Basic @FF Adventurer A5 0.25 nozzle", + "inherits": "Flashforge ASA Basic @FF AD5M 0.25 nozzle", + "from": "system", + "setting_id": "OIUW8rw2VhNpeVpF", + "instantiation": "true", + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "105" + ], + "eng_plate_temp_initial_layer": [ + "105" + ], + "filament_settings_id": [ + "Flashforge ASA Basic @FF Adventurer A5 0.25 nozzle" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.25 nozzle" + ], + "supertack_plate_temp": [ + "0" + ], + "supertack_plate_temp_initial_layer": [ + "0" + ], + "textured_cool_plate_temp": [ + "0" + ], + "textured_cool_plate_temp_initial_layer": [ + "0" + ], + "textured_plate_temp": [ + "105" + ], + "textured_plate_temp_initial_layer": [ + "105" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF Adventurer A5.json new file mode 100644 index 0000000000..80943c015a --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge ASA Basic @FF Adventurer A5.json @@ -0,0 +1,50 @@ +{ + "type": "filament", + "name": "Flashforge ASA Basic @FF Adventurer A5", + "inherits": "Generic ASA @Flashforge", + "from": "system", + "setting_id": "FY9mcqOyuu1Gqq1m", + "filament_id": "OFFFg2Pf", + "filament_vendor": [ + "Flashforge" + ], + "instantiation": "true", + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "105" + ], + "eng_plate_temp_initial_layer": [ + "105" + ], + "filament_settings_id": [ + "Flashforge ASA Basic @FF Adventurer A5" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.4 nozzle", + "Flashforge Adventurer A5 0.6 nozzle", + "Flashforge Adventurer A5 0.8 nozzle" + ], + "supertack_plate_temp": [ + "0" + ], + "supertack_plate_temp_initial_layer": [ + "0" + ], + "textured_cool_plate_temp": [ + "0" + ], + "textured_cool_plate_temp_initial_layer": [ + "0" + ], + "textured_plate_temp": [ + "105" + ], + "textured_plate_temp_initial_layer": [ + "105" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF Adventurer A5 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF Adventurer A5 0.25 nozzle.json new file mode 100644 index 0000000000..609de4b870 --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF Adventurer A5 0.25 nozzle.json @@ -0,0 +1,44 @@ +{ + "type": "filament", + "name": "Flashforge HS PETG @FF Adventurer A5 0.25 nozzle", + "inherits": "Flashforge HS PETG @FF AD5M 0.25 nozzle", + "from": "system", + "setting_id": "UFal5gkMUJpoiOWP", + "instantiation": "true", + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "filament_settings_id": [ + "Flashforge HS PETG @FF Adventurer A5 0.25 nozzle" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.25 nozzle" + ], + "supertack_plate_temp": [ + "70" + ], + "supertack_plate_temp_initial_layer": [ + "70" + ], + "textured_cool_plate_temp": [ + "70" + ], + "textured_cool_plate_temp_initial_layer": [ + "70" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF Adventurer A5.json new file mode 100644 index 0000000000..5825f17141 --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge HS PETG @FF Adventurer A5.json @@ -0,0 +1,59 @@ +{ + "type": "filament", + "name": "Flashforge HS PETG @FF Adventurer A5", + "inherits": "Generic PETG @Flashforge", + "from": "system", + "setting_id": "ZpNEEHTtvhMJS8Kv", + "filament_id": "OFDxxTpW", + "filament_vendor": [ + "Flashforge" + ], + "instantiation": "true", + "close_fan_the_first_x_layers": [ + "2" + ], + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "21" + ], + "filament_settings_id": [ + "Flashforge HS PETG @FF Adventurer A5" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.4 nozzle", + "Flashforge Adventurer A5 0.6 nozzle", + "Flashforge Adventurer A5 0.8 nozzle" + ], + "supertack_plate_temp": [ + "70" + ], + "supertack_plate_temp_initial_layer": [ + "70" + ], + "textured_cool_plate_temp": [ + "70" + ], + "textured_cool_plate_temp_initial_layer": [ + "70" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF Adventurer A5 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF Adventurer A5 0.25 nozzle.json new file mode 100644 index 0000000000..797c72be19 --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF Adventurer A5 0.25 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "filament", + "name": "Flashforge HS PLA @FF Adventurer A5 0.25 nozzle", + "inherits": "Flashforge HS PLA @FF AD5M 0.25 nozzle", + "from": "system", + "setting_id": "Ewx6vNp0sDLDczPc", + "instantiation": "true", + "cool_plate_temp": [ + "40" + ], + "cool_plate_temp_initial_layer": [ + "40" + ], + "filament_settings_id": [ + "Flashforge HS PLA @FF Adventurer A5 0.25 nozzle" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.25 nozzle" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF Adventurer A5.json new file mode 100644 index 0000000000..9f34aa44af --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF Adventurer A5.json @@ -0,0 +1,47 @@ +{ + "type": "filament", + "name": "Flashforge HS PLA @FF Adventurer A5", + "inherits": "Generic PLA @Flashforge", + "from": "system", + "setting_id": "2L7FS5JeAyPb3y0s", + "filament_id": "OFIK2H3G", + "filament_vendor": [ + "Flashforge" + ], + "instantiation": "true", + "cool_plate_temp": [ + "45" + ], + "cool_plate_temp_initial_layer": [ + "45" + ], + "eng_plate_temp": [ + "55" + ], + "filament_max_volumetric_speed": [ + "22" + ], + "filament_settings_id": [ + "Flashforge HS PLA @FF Adventurer A5" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.4 nozzle", + "Flashforge Adventurer A5 0.6 nozzle", + "Flashforge Adventurer A5 0.8 nozzle" + ], + "hot_plate_temp": [ + "55" + ], + "pressure_advance": [ + "0.0325" + ], + "textured_cool_plate_temp": [ + "45" + ], + "textured_cool_plate_temp_initial_layer": [ + "45" + ], + "textured_plate_temp": [ + "55" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA+ @FF Adventurer A5 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA+ @FF Adventurer A5 0.25 nozzle.json new file mode 100644 index 0000000000..1d6ac25b9f --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA+ @FF Adventurer A5 0.25 nozzle.json @@ -0,0 +1,36 @@ +{ + "type": "filament", + "name": "Flashforge HS PLA+ @FF Adventurer A5 0.25 nozzle", + "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", + "from": "system", + "setting_id": "DeiDOP4VfKSyMtjw", + "filament_id": "OFXB8ZI7", + "instantiation": "true", + "cool_plate_temp": [ + "40" + ], + "cool_plate_temp_initial_layer": [ + "40" + ], + "eng_plate_temp_initial_layer": [ + "60" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_settings_id": [ + "Flashforge HS PLA+ @FF Adventurer A5 0.25 nozzle" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.25 nozzle" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA+ @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA+ @FF Adventurer A5.json new file mode 100644 index 0000000000..22c1c9870f --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA+ @FF Adventurer A5.json @@ -0,0 +1,50 @@ +{ + "type": "filament", + "name": "Flashforge HS PLA+ @FF Adventurer A5", + "inherits": "Generic PLA @Flashforge", + "from": "system", + "setting_id": "V4jIUQzxoZkK50mn", + "filament_id": "OFXB8ZI7", + "filament_vendor": [ + "Flashforge" + ], + "instantiation": "true", + "cool_plate_temp": [ + "45" + ], + "cool_plate_temp_initial_layer": [ + "45" + ], + "eng_plate_temp": [ + "55" + ], + "filament_flow_ratio": [ + "0.94" + ], + "filament_max_volumetric_speed": [ + "22" + ], + "filament_settings_id": [ + "Flashforge HS PLA+ @FF Adventurer A5" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.4 nozzle", + "Flashforge Adventurer A5 0.6 nozzle", + "Flashforge Adventurer A5 0.8 nozzle" + ], + "hot_plate_temp": [ + "55" + ], + "pressure_advance": [ + "0.0325" + ], + "textured_cool_plate_temp": [ + "45" + ], + "textured_cool_plate_temp_initial_layer": [ + "45" + ], + "textured_plate_temp": [ + "55" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Basic @FF Adventurer A5 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Basic @FF Adventurer A5 0.25 nozzle.json new file mode 100644 index 0000000000..ec9f63af46 --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Basic @FF Adventurer A5 0.25 nozzle.json @@ -0,0 +1,44 @@ +{ + "type": "filament", + "name": "Flashforge PETG Basic @FF Adventurer A5 0.25 nozzle", + "inherits": "Flashforge PETG Basic @FF AD5M 0.25 nozzle", + "from": "system", + "setting_id": "0sotIYsGkpQpcq6Y", + "instantiation": "true", + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "filament_settings_id": [ + "Flashforge PETG Basic @FF Adventurer A5 0.25 nozzle" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.25 nozzle" + ], + "supertack_plate_temp": [ + "70" + ], + "supertack_plate_temp_initial_layer": [ + "70" + ], + "textured_cool_plate_temp": [ + "70" + ], + "textured_cool_plate_temp_initial_layer": [ + "70" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF Adventurer A5 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF Adventurer A5 0.25 nozzle.json new file mode 100644 index 0000000000..7ebc60dc50 --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF Adventurer A5 0.25 nozzle.json @@ -0,0 +1,44 @@ +{ + "type": "filament", + "name": "Flashforge PETG Pro @FF Adventurer A5 0.25 nozzle", + "inherits": "Flashforge PETG Pro @FF AD5M 0.25 nozzle", + "from": "system", + "setting_id": "SZmG7gbmfOCGc8Fa", + "instantiation": "true", + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "filament_settings_id": [ + "Flashforge PETG Pro @FF Adventurer A5 0.25 nozzle" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.25 nozzle" + ], + "supertack_plate_temp": [ + "70" + ], + "supertack_plate_temp_initial_layer": [ + "70" + ], + "textured_cool_plate_temp": [ + "70" + ], + "textured_cool_plate_temp_initial_layer": [ + "70" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF Adventurer A5.json new file mode 100644 index 0000000000..b1a6a9f7e5 --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Pro @FF Adventurer A5.json @@ -0,0 +1,92 @@ +{ + "type": "filament", + "name": "Flashforge PETG Pro @FF Adventurer A5", + "inherits": "Generic PETG @Flashforge", + "from": "system", + "setting_id": "rPy6e6kaIt2tI34j", + "filament_id": "OFXiArjA", + "filament_vendor": [ + "Flashforge" + ], + "instantiation": "true", + "additional_cooling_fan_speed": [ + "60" + ], + "close_fan_the_first_x_layers": [ + "2" + ], + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "75" + ], + "eng_plate_temp_initial_layer": [ + "75" + ], + "fan_max_speed": [ + "50" + ], + "fan_min_speed": [ + "10" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "10" + ], + "filament_settings_id": [ + "Flashforge PETG Pro @FF Adventurer A5" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.4 nozzle", + "Flashforge Adventurer A5 0.6 nozzle", + "Flashforge Adventurer A5 0.8 nozzle" + ], + "hot_plate_temp": [ + "75" + ], + "hot_plate_temp_initial_layer": [ + "75" + ], + "nozzle_temperature": [ + "265" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "overhang_fan_speed": [ + "100" + ], + "slow_down_layer_time": [ + "12" + ], + "slow_down_min_speed": [ + "20" + ], + "supertack_plate_temp": [ + "75" + ], + "supertack_plate_temp_initial_layer": [ + "75" + ], + "support_material_interface_fan_speed": [ + "100" + ], + "textured_cool_plate_temp": [ + "75" + ], + "textured_cool_plate_temp_initial_layer": [ + "75" + ], + "textured_plate_temp": [ + "75" + ], + "textured_plate_temp_initial_layer": [ + "75" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF Adventurer A5 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF Adventurer A5 0.25 nozzle.json new file mode 100644 index 0000000000..1c116250c6 --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF Adventurer A5 0.25 nozzle.json @@ -0,0 +1,44 @@ +{ + "type": "filament", + "name": "Flashforge PETG Transparent @FF Adventurer A5 0.25 nozzle", + "inherits": "Flashforge PETG Transparent @FF AD5M 0.25 nozzle", + "from": "system", + "setting_id": "PJ1sXWRB5uQa7TAJ", + "instantiation": "true", + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "filament_settings_id": [ + "Flashforge PETG Transparent @FF Adventurer A5 0.25 nozzle" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.25 nozzle" + ], + "supertack_plate_temp": [ + "70" + ], + "supertack_plate_temp_initial_layer": [ + "70" + ], + "textured_cool_plate_temp": [ + "70" + ], + "textured_cool_plate_temp_initial_layer": [ + "70" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF Adventurer A5.json new file mode 100644 index 0000000000..15ccd1d0ac --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge PETG Transparent @FF Adventurer A5.json @@ -0,0 +1,92 @@ +{ + "type": "filament", + "name": "Flashforge PETG Transparent @FF Adventurer A5", + "inherits": "Generic PETG @Flashforge", + "from": "system", + "setting_id": "axOWrjnN5lofH9qM", + "filament_id": "OFwjMiKL", + "filament_vendor": [ + "Flashforge" + ], + "instantiation": "true", + "additional_cooling_fan_speed": [ + "60" + ], + "close_fan_the_first_x_layers": [ + "2" + ], + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "75" + ], + "eng_plate_temp_initial_layer": [ + "75" + ], + "fan_max_speed": [ + "50" + ], + "fan_min_speed": [ + "10" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "10" + ], + "filament_settings_id": [ + "Flashforge PETG Transparent @FF Adventurer A5" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.4 nozzle", + "Flashforge Adventurer A5 0.6 nozzle", + "Flashforge Adventurer A5 0.8 nozzle" + ], + "hot_plate_temp": [ + "75" + ], + "hot_plate_temp_initial_layer": [ + "75" + ], + "nozzle_temperature": [ + "265" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "overhang_fan_speed": [ + "100" + ], + "slow_down_layer_time": [ + "12" + ], + "slow_down_min_speed": [ + "20" + ], + "supertack_plate_temp": [ + "75" + ], + "supertack_plate_temp_initial_layer": [ + "75" + ], + "support_material_interface_fan_speed": [ + "100" + ], + "textured_cool_plate_temp": [ + "75" + ], + "textured_cool_plate_temp_initial_layer": [ + "75" + ], + "textured_plate_temp": [ + "75" + ], + "textured_plate_temp_initial_layer": [ + "75" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF Adventurer A5.json new file mode 100644 index 0000000000..c4001061f2 --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge PETG-CF @FF Adventurer A5.json @@ -0,0 +1,53 @@ +{ + "type": "filament", + "name": "Flashforge PETG-CF @FF Adventurer A5", + "inherits": "Generic PETG-CF10 @Flashforge", + "from": "system", + "setting_id": "aDSOS4PWssYHk8Fh", + "filament_id": "OFuFEtKX", + "filament_vendor": [ + "Flashforge" + ], + "instantiation": "true", + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_settings_id": [ + "Flashforge PETG-CF @FF Adventurer A5" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.4 nozzle", + "Flashforge Adventurer A5 0.6 nozzle", + "Flashforge Adventurer A5 0.8 nozzle" + ], + "supertack_plate_temp": [ + "70" + ], + "supertack_plate_temp_initial_layer": [ + "70" + ], + "textured_cool_plate_temp": [ + "70" + ], + "textured_cool_plate_temp_initial_layer": [ + "70" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF Adventurer A5 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF Adventurer A5 0.25 nozzle.json new file mode 100644 index 0000000000..f94dbbd8c4 --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF Adventurer A5 0.25 nozzle.json @@ -0,0 +1,32 @@ +{ + "type": "filament", + "name": "Flashforge PLA Basic @FF Adventurer A5 0.25 nozzle", + "inherits": "Flashforge PLA Basic @FF AD5M 0.25 nozzle", + "from": "system", + "setting_id": "e8JkrQPgHO1ekM7Q", + "instantiation": "true", + "cool_plate_temp": [ + "40" + ], + "cool_plate_temp_initial_layer": [ + "40" + ], + "eng_plate_temp_initial_layer": [ + "60" + ], + "filament_settings_id": [ + "Flashforge PLA Basic @FF Adventurer A5 0.25 nozzle" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.25 nozzle" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF Adventurer A5.json new file mode 100644 index 0000000000..6fdc1bdb17 --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Basic @FF Adventurer A5.json @@ -0,0 +1,47 @@ +{ + "type": "filament", + "name": "Flashforge PLA Basic @FF Adventurer A5", + "inherits": "Generic PLA @Flashforge", + "from": "system", + "setting_id": "HCpI817HAWckXBtk", + "filament_id": "OFJ3F2jm", + "filament_vendor": [ + "Flashforge" + ], + "instantiation": "true", + "cool_plate_temp": [ + "45" + ], + "cool_plate_temp_initial_layer": [ + "45" + ], + "eng_plate_temp": [ + "55" + ], + "filament_max_volumetric_speed": [ + "22" + ], + "filament_settings_id": [ + "Flashforge PLA Basic @FF Adventurer A5" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.4 nozzle", + "Flashforge Adventurer A5 0.6 nozzle", + "Flashforge Adventurer A5 0.8 nozzle" + ], + "hot_plate_temp": [ + "55" + ], + "pressure_advance": [ + "0.0325" + ], + "textured_cool_plate_temp": [ + "45" + ], + "textured_cool_plate_temp_initial_layer": [ + "45" + ], + "textured_plate_temp": [ + "55" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF Adventurer A5 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF Adventurer A5 0.25 nozzle.json new file mode 100644 index 0000000000..7cd3bae5bd --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF Adventurer A5 0.25 nozzle.json @@ -0,0 +1,32 @@ +{ + "type": "filament", + "name": "Flashforge PLA Color Change @FF Adventurer A5 0.25 nozzle", + "inherits": "Flashforge PLA Color Change @FF AD5M 0.25 nozzle", + "from": "system", + "setting_id": "8ifsgreK3DQhMfeh", + "instantiation": "true", + "cool_plate_temp": [ + "40" + ], + "cool_plate_temp_initial_layer": [ + "40" + ], + "eng_plate_temp_initial_layer": [ + "60" + ], + "filament_settings_id": [ + "Flashforge PLA Color Change @FF Adventurer A5 0.25 nozzle" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.25 nozzle" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF Adventurer A5.json new file mode 100644 index 0000000000..2eeb85526c --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Color Change @FF Adventurer A5.json @@ -0,0 +1,47 @@ +{ + "type": "filament", + "name": "Flashforge PLA Color Change @FF Adventurer A5", + "inherits": "Generic PLA @Flashforge", + "from": "system", + "setting_id": "o1Fl6t8nFCKZoj3Q", + "filament_id": "OFMkAW6r", + "filament_vendor": [ + "Flashforge" + ], + "instantiation": "true", + "cool_plate_temp": [ + "45" + ], + "cool_plate_temp_initial_layer": [ + "45" + ], + "eng_plate_temp": [ + "55" + ], + "filament_max_volumetric_speed": [ + "22" + ], + "filament_settings_id": [ + "Flashforge PLA Color Change @FF Adventurer A5" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.4 nozzle", + "Flashforge Adventurer A5 0.6 nozzle", + "Flashforge Adventurer A5 0.8 nozzle" + ], + "hot_plate_temp": [ + "55" + ], + "pressure_advance": [ + "0.035" + ], + "textured_cool_plate_temp": [ + "45" + ], + "textured_cool_plate_temp_initial_layer": [ + "45" + ], + "textured_plate_temp": [ + "55" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF Adventurer A5 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF Adventurer A5 0.25 nozzle.json new file mode 100644 index 0000000000..c75415adf9 --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF Adventurer A5 0.25 nozzle.json @@ -0,0 +1,32 @@ +{ + "type": "filament", + "name": "Flashforge PLA Galaxy @FF Adventurer A5 0.25 nozzle", + "inherits": "Flashforge PLA Galaxy @FF AD5M 0.25 nozzle", + "from": "system", + "setting_id": "WViVLfSsNolVB55w", + "instantiation": "true", + "cool_plate_temp": [ + "40" + ], + "cool_plate_temp_initial_layer": [ + "40" + ], + "eng_plate_temp_initial_layer": [ + "60" + ], + "filament_settings_id": [ + "Flashforge PLA Galaxy @FF Adventurer A5 0.25 nozzle" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.25 nozzle" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF Adventurer A5.json new file mode 100644 index 0000000000..a833b55331 --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Galaxy @FF Adventurer A5.json @@ -0,0 +1,47 @@ +{ + "type": "filament", + "name": "Flashforge PLA Galaxy @FF Adventurer A5", + "inherits": "Generic PLA @Flashforge", + "from": "system", + "setting_id": "4rpfTTgZrsVDwxI9", + "filament_id": "OFJJ0Ar3", + "filament_vendor": [ + "Flashforge" + ], + "instantiation": "true", + "cool_plate_temp": [ + "45" + ], + "cool_plate_temp_initial_layer": [ + "45" + ], + "eng_plate_temp": [ + "55" + ], + "filament_max_volumetric_speed": [ + "22" + ], + "filament_settings_id": [ + "Flashforge PLA Galaxy @FF Adventurer A5" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.4 nozzle", + "Flashforge Adventurer A5 0.6 nozzle", + "Flashforge Adventurer A5 0.8 nozzle" + ], + "hot_plate_temp": [ + "55" + ], + "pressure_advance": [ + "0.0325" + ], + "textured_cool_plate_temp": [ + "45" + ], + "textured_cool_plate_temp_initial_layer": [ + "45" + ], + "textured_plate_temp": [ + "55" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA LITE @FF Adventurer A5 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA LITE @FF Adventurer A5 0.25 nozzle.json new file mode 100644 index 0000000000..85f661e98f --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge PLA LITE @FF Adventurer A5 0.25 nozzle.json @@ -0,0 +1,36 @@ +{ + "type": "filament", + "name": "Flashforge PLA LITE @FF Adventurer A5 0.25 nozzle", + "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", + "from": "system", + "setting_id": "FpqRF3Gw0ftvpvay", + "filament_id": "OFDDdgHM", + "instantiation": "true", + "cool_plate_temp": [ + "40" + ], + "cool_plate_temp_initial_layer": [ + "40" + ], + "eng_plate_temp_initial_layer": [ + "60" + ], + "filament_flow_ratio": [ + "1.04" + ], + "filament_settings_id": [ + "Flashforge PLA LITE @FF Adventurer A5 0.25 nozzle" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.25 nozzle" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA LITE @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge PLA LITE @FF Adventurer A5.json new file mode 100644 index 0000000000..36e0a64d69 --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge PLA LITE @FF Adventurer A5.json @@ -0,0 +1,50 @@ +{ + "type": "filament", + "name": "Flashforge PLA LITE @FF Adventurer A5", + "inherits": "Generic PLA @Flashforge", + "from": "system", + "setting_id": "2QZaQyg66IJPbsSc", + "filament_id": "OFDDdgHM", + "filament_vendor": [ + "Flashforge" + ], + "instantiation": "true", + "cool_plate_temp": [ + "45" + ], + "cool_plate_temp_initial_layer": [ + "45" + ], + "eng_plate_temp": [ + "55" + ], + "filament_flow_ratio": [ + "1.02" + ], + "filament_max_volumetric_speed": [ + "22" + ], + "filament_settings_id": [ + "Flashforge PLA LITE @FF Adventurer A5" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.4 nozzle", + "Flashforge Adventurer A5 0.6 nozzle", + "Flashforge Adventurer A5 0.8 nozzle" + ], + "hot_plate_temp": [ + "55" + ], + "pressure_advance": [ + "0.0325" + ], + "textured_cool_plate_temp": [ + "45" + ], + "textured_cool_plate_temp_initial_layer": [ + "45" + ], + "textured_plate_temp": [ + "55" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF Adventurer A5 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF Adventurer A5 0.25 nozzle.json new file mode 100644 index 0000000000..53a0749e1d --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF Adventurer A5 0.25 nozzle.json @@ -0,0 +1,32 @@ +{ + "type": "filament", + "name": "Flashforge PLA Luminous @FF Adventurer A5 0.25 nozzle", + "inherits": "Flashforge PLA Luminous @FF AD5M 0.25 nozzle", + "from": "system", + "setting_id": "e3Yir3COUY9MyFdE", + "instantiation": "true", + "cool_plate_temp": [ + "40" + ], + "cool_plate_temp_initial_layer": [ + "40" + ], + "eng_plate_temp_initial_layer": [ + "60" + ], + "filament_settings_id": [ + "Flashforge PLA Luminous @FF Adventurer A5 0.25 nozzle" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.25 nozzle" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF Adventurer A5.json new file mode 100644 index 0000000000..0be02b85f5 --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Luminous @FF Adventurer A5.json @@ -0,0 +1,47 @@ +{ + "type": "filament", + "name": "Flashforge PLA Luminous @FF Adventurer A5", + "inherits": "Generic PLA @Flashforge", + "from": "system", + "setting_id": "GqNeJoH4M1IVAXrZ", + "filament_id": "OFdqkWtz", + "filament_vendor": [ + "Flashforge" + ], + "instantiation": "true", + "cool_plate_temp": [ + "45" + ], + "cool_plate_temp_initial_layer": [ + "45" + ], + "eng_plate_temp": [ + "55" + ], + "filament_max_volumetric_speed": [ + "22" + ], + "filament_settings_id": [ + "Flashforge PLA Luminous @FF Adventurer A5" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.4 nozzle", + "Flashforge Adventurer A5 0.6 nozzle", + "Flashforge Adventurer A5 0.8 nozzle" + ], + "hot_plate_temp": [ + "55" + ], + "pressure_advance": [ + "0.0325" + ], + "textured_cool_plate_temp": [ + "45" + ], + "textured_cool_plate_temp_initial_layer": [ + "45" + ], + "textured_plate_temp": [ + "55" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF Adventurer A5 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF Adventurer A5 0.25 nozzle.json new file mode 100644 index 0000000000..cc011b9336 --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF Adventurer A5 0.25 nozzle.json @@ -0,0 +1,32 @@ +{ + "type": "filament", + "name": "Flashforge PLA Matte @FF Adventurer A5 0.25 nozzle", + "inherits": "Flashforge PLA Matte @FF AD5M 0.25 nozzle", + "from": "system", + "setting_id": "o2Ttw4qaxOTgEWtp", + "instantiation": "true", + "cool_plate_temp": [ + "40" + ], + "cool_plate_temp_initial_layer": [ + "40" + ], + "eng_plate_temp_initial_layer": [ + "60" + ], + "filament_settings_id": [ + "Flashforge PLA Matte @FF Adventurer A5 0.25 nozzle" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.25 nozzle" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF Adventurer A5.json new file mode 100644 index 0000000000..33a2228f8d --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Matte @FF Adventurer A5.json @@ -0,0 +1,47 @@ +{ + "type": "filament", + "name": "Flashforge PLA Matte @FF Adventurer A5", + "inherits": "Generic PLA @Flashforge", + "from": "system", + "setting_id": "Jk7PRQkF2lFEtI8Q", + "filament_id": "OF6qAuyi", + "filament_vendor": [ + "Flashforge" + ], + "instantiation": "true", + "cool_plate_temp": [ + "45" + ], + "cool_plate_temp_initial_layer": [ + "45" + ], + "eng_plate_temp": [ + "55" + ], + "filament_max_volumetric_speed": [ + "22" + ], + "filament_settings_id": [ + "Flashforge PLA Matte @FF Adventurer A5" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.4 nozzle", + "Flashforge Adventurer A5 0.6 nozzle", + "Flashforge Adventurer A5 0.8 nozzle" + ], + "hot_plate_temp": [ + "55" + ], + "pressure_advance": [ + "0.0325" + ], + "textured_cool_plate_temp": [ + "45" + ], + "textured_cool_plate_temp_initial_layer": [ + "45" + ], + "textured_plate_temp": [ + "55" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF Adventurer A5 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF Adventurer A5 0.25 nozzle.json new file mode 100644 index 0000000000..92a8d1c8db --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF Adventurer A5 0.25 nozzle.json @@ -0,0 +1,32 @@ +{ + "type": "filament", + "name": "Flashforge PLA Metal @FF Adventurer A5 0.25 nozzle", + "inherits": "Flashforge PLA Metal @FF AD5M 0.25 nozzle", + "from": "system", + "setting_id": "eg4osx9bpk61uXvT", + "instantiation": "true", + "cool_plate_temp": [ + "40" + ], + "cool_plate_temp_initial_layer": [ + "40" + ], + "eng_plate_temp_initial_layer": [ + "60" + ], + "filament_settings_id": [ + "Flashforge PLA Metal @FF Adventurer A5 0.25 nozzle" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.25 nozzle" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF Adventurer A5.json new file mode 100644 index 0000000000..1ef06a756b --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Metal @FF Adventurer A5.json @@ -0,0 +1,47 @@ +{ + "type": "filament", + "name": "Flashforge PLA Metal @FF Adventurer A5", + "inherits": "Generic PLA @Flashforge", + "from": "system", + "setting_id": "Gs8hS5CpV3W62pjs", + "filament_id": "OFAebKg8", + "filament_vendor": [ + "Flashforge" + ], + "instantiation": "true", + "cool_plate_temp": [ + "45" + ], + "cool_plate_temp_initial_layer": [ + "45" + ], + "eng_plate_temp": [ + "55" + ], + "filament_max_volumetric_speed": [ + "22" + ], + "filament_settings_id": [ + "Flashforge PLA Metal @FF Adventurer A5" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.4 nozzle", + "Flashforge Adventurer A5 0.6 nozzle", + "Flashforge Adventurer A5 0.8 nozzle" + ], + "hot_plate_temp": [ + "55" + ], + "pressure_advance": [ + "0.0325" + ], + "textured_cool_plate_temp": [ + "45" + ], + "textured_cool_plate_temp_initial_layer": [ + "45" + ], + "textured_plate_temp": [ + "55" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF Adventurer A5 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF Adventurer A5 0.25 nozzle.json new file mode 100644 index 0000000000..15f7813b78 --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF Adventurer A5 0.25 nozzle.json @@ -0,0 +1,32 @@ +{ + "type": "filament", + "name": "Flashforge PLA Pro @FF Adventurer A5 0.25 nozzle", + "inherits": "Flashforge PLA Pro @FF AD5M 0.25 nozzle", + "from": "system", + "setting_id": "sD9IWFJxvKTDfpXm", + "instantiation": "true", + "cool_plate_temp": [ + "40" + ], + "cool_plate_temp_initial_layer": [ + "40" + ], + "eng_plate_temp_initial_layer": [ + "60" + ], + "filament_settings_id": [ + "Flashforge PLA Pro @FF Adventurer A5 0.25 nozzle" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.25 nozzle" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF Adventurer A5.json new file mode 100644 index 0000000000..416c8bf207 --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Pro @FF Adventurer A5.json @@ -0,0 +1,47 @@ +{ + "type": "filament", + "name": "Flashforge PLA Pro @FF Adventurer A5", + "inherits": "Generic PLA @Flashforge", + "from": "system", + "setting_id": "vTVCr1id0cTtMzuE", + "filament_id": "OFm4SivL", + "filament_vendor": [ + "Flashforge" + ], + "instantiation": "true", + "cool_plate_temp": [ + "45" + ], + "cool_plate_temp_initial_layer": [ + "45" + ], + "eng_plate_temp": [ + "55" + ], + "filament_max_volumetric_speed": [ + "22" + ], + "filament_settings_id": [ + "Flashforge PLA Pro @FF Adventurer A5" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.4 nozzle", + "Flashforge Adventurer A5 0.6 nozzle", + "Flashforge Adventurer A5 0.8 nozzle" + ], + "hot_plate_temp": [ + "55" + ], + "pressure_advance": [ + "0.0325" + ], + "textured_cool_plate_temp": [ + "45" + ], + "textured_cool_plate_temp_initial_layer": [ + "45" + ], + "textured_plate_temp": [ + "55" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF Adventurer A5 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF Adventurer A5 0.25 nozzle.json new file mode 100644 index 0000000000..0a63c055a3 --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF Adventurer A5 0.25 nozzle.json @@ -0,0 +1,35 @@ +{ + "type": "filament", + "name": "Flashforge PLA Silk @FF Adventurer A5 0.25 nozzle", + "inherits": "Flashforge PLA Silk @FF AD5M 0.25 nozzle", + "from": "system", + "setting_id": "ipe3qzXePPZ9pMmY", + "instantiation": "true", + "cool_plate_temp": [ + "40" + ], + "cool_plate_temp_initial_layer": [ + "40" + ], + "eng_plate_temp_initial_layer": [ + "60" + ], + "filament_settings_id": [ + "Flashforge PLA Silk @FF Adventurer A5 0.25 nozzle" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.25 nozzle" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature": [ + "220" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF Adventurer A5.json new file mode 100644 index 0000000000..e157b16c6d --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Silk @FF Adventurer A5.json @@ -0,0 +1,47 @@ +{ + "type": "filament", + "name": "Flashforge PLA Silk @FF Adventurer A5", + "inherits": "Generic PLA-Silk @Flashforge", + "from": "system", + "setting_id": "XXmeUWaLyVCTDS6G", + "filament_id": "OFgjgN35", + "filament_vendor": [ + "Flashforge" + ], + "instantiation": "true", + "cool_plate_temp": [ + "45" + ], + "cool_plate_temp_initial_layer": [ + "45" + ], + "eng_plate_temp": [ + "55" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_settings_id": [ + "Flashforge PLA Silk @FF Adventurer A5" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.4 nozzle", + "Flashforge Adventurer A5 0.6 nozzle", + "Flashforge Adventurer A5 0.8 nozzle" + ], + "hot_plate_temp": [ + "55" + ], + "pressure_advance": [ + "0.035" + ], + "textured_cool_plate_temp": [ + "45" + ], + "textured_cool_plate_temp_initial_layer": [ + "45" + ], + "textured_plate_temp": [ + "55" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF Adventurer A5 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF Adventurer A5 0.25 nozzle.json new file mode 100644 index 0000000000..ebf72e7fb1 --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF Adventurer A5 0.25 nozzle.json @@ -0,0 +1,32 @@ +{ + "type": "filament", + "name": "Flashforge PLA Sparkle @FF Adventurer A5 0.25 nozzle", + "inherits": "Flashforge PLA Sparkle @FF AD5M 0.25 nozzle", + "from": "system", + "setting_id": "VV75FchmjnPjnDE8", + "instantiation": "true", + "cool_plate_temp": [ + "40" + ], + "cool_plate_temp_initial_layer": [ + "40" + ], + "eng_plate_temp_initial_layer": [ + "60" + ], + "filament_settings_id": [ + "Flashforge PLA Sparkle @FF Adventurer A5 0.25 nozzle" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.25 nozzle" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF Adventurer A5.json new file mode 100644 index 0000000000..b7954c6677 --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge PLA Sparkle @FF Adventurer A5.json @@ -0,0 +1,47 @@ +{ + "type": "filament", + "name": "Flashforge PLA Sparkle @FF Adventurer A5", + "inherits": "Generic PLA @Flashforge", + "from": "system", + "setting_id": "dscnwSfbrGWiS4Um", + "filament_id": "OFV5c8hG", + "filament_vendor": [ + "Flashforge" + ], + "instantiation": "true", + "cool_plate_temp": [ + "45" + ], + "cool_plate_temp_initial_layer": [ + "45" + ], + "eng_plate_temp": [ + "55" + ], + "filament_max_volumetric_speed": [ + "22" + ], + "filament_settings_id": [ + "Flashforge PLA Sparkle @FF Adventurer A5" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.4 nozzle", + "Flashforge Adventurer A5 0.6 nozzle", + "Flashforge Adventurer A5 0.8 nozzle" + ], + "hot_plate_temp": [ + "55" + ], + "pressure_advance": [ + "0.0325" + ], + "textured_cool_plate_temp": [ + "45" + ], + "textured_cool_plate_temp_initial_layer": [ + "45" + ], + "textured_plate_temp": [ + "55" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF Adventurer A5.json new file mode 100644 index 0000000000..542045cdeb --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-CF @FF Adventurer A5.json @@ -0,0 +1,56 @@ +{ + "type": "filament", + "name": "Flashforge PLA-CF @FF Adventurer A5", + "inherits": "Generic PLA-CF10 @Flashforge", + "from": "system", + "setting_id": "EpC2ItdGUxFV7x1y", + "filament_id": "OF9cAwMK", + "filament_vendor": [ + "Flashforge" + ], + "instantiation": "true", + "cool_plate_temp": [ + "45" + ], + "cool_plate_temp_initial_layer": [ + "45" + ], + "eng_plate_temp": [ + "55" + ], + "eng_plate_temp_initial_layer": [ + "55" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_settings_id": [ + "Flashforge PLA-CF @FF Adventurer A5" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.4 nozzle", + "Flashforge Adventurer A5 0.6 nozzle", + "Flashforge Adventurer A5 0.8 nozzle" + ], + "hot_plate_temp": [ + "55" + ], + "pressure_advance": [ + "0.0325" + ], + "textured_cool_plate_temp": [ + "45" + ], + "textured_cool_plate_temp_initial_layer": [ + "45" + ], + "textured_plate_temp": [ + "55" + ], + "textured_plate_temp_initial_layer": [ + "55" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge R PLA @FF Adventurer A5 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Flashforge R PLA @FF Adventurer A5 0.25 nozzle.json new file mode 100644 index 0000000000..e898843db9 --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge R PLA @FF Adventurer A5 0.25 nozzle.json @@ -0,0 +1,33 @@ +{ + "type": "filament", + "name": "Flashforge R PLA @FF Adventurer A5 0.25 nozzle", + "inherits": "Flashforge PLA @FF AD5M 0.25 Nozzle", + "from": "system", + "setting_id": "G0qAKoO8Dyo0hO6G", + "filament_id": "OFT02Lz9", + "instantiation": "true", + "cool_plate_temp": [ + "40" + ], + "cool_plate_temp_initial_layer": [ + "40" + ], + "eng_plate_temp_initial_layer": [ + "60" + ], + "filament_settings_id": [ + "Flashforge R PLA @FF Adventurer A5 0.25 nozzle" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.25 nozzle" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge R PLA @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge R PLA @FF Adventurer A5.json new file mode 100644 index 0000000000..e5511d5622 --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge R PLA @FF Adventurer A5.json @@ -0,0 +1,50 @@ +{ + "type": "filament", + "name": "Flashforge R PLA @FF Adventurer A5", + "inherits": "Generic PLA @Flashforge", + "from": "system", + "setting_id": "sN7eGcbuGZxGrbR5", + "filament_id": "OFT02Lz9", + "filament_vendor": [ + "Flashforge" + ], + "instantiation": "true", + "cool_plate_temp": [ + "45" + ], + "cool_plate_temp_initial_layer": [ + "45" + ], + "eng_plate_temp": [ + "55" + ], + "filament_max_volumetric_speed": [ + "22" + ], + "filament_settings_id": [ + "Flashforge R PLA @FF Adventurer A5" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.4 nozzle", + "Flashforge Adventurer A5 0.6 nozzle", + "Flashforge Adventurer A5 0.8 nozzle" + ], + "hot_plate_temp": [ + "55" + ], + "pressure_advance": [ + "0.0325" + ], + "slow_down_layer_time": [ + "8" + ], + "textured_cool_plate_temp": [ + "45" + ], + "textured_cool_plate_temp_initial_layer": [ + "45" + ], + "textured_plate_temp": [ + "55" + ] +} diff --git a/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF Adventurer A5.json new file mode 100644 index 0000000000..19b0981798 --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge TPU 95A @FF Adventurer A5.json @@ -0,0 +1,38 @@ +{ + "type": "filament", + "name": "Flashforge TPU 95A @FF Adventurer A5", + "inherits": "Generic TPU @Flashforge", + "from": "system", + "setting_id": "2MT9C2rvvQ3uU1lG", + "filament_id": "OFSqIcJC", + "filament_vendor": [ + "Flashforge" + ], + "instantiation": "true", + "cool_plate_temp": [ + "40" + ], + "cool_plate_temp_initial_layer": [ + "40" + ], + "eng_plate_temp": [ + "45" + ], + "eng_plate_temp_initial_layer": [ + "45" + ], + "filament_settings_id": [ + "Flashforge TPU 95A @FF Adventurer A5" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.4 nozzle", + "Flashforge Adventurer A5 0.6 nozzle", + "Flashforge Adventurer A5 0.8 nozzle" + ], + "textured_plate_temp": [ + "45" + ], + "textured_plate_temp_initial_layer": [ + "45" + ] +} diff --git a/resources/profiles/Flashforge/filament/Generic PETG @FF Adventurer A5 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Generic PETG @FF Adventurer A5 0.25 nozzle.json new file mode 100644 index 0000000000..764b31e9c4 --- /dev/null +++ b/resources/profiles/Flashforge/filament/Generic PETG @FF Adventurer A5 0.25 nozzle.json @@ -0,0 +1,17 @@ +{ + "type": "filament", + "name": "Generic PETG @FF Adventurer A5 0.25 nozzle", + "inherits": "Generic PETG @FF AD5M 0.25 Nozzle", + "from": "system", + "setting_id": "KSKX6BHNQgmOEShO", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "1.2" + ], + "filament_settings_id": [ + "Generic PETG @FF Adventurer A5 0.25 nozzle" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.25 nozzle" + ] +} diff --git a/resources/profiles/Flashforge/filament/Generic PLA @FF Adventurer A5 0.25 nozzle.json b/resources/profiles/Flashforge/filament/Generic PLA @FF Adventurer A5 0.25 nozzle.json new file mode 100644 index 0000000000..416e42006f --- /dev/null +++ b/resources/profiles/Flashforge/filament/Generic PLA @FF Adventurer A5 0.25 nozzle.json @@ -0,0 +1,35 @@ +{ + "type": "filament", + "name": "Generic PLA @FF Adventurer A5 0.25 nozzle", + "inherits": "Generic PLA @FF AD5M 0.25 Nozzle", + "from": "system", + "setting_id": "kHdLzX8Auwz9tFvw", + "instantiation": "true", + "cool_plate_temp": [ + "40" + ], + "cool_plate_temp_initial_layer": [ + "40" + ], + "eng_plate_temp_initial_layer": [ + "60" + ], + "filament_max_volumetric_speed": [ + "2.2" + ], + "filament_settings_id": [ + "Generic PLA @FF Adventurer A5 0.25 nozzle" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.25 nozzle" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Flashforge/filament/Kexcelled TPU 64D @FF Adventurer A5.json b/resources/profiles/Flashforge/filament/Kexcelled TPU 64D @FF Adventurer A5.json new file mode 100644 index 0000000000..285af63564 --- /dev/null +++ b/resources/profiles/Flashforge/filament/Kexcelled TPU 64D @FF Adventurer A5.json @@ -0,0 +1,38 @@ +{ + "type": "filament", + "name": "Kexcelled TPU 64D @FF Adventurer A5", + "inherits": "Generic TPU @Flashforge", + "from": "system", + "setting_id": "OB4I8nwZn8sCcCcF", + "filament_id": "OF20zavY", + "filament_vendor": [ + "Kexcelled" + ], + "instantiation": "true", + "cool_plate_temp": [ + "40" + ], + "cool_plate_temp_initial_layer": [ + "40" + ], + "eng_plate_temp": [ + "45" + ], + "eng_plate_temp_initial_layer": [ + "45" + ], + "filament_settings_id": [ + "Kexcelled TPU 64D @FF Adventurer A5" + ], + "compatible_printers": [ + "Flashforge Adventurer A5 0.4 nozzle", + "Flashforge Adventurer A5 0.6 nozzle", + "Flashforge Adventurer A5 0.8 nozzle" + ], + "textured_plate_temp": [ + "45" + ], + "textured_plate_temp_initial_layer": [ + "45" + ] +} diff --git a/resources/profiles/Flashforge/flashforge_c5_buildplate_model.stl b/resources/profiles/Flashforge/flashforge_c5_buildplate_model.stl index b535cc4e98..af24406f2d 100644 Binary files a/resources/profiles/Flashforge/flashforge_c5_buildplate_model.stl and b/resources/profiles/Flashforge/flashforge_c5_buildplate_model.stl differ diff --git a/resources/profiles/Flashforge/flashforge_c5_buildplate_texture.png b/resources/profiles/Flashforge/flashforge_c5_buildplate_texture.png deleted file mode 100644 index a5af30d0c5..0000000000 Binary files a/resources/profiles/Flashforge/flashforge_c5_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/Flashforge/flashforge_c5_buildplate_texture.svg b/resources/profiles/Flashforge/flashforge_c5_buildplate_texture.svg new file mode 100644 index 0000000000..55fb96abfa --- /dev/null +++ b/resources/profiles/Flashforge/flashforge_c5_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer A5 0.25 nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer A5 0.25 nozzle.json new file mode 100644 index 0000000000..d9665ff0bb --- /dev/null +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer A5 0.25 nozzle.json @@ -0,0 +1,233 @@ +{ + "type": "machine", + "name": "Flashforge Adventurer A5 0.25 nozzle", + "inherits": "Flashforge Adventurer 5M Pro 0.25 Nozzle", + "from": "system", + "setting_id": "TZyRxvTiJNKNJWCD", + "instantiation": "true", + "adaptive_bed_mesh_margin": "0", + "auxiliary_fan": "1", + "bbl_use_printhost": "0", + "bed_custom_model": "", + "bed_custom_texture": "", + "bed_exclude_area": [ + "0x0" + ], + "bed_mesh_max": "99999,99999", + "bed_mesh_min": "-99999,-99999", + "bed_mesh_probe_distance": "50,50", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]", + "best_object_pos": "0.5,0.5", + "change_extrusion_role_gcode": "", + "change_filament_gcode": "", + "cooling_tube_length": "0", + "cooling_tube_retraction": "0", + "default_filament_profile": [ + "Generic PLA @Flashforge" + ], + "default_print_profile": "0.12mm Standard @FF Adventurer A5 0.25 nozzle", + "deretraction_speed": [ + "35" + ], + "disable_m73": "0", + "emit_machine_limits_to_gcode": "1", + "enable_filament_ramming": "0", + "enable_long_retraction_when_cut": "0", + "extra_loading_move": "0", + "extruder_clearance_height_to_lid": "150", + "extruder_clearance_height_to_rod": "27", + "extruder_clearance_radius": "76", + "extruder_colour": [ + "#FCE94F" + ], + "extruder_offset": [ + "0x0" + ], + "fan_kickstart": "0", + "fan_speedup_overhangs": "1", + "fan_speedup_time": "0", + "gcode_flavor": "klipper", + "head_wrap_detect_zone": [], + "high_current_on_filament_swap": "0", + "host_type": "octoprint", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "long_retractions_when_cut": [ + "0" + ], + "machine_end_gcode": "G1 E-3 F3600\nG0 X50 Y50 F30000\nM104 S0 ; turn off temperature", + "machine_load_filament_time": "0", + "machine_max_acceleration_e": [ + "5000", + "5000" + ], + "machine_max_acceleration_extruding": [ + "20000", + "20000" + ], + "machine_max_acceleration_retracting": [ + "5000", + "5000" + ], + "machine_max_acceleration_travel": [ + "20000", + "20000" + ], + "machine_max_acceleration_x": [ + "20000", + "20000" + ], + "machine_max_acceleration_y": [ + "20000", + "20000" + ], + "machine_max_acceleration_z": [ + "500", + "500" + ], + "machine_max_jerk_e": [ + "2.5", + "2.5" + ], + "machine_max_jerk_x": [ + "9", + "9" + ], + "machine_max_jerk_y": [ + "9", + "9" + ], + "machine_max_jerk_z": [ + "3", + "3" + ], + "machine_max_speed_e": [ + "30", + "30" + ], + "machine_max_speed_x": [ + "600", + "600" + ], + "machine_max_speed_y": [ + "600", + "600" + ], + "machine_max_speed_z": [ + "20", + "20" + ], + "machine_min_extruding_rate": [ + "0", + "0" + ], + "machine_min_travel_rate": [ + "0", + "0" + ], + "machine_pause_gcode": "PAUSE", + "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG1 Z5 F6000\nG90 E0\nM83\nG1 E-1 F600\nG1 E8 F300\nG1 X85 Y110 Z0.2 F1200\nG1 X-110 E15 F2400\nG1 Y0 E4 F2400\nG1 X-109.6 F2400\nG1 Y110 E5 F2400\nG92 E0", + "machine_tool_change_time": "0", + "machine_unload_filament_time": "0", + "manual_filament_change": "0", + "max_layer_height": [ + "0.14" + ], + "min_layer_height": [ + "0.08" + ], + "nozzle_diameter": [ + "0.25" + ], + "nozzle_height": "2.5", + "nozzle_hrc": "0", + "nozzle_type": "stainless_steel", + "nozzle_volume": "0", + "parking_pos_retraction": "0", + "pellet_modded_printer": "0", + "preferred_orientation": "0", + "printable_area": [ + "-110x-110", + "110x-110", + "110x110", + "-110x110" + ], + "printable_height": "220", + "printer_model": "Flashforge Adventurer A5", + "printer_notes": "", + "printer_settings_id": "Flashforge Adventurer A5 0.25 nozzle", + "printer_structure": "undefine", + "printer_technology": "FFF", + "printer_variant": "0.25", + "printhost_authorization_type": "key", + "printhost_ssl_ignore_revoke": "0", + "printing_by_object_gcode": "", + "purge_in_prime_tower": "1", + "retract_before_wipe": [ + "100%" + ], + "retract_length_toolchange": [ + "2" + ], + "retract_lift_above": [ + "0" + ], + "retract_lift_below": [ + "0" + ], + "retract_lift_enforce": [ + "All Surfaces" + ], + "retract_on_top_layer": [ + "1" + ], + "retract_restart_extra": [ + "0" + ], + "retract_restart_extra_toolchange": [ + "0" + ], + "retract_when_changing_layer": [ + "1" + ], + "retraction_distances_when_cut": [ + "18" + ], + "retraction_length": [ + "1" + ], + "retraction_minimum_travel": [ + "1" + ], + "retraction_speed": [ + "35" + ], + "scan_first_layer": "0", + "single_extruder_multi_material": "0", + "support_air_filtration": "1", + "support_chamber_temp_control": "1", + "support_multi_bed_types": "1", + "template_custom_gcode": "", + "thumbnails": "140x110/PNG", + "thumbnails_format": "PNG", + "time_cost": "0", + "time_lapse_gcode": "", + "travel_slope": [ + "3" + ], + "upward_compatible_machine": [], + "use_firmware_retraction": "0", + "use_relative_e_distances": "1", + "wipe": [ + "1" + ], + "wipe_distance": [ + "2" + ], + "z_hop": [ + "0.3" + ], + "z_hop_types": [ + "Auto Lift" + ], + "z_offset": "0" +} diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer A5 0.4 nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer A5 0.4 nozzle.json new file mode 100644 index 0000000000..04de9fb9ec --- /dev/null +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer A5 0.4 nozzle.json @@ -0,0 +1,233 @@ +{ + "type": "machine", + "name": "Flashforge Adventurer A5 0.4 nozzle", + "inherits": "Flashforge Adventurer 5M Pro 0.4 Nozzle", + "from": "system", + "setting_id": "EOhWyVbRzFtAc33v", + "instantiation": "true", + "adaptive_bed_mesh_margin": "0", + "auxiliary_fan": "1", + "bbl_use_printhost": "0", + "bed_custom_model": "", + "bed_custom_texture": "", + "bed_exclude_area": [ + "0x0" + ], + "bed_mesh_max": "99999,99999", + "bed_mesh_min": "-99999,-99999", + "bed_mesh_probe_distance": "50,50", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]", + "best_object_pos": "0.5,0.5", + "change_extrusion_role_gcode": "", + "change_filament_gcode": "", + "cooling_tube_length": "0", + "cooling_tube_retraction": "0", + "default_filament_profile": [ + "Generic PLA @Flashforge" + ], + "default_print_profile": "0.20mm Standard @FF Adventurer A5 0.4 nozzle", + "deretraction_speed": [ + "35" + ], + "disable_m73": "0", + "emit_machine_limits_to_gcode": "1", + "enable_filament_ramming": "0", + "enable_long_retraction_when_cut": "0", + "extra_loading_move": "0", + "extruder_clearance_height_to_lid": "150", + "extruder_clearance_height_to_rod": "27", + "extruder_clearance_radius": "76", + "extruder_colour": [ + "#FCE94F" + ], + "extruder_offset": [ + "0x0" + ], + "fan_kickstart": "0", + "fan_speedup_overhangs": "1", + "fan_speedup_time": "0", + "gcode_flavor": "klipper", + "head_wrap_detect_zone": [], + "high_current_on_filament_swap": "0", + "host_type": "octoprint", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "long_retractions_when_cut": [ + "0" + ], + "machine_end_gcode": "G1 E-3 F3600\nG0 X50 Y50 F30000\nM104 S0 ; turn off temperature", + "machine_load_filament_time": "0", + "machine_max_acceleration_e": [ + "5000", + "5000" + ], + "machine_max_acceleration_extruding": [ + "20000", + "20000" + ], + "machine_max_acceleration_retracting": [ + "5000", + "5000" + ], + "machine_max_acceleration_travel": [ + "20000", + "20000" + ], + "machine_max_acceleration_x": [ + "20000", + "20000" + ], + "machine_max_acceleration_y": [ + "20000", + "20000" + ], + "machine_max_acceleration_z": [ + "500", + "500" + ], + "machine_max_jerk_e": [ + "2.5", + "2.5" + ], + "machine_max_jerk_x": [ + "9", + "9" + ], + "machine_max_jerk_y": [ + "9", + "9" + ], + "machine_max_jerk_z": [ + "3", + "3" + ], + "machine_max_speed_e": [ + "30", + "30" + ], + "machine_max_speed_x": [ + "600", + "600" + ], + "machine_max_speed_y": [ + "600", + "600" + ], + "machine_max_speed_z": [ + "20", + "20" + ], + "machine_min_extruding_rate": [ + "0", + "0" + ], + "machine_min_travel_rate": [ + "0", + "0" + ], + "machine_pause_gcode": "PAUSE", + "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_tool_change_time": "0", + "machine_unload_filament_time": "0", + "manual_filament_change": "0", + "max_layer_height": [ + "0.28" + ], + "min_layer_height": [ + "0.08" + ], + "nozzle_diameter": [ + "0.4" + ], + "nozzle_height": "2.5", + "nozzle_hrc": "0", + "nozzle_type": "hardened_steel", + "nozzle_volume": "0", + "parking_pos_retraction": "0", + "pellet_modded_printer": "0", + "preferred_orientation": "0", + "printable_area": [ + "-110x-110", + "110x-110", + "110x110", + "-110x110" + ], + "printable_height": "220", + "printer_model": "Flashforge Adventurer A5", + "printer_notes": "", + "printer_settings_id": "Flashforge Adventurer A5 0.4 nozzle", + "printer_structure": "undefine", + "printer_technology": "FFF", + "printer_variant": "0.4", + "printhost_authorization_type": "key", + "printhost_ssl_ignore_revoke": "0", + "printing_by_object_gcode": "", + "purge_in_prime_tower": "1", + "retract_before_wipe": [ + "100%" + ], + "retract_length_toolchange": [ + "2" + ], + "retract_lift_above": [ + "0" + ], + "retract_lift_below": [ + "0" + ], + "retract_lift_enforce": [ + "All Surfaces" + ], + "retract_on_top_layer": [ + "1" + ], + "retract_restart_extra": [ + "0" + ], + "retract_restart_extra_toolchange": [ + "0" + ], + "retract_when_changing_layer": [ + "1" + ], + "retraction_distances_when_cut": [ + "18" + ], + "retraction_length": [ + "0.8" + ], + "retraction_minimum_travel": [ + "1" + ], + "retraction_speed": [ + "35" + ], + "scan_first_layer": "0", + "single_extruder_multi_material": "0", + "support_air_filtration": "1", + "support_chamber_temp_control": "1", + "support_multi_bed_types": "1", + "template_custom_gcode": "", + "thumbnails": "140x110/PNG", + "thumbnails_format": "PNG", + "time_cost": "0", + "time_lapse_gcode": "", + "travel_slope": [ + "3" + ], + "upward_compatible_machine": [], + "use_firmware_retraction": "0", + "use_relative_e_distances": "1", + "wipe": [ + "1" + ], + "wipe_distance": [ + "2" + ], + "z_hop": [ + "0.4" + ], + "z_hop_types": [ + "Auto Lift" + ], + "z_offset": "0" +} diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer A5 0.6 nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer A5 0.6 nozzle.json new file mode 100644 index 0000000000..0ac8ffe783 --- /dev/null +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer A5 0.6 nozzle.json @@ -0,0 +1,233 @@ +{ + "type": "machine", + "name": "Flashforge Adventurer A5 0.6 nozzle", + "inherits": "Flashforge Adventurer 5M Pro 0.6 Nozzle", + "from": "system", + "setting_id": "gu3ZxlImr6zK3yb6", + "instantiation": "true", + "adaptive_bed_mesh_margin": "0", + "auxiliary_fan": "1", + "bbl_use_printhost": "0", + "bed_custom_model": "", + "bed_custom_texture": "", + "bed_exclude_area": [ + "0x0" + ], + "bed_mesh_max": "99999,99999", + "bed_mesh_min": "-99999,-99999", + "bed_mesh_probe_distance": "50,50", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]", + "best_object_pos": "0.5,0.5", + "change_extrusion_role_gcode": "", + "change_filament_gcode": "", + "cooling_tube_length": "0", + "cooling_tube_retraction": "0", + "default_filament_profile": [ + "Generic PLA @Flashforge" + ], + "default_print_profile": "0.30mm Standard @FF Adventurer A5 0.6 nozzle", + "deretraction_speed": [ + "35" + ], + "disable_m73": "0", + "emit_machine_limits_to_gcode": "1", + "enable_filament_ramming": "0", + "enable_long_retraction_when_cut": "0", + "extra_loading_move": "0", + "extruder_clearance_height_to_lid": "150", + "extruder_clearance_height_to_rod": "27", + "extruder_clearance_radius": "76", + "extruder_colour": [ + "#FCE94F" + ], + "extruder_offset": [ + "0x0" + ], + "fan_kickstart": "0", + "fan_speedup_overhangs": "1", + "fan_speedup_time": "0", + "gcode_flavor": "klipper", + "head_wrap_detect_zone": [], + "high_current_on_filament_swap": "0", + "host_type": "octoprint", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "long_retractions_when_cut": [ + "0" + ], + "machine_end_gcode": "G1 E-3 F3600\nG0 X50 Y50 F30000\nM104 S0 ; turn off temperature", + "machine_load_filament_time": "0", + "machine_max_acceleration_e": [ + "5000", + "5000" + ], + "machine_max_acceleration_extruding": [ + "20000", + "20000" + ], + "machine_max_acceleration_retracting": [ + "5000", + "5000" + ], + "machine_max_acceleration_travel": [ + "20000", + "20000" + ], + "machine_max_acceleration_x": [ + "20000", + "20000" + ], + "machine_max_acceleration_y": [ + "20000", + "20000" + ], + "machine_max_acceleration_z": [ + "500", + "500" + ], + "machine_max_jerk_e": [ + "2.5", + "2.5" + ], + "machine_max_jerk_x": [ + "9", + "9" + ], + "machine_max_jerk_y": [ + "9", + "9" + ], + "machine_max_jerk_z": [ + "3", + "3" + ], + "machine_max_speed_e": [ + "30", + "30" + ], + "machine_max_speed_x": [ + "600", + "600" + ], + "machine_max_speed_y": [ + "600", + "600" + ], + "machine_max_speed_z": [ + "20", + "20" + ], + "machine_min_extruding_rate": [ + "0", + "0" + ], + "machine_min_travel_rate": [ + "0", + "0" + ], + "machine_pause_gcode": "PAUSE", + "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_tool_change_time": "0", + "machine_unload_filament_time": "0", + "manual_filament_change": "0", + "max_layer_height": [ + "0.42" + ], + "min_layer_height": [ + "0.15" + ], + "nozzle_diameter": [ + "0.6" + ], + "nozzle_height": "2.5", + "nozzle_hrc": "0", + "nozzle_type": "hardened_steel", + "nozzle_volume": "0", + "parking_pos_retraction": "0", + "pellet_modded_printer": "0", + "preferred_orientation": "0", + "printable_area": [ + "-110x-110", + "110x-110", + "110x110", + "-110x110" + ], + "printable_height": "220", + "printer_model": "Flashforge Adventurer A5", + "printer_notes": "", + "printer_settings_id": "Flashforge Adventurer A5 0.6 nozzle", + "printer_structure": "undefine", + "printer_technology": "FFF", + "printer_variant": "0.6", + "printhost_authorization_type": "key", + "printhost_ssl_ignore_revoke": "0", + "printing_by_object_gcode": "", + "purge_in_prime_tower": "1", + "retract_before_wipe": [ + "100%" + ], + "retract_length_toolchange": [ + "2" + ], + "retract_lift_above": [ + "0" + ], + "retract_lift_below": [ + "0" + ], + "retract_lift_enforce": [ + "All Surfaces" + ], + "retract_on_top_layer": [ + "1" + ], + "retract_restart_extra": [ + "0" + ], + "retract_restart_extra_toolchange": [ + "0" + ], + "retract_when_changing_layer": [ + "1" + ], + "retraction_distances_when_cut": [ + "18" + ], + "retraction_length": [ + "1.2" + ], + "retraction_minimum_travel": [ + "1" + ], + "retraction_speed": [ + "35" + ], + "scan_first_layer": "0", + "single_extruder_multi_material": "0", + "support_air_filtration": "1", + "support_chamber_temp_control": "1", + "support_multi_bed_types": "1", + "template_custom_gcode": "", + "thumbnails": "140x110/PNG", + "thumbnails_format": "PNG", + "time_cost": "0", + "time_lapse_gcode": "", + "travel_slope": [ + "3" + ], + "upward_compatible_machine": [], + "use_firmware_retraction": "0", + "use_relative_e_distances": "1", + "wipe": [ + "1" + ], + "wipe_distance": [ + "2" + ], + "z_hop": [ + "0.4" + ], + "z_hop_types": [ + "Auto Lift" + ], + "z_offset": "0" +} diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer A5 0.8 nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer A5 0.8 nozzle.json new file mode 100644 index 0000000000..e982ec00a9 --- /dev/null +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer A5 0.8 nozzle.json @@ -0,0 +1,233 @@ +{ + "type": "machine", + "name": "Flashforge Adventurer A5 0.8 nozzle", + "inherits": "Flashforge Adventurer 5M Pro 0.8 Nozzle", + "from": "system", + "setting_id": "tKE8SP6KOhIupWbU", + "instantiation": "true", + "adaptive_bed_mesh_margin": "0", + "auxiliary_fan": "1", + "bbl_use_printhost": "0", + "bed_custom_model": "", + "bed_custom_texture": "", + "bed_exclude_area": [ + "0x0" + ], + "bed_mesh_max": "99999,99999", + "bed_mesh_min": "-99999,-99999", + "bed_mesh_probe_distance": "50,50", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]", + "best_object_pos": "0.5,0.5", + "change_extrusion_role_gcode": "", + "change_filament_gcode": "", + "cooling_tube_length": "0", + "cooling_tube_retraction": "0", + "default_filament_profile": [ + "Generic PLA @Flashforge" + ], + "default_print_profile": "0.40mm Standard @FF Adventurer A5 0.8 nozzle", + "deretraction_speed": [ + "35" + ], + "disable_m73": "0", + "emit_machine_limits_to_gcode": "1", + "enable_filament_ramming": "0", + "enable_long_retraction_when_cut": "0", + "extra_loading_move": "0", + "extruder_clearance_height_to_lid": "150", + "extruder_clearance_height_to_rod": "27", + "extruder_clearance_radius": "76", + "extruder_colour": [ + "#FCE94F" + ], + "extruder_offset": [ + "0x0" + ], + "fan_kickstart": "0", + "fan_speedup_overhangs": "1", + "fan_speedup_time": "0", + "gcode_flavor": "klipper", + "head_wrap_detect_zone": [], + "high_current_on_filament_swap": "0", + "host_type": "octoprint", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "long_retractions_when_cut": [ + "0" + ], + "machine_end_gcode": "G1 E-3 F3600\nG0 X50 Y50 F30000\nM104 S0 ; turn off temperature", + "machine_load_filament_time": "0", + "machine_max_acceleration_e": [ + "5000", + "5000" + ], + "machine_max_acceleration_extruding": [ + "20000", + "20000" + ], + "machine_max_acceleration_retracting": [ + "5000", + "5000" + ], + "machine_max_acceleration_travel": [ + "20000", + "20000" + ], + "machine_max_acceleration_x": [ + "20000", + "20000" + ], + "machine_max_acceleration_y": [ + "20000", + "20000" + ], + "machine_max_acceleration_z": [ + "500", + "500" + ], + "machine_max_jerk_e": [ + "2.5", + "2.5" + ], + "machine_max_jerk_x": [ + "9", + "9" + ], + "machine_max_jerk_y": [ + "9", + "9" + ], + "machine_max_jerk_z": [ + "3", + "3" + ], + "machine_max_speed_e": [ + "30", + "30" + ], + "machine_max_speed_x": [ + "600", + "600" + ], + "machine_max_speed_y": [ + "600", + "600" + ], + "machine_max_speed_z": [ + "20", + "20" + ], + "machine_min_extruding_rate": [ + "0", + "0" + ], + "machine_min_travel_rate": [ + "0", + "0" + ], + "machine_pause_gcode": "PAUSE", + "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG1 Z5 F6000\nG1 E-1.5 F600\nG1 E12 F800\nG1 X85 Y110 Z0.3 F1200\nG1 X-110 E30 F2400\nG1 Y0 E8 F2400\nG1 X-109.6 F2400\nG1 Y110 E10 F2400\nG92 E0", + "machine_tool_change_time": "0", + "machine_unload_filament_time": "0", + "manual_filament_change": "0", + "max_layer_height": [ + "0.56" + ], + "min_layer_height": [ + "0.24" + ], + "nozzle_diameter": [ + "0.8" + ], + "nozzle_height": "2.5", + "nozzle_hrc": "0", + "nozzle_type": "hardened_steel", + "nozzle_volume": "0", + "parking_pos_retraction": "0", + "pellet_modded_printer": "0", + "preferred_orientation": "0", + "printable_area": [ + "-110x-110", + "110x-110", + "110x110", + "-110x110" + ], + "printable_height": "220", + "printer_model": "Flashforge Adventurer A5", + "printer_notes": "", + "printer_settings_id": "Flashforge Adventurer A5 0.8 nozzle", + "printer_structure": "undefine", + "printer_technology": "FFF", + "printer_variant": "0.8", + "printhost_authorization_type": "key", + "printhost_ssl_ignore_revoke": "0", + "printing_by_object_gcode": "", + "purge_in_prime_tower": "1", + "retract_before_wipe": [ + "100%" + ], + "retract_length_toolchange": [ + "2" + ], + "retract_lift_above": [ + "0" + ], + "retract_lift_below": [ + "0" + ], + "retract_lift_enforce": [ + "All Surfaces" + ], + "retract_on_top_layer": [ + "1" + ], + "retract_restart_extra": [ + "0" + ], + "retract_restart_extra_toolchange": [ + "0" + ], + "retract_when_changing_layer": [ + "1" + ], + "retraction_distances_when_cut": [ + "18" + ], + "retraction_length": [ + "1.5" + ], + "retraction_minimum_travel": [ + "1" + ], + "retraction_speed": [ + "35" + ], + "scan_first_layer": "0", + "single_extruder_multi_material": "0", + "support_air_filtration": "1", + "support_chamber_temp_control": "1", + "support_multi_bed_types": "1", + "template_custom_gcode": "", + "thumbnails": "140x110/PNG", + "thumbnails_format": "PNG", + "time_cost": "0", + "time_lapse_gcode": "", + "travel_slope": [ + "3" + ], + "upward_compatible_machine": [], + "use_firmware_retraction": "0", + "use_relative_e_distances": "1", + "wipe": [ + "1" + ], + "wipe_distance": [ + "2" + ], + "z_hop": [ + "0" + ], + "z_hop_types": [ + "Auto Lift" + ], + "z_offset": "0" +} diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer A5.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer A5.json new file mode 100644 index 0000000000..8b7c579ca4 --- /dev/null +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer A5.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "Flashforge Adventurer A5", + "model_id": "Flashforge-Adventurer-A5", + "nozzle_diameter": "0.25;0.4;0.6;0.8", + "machine_tech": "FFF", + "family": "Flashforge", + "bed_model": "flashforge_adventurer5m_series_buildplate_model.STL", + "bed_texture": "flashforge_adventurer5m_buildplate_texture.svg", + "hotend_model": "flashforge_adventurer_5m_series_hotend.STL", + "default_materials": "Generic ABS @Flashforge;Generic PETG @Flashforge;Generic PLA @Flashforge;Flashforge PLA Basic @FF Adventurer A5;Generic PLA @FF Adventurer A5 0.25 nozzle" +} diff --git a/resources/profiles/Flashforge/machine/Flashforge Creator 5 Pro.json b/resources/profiles/Flashforge/machine/Flashforge Creator 5 Pro.json index c33735a4bb..329aec09d9 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Creator 5 Pro.json +++ b/resources/profiles/Flashforge/machine/Flashforge Creator 5 Pro.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Flashforge", "bed_model": "flashforge_c5_buildplate_model.stl", - "bed_texture": "flashforge_c5_buildplate_texture.png", + "bed_texture": "flashforge_c5_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic PLA @System;Generic PLA @FF C5P" } diff --git a/resources/profiles/Flashforge/machine/Flashforge Creator 5.json b/resources/profiles/Flashforge/machine/Flashforge Creator 5.json index 358cd4aaee..8512bdab4a 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Creator 5.json +++ b/resources/profiles/Flashforge/machine/Flashforge Creator 5.json @@ -6,7 +6,7 @@ "machine_tech": "FFF", "family": "Flashforge", "bed_model": "flashforge_c5_buildplate_model.stl", - "bed_texture": "flashforge_c5_buildplate_texture.png", + "bed_texture": "flashforge_c5_buildplate_texture.svg", "hotend_model": "", "default_materials": "Generic PLA @System;Generic PLA @FF C5" } diff --git a/resources/profiles/Flashforge/process/0.06mm Standard @FF Adventurer A5 0.25 nozzle.json b/resources/profiles/Flashforge/process/0.06mm Standard @FF Adventurer A5 0.25 nozzle.json new file mode 100644 index 0000000000..62a2cbd3d1 --- /dev/null +++ b/resources/profiles/Flashforge/process/0.06mm Standard @FF Adventurer A5 0.25 nozzle.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.06mm Standard @FF Adventurer A5 0.25 nozzle", + "inherits": "0.06mm Standard @Flashforge AD5M Pro 0.25 Nozzle", + "from": "system", + "setting_id": "426xS3MFF3smfdDE", + "instantiation": "true", + "elefant_foot_compensation": "0.15", + "enable_arc_fitting": "1", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", + "compatible_printers": [ + "Flashforge Adventurer A5 0.25 nozzle" + ], + "infill_wall_overlap": "15%", + "only_one_wall_top": "1", + "print_settings_id": "0.06mm Standard @FF Adventurer A5 0.25 nozzle", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "slowdown_for_curled_perimeters": "0", + "small_perimeter_speed": "25", + "sparse_infill_pattern": "grid", + "wipe_speed": "200" +} diff --git a/resources/profiles/Flashforge/process/0.08mm Standard @FF Adventurer A5 0.25 nozzle.json b/resources/profiles/Flashforge/process/0.08mm Standard @FF Adventurer A5 0.25 nozzle.json new file mode 100644 index 0000000000..21c8dd069b --- /dev/null +++ b/resources/profiles/Flashforge/process/0.08mm Standard @FF Adventurer A5 0.25 nozzle.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.08mm Standard @FF Adventurer A5 0.25 nozzle", + "inherits": "0.08mm Standard @Flashforge AD5M Pro 0.25 Nozzle", + "from": "system", + "setting_id": "2N8NG8IpxxCPXZlq", + "instantiation": "true", + "elefant_foot_compensation": "0.15", + "enable_arc_fitting": "1", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", + "compatible_printers": [ + "Flashforge Adventurer A5 0.25 nozzle" + ], + "infill_wall_overlap": "15%", + "only_one_wall_top": "1", + "print_settings_id": "0.08mm Standard @FF Adventurer A5 0.25 nozzle", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "slowdown_for_curled_perimeters": "0", + "small_perimeter_speed": "25", + "sparse_infill_pattern": "grid", + "wipe_speed": "200" +} diff --git a/resources/profiles/Flashforge/process/0.10mm Standard @FF Adventurer A5 0.25 nozzle.json b/resources/profiles/Flashforge/process/0.10mm Standard @FF Adventurer A5 0.25 nozzle.json new file mode 100644 index 0000000000..a53d6c235f --- /dev/null +++ b/resources/profiles/Flashforge/process/0.10mm Standard @FF Adventurer A5 0.25 nozzle.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.10mm Standard @FF Adventurer A5 0.25 nozzle", + "inherits": "0.10mm Standard @Flashforge AD5M Pro 0.25 Nozzle", + "from": "system", + "setting_id": "H74U0yaiNgyQpdbc", + "instantiation": "true", + "elefant_foot_compensation": "0.15", + "enable_arc_fitting": "1", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", + "compatible_printers": [ + "Flashforge Adventurer A5 0.25 nozzle" + ], + "infill_wall_overlap": "15%", + "only_one_wall_top": "1", + "print_settings_id": "0.10mm Standard @FF Adventurer A5 0.25 nozzle", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "slowdown_for_curled_perimeters": "0", + "small_perimeter_speed": "25", + "sparse_infill_pattern": "grid", + "wipe_speed": "200" +} diff --git a/resources/profiles/Flashforge/process/0.12mm Fine @FF Adventurer A5 0.4 nozzle.json b/resources/profiles/Flashforge/process/0.12mm Fine @FF Adventurer A5 0.4 nozzle.json new file mode 100644 index 0000000000..58b5bc5c5d --- /dev/null +++ b/resources/profiles/Flashforge/process/0.12mm Fine @FF Adventurer A5 0.4 nozzle.json @@ -0,0 +1,24 @@ +{ + "type": "process", + "name": "0.12mm Fine @FF Adventurer A5 0.4 nozzle", + "inherits": "0.12mm Fine @Flashforge AD5M Pro 0.4 Nozzle", + "from": "system", + "setting_id": "G5AhxHk95GfXw6ec", + "instantiation": "true", + "bridge_flow": "1", + "enable_arc_fitting": "1", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", + "compatible_printers": [ + "Flashforge Adventurer A5 0.4 nozzle" + ], + "infill_wall_overlap": "15%", + "initial_layer_print_height": "0.2", + "only_one_wall_top": "1", + "print_settings_id": "0.12mm Fine @FF Adventurer A5 0.4 nozzle", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "slowdown_for_curled_perimeters": "0", + "small_perimeter_speed": "25", + "sparse_infill_pattern": "grid", + "support_line_width": "0.42" +} diff --git a/resources/profiles/Flashforge/process/0.12mm Standard @FF Adventurer A5 0.25 nozzle.json b/resources/profiles/Flashforge/process/0.12mm Standard @FF Adventurer A5 0.25 nozzle.json new file mode 100644 index 0000000000..ddd5449889 --- /dev/null +++ b/resources/profiles/Flashforge/process/0.12mm Standard @FF Adventurer A5 0.25 nozzle.json @@ -0,0 +1,17 @@ +{ + "type": "process", + "name": "0.12mm Standard @FF Adventurer A5 0.25 nozzle", + "inherits": "0.12mm Standard @Flashforge AD5M Pro 0.25 Nozzle", + "from": "system", + "setting_id": "x28lWqpQxkirzYXm", + "instantiation": "true", + "enable_arc_fitting": "1", + "compatible_printers": [ + "Flashforge Adventurer A5 0.25 nozzle" + ], + "infill_wall_overlap": "15%", + "only_one_wall_top": "1", + "slowdown_for_curled_perimeters": "0", + "print_settings_id": "0.12mm Standard @FF Adventurer A5 0.25 nozzle", + "sparse_infill_pattern": "grid" +} diff --git a/resources/profiles/Flashforge/process/0.14mm Standard @FF Adventurer A5 0.25 nozzle.json b/resources/profiles/Flashforge/process/0.14mm Standard @FF Adventurer A5 0.25 nozzle.json new file mode 100644 index 0000000000..09cf76fb60 --- /dev/null +++ b/resources/profiles/Flashforge/process/0.14mm Standard @FF Adventurer A5 0.25 nozzle.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.14mm Standard @FF Adventurer A5 0.25 nozzle", + "inherits": "0.14mm Standard @Flashforge AD5M Pro 0.25 Nozzle", + "from": "system", + "setting_id": "Xx4fcIZ3esI4IXbl", + "instantiation": "true", + "elefant_foot_compensation": "0.15", + "enable_arc_fitting": "1", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", + "compatible_printers": [ + "Flashforge Adventurer A5 0.25 nozzle" + ], + "infill_wall_overlap": "15%", + "only_one_wall_top": "1", + "print_settings_id": "0.14mm Standard @FF Adventurer A5 0.25 nozzle", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "slowdown_for_curled_perimeters": "0", + "small_perimeter_speed": "25", + "sparse_infill_pattern": "grid", + "wipe_speed": "200" +} diff --git a/resources/profiles/Flashforge/process/0.18mm Fine @FF Adventurer A5 0.6 nozzle.json b/resources/profiles/Flashforge/process/0.18mm Fine @FF Adventurer A5 0.6 nozzle.json new file mode 100644 index 0000000000..6213e93574 --- /dev/null +++ b/resources/profiles/Flashforge/process/0.18mm Fine @FF Adventurer A5 0.6 nozzle.json @@ -0,0 +1,24 @@ +{ + "type": "process", + "name": "0.18mm Fine @FF Adventurer A5 0.6 nozzle", + "inherits": "0.18mm Fine @Flashforge AD5M Pro 0.6 Nozzle", + "from": "system", + "setting_id": "USICCgjHQ4aHkqMM", + "instantiation": "true", + "enable_arc_fitting": "1", + "enable_support": "1", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", + "compatible_printers": [ + "Flashforge Adventurer A5 0.6 nozzle" + ], + "infill_wall_overlap": "15%", + "initial_layer_print_height": "0.25", + "only_one_wall_top": "1", + "print_settings_id": "0.18mm Fine @FF Adventurer A5 0.6 nozzle", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "slowdown_for_curled_perimeters": "0", + "small_perimeter_speed": "25", + "support_bottom_z_distance": "0.2", + "support_top_z_distance": "0.2" +} diff --git a/resources/profiles/Flashforge/process/0.20mm Standard @FF Adventurer A5 0.4 nozzle.json b/resources/profiles/Flashforge/process/0.20mm Standard @FF Adventurer A5 0.4 nozzle.json new file mode 100644 index 0000000000..4f1e8cba7c --- /dev/null +++ b/resources/profiles/Flashforge/process/0.20mm Standard @FF Adventurer A5 0.4 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "process", + "name": "0.20mm Standard @FF Adventurer A5 0.4 nozzle", + "inherits": "0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle", + "from": "system", + "setting_id": "ZrWC7sW8I5eH0nI0", + "instantiation": "true", + "enable_arc_fitting": "1", + "compatible_printers": [ + "Flashforge Adventurer A5 0.4 nozzle" + ], + "infill_wall_overlap": "15%", + "only_one_wall_top": "1", + "print_settings_id": "0.20mm Standard @FF Adventurer A5 0.4 nozzle", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "slowdown_for_curled_perimeters": "0", + "small_perimeter_speed": "25", + "support_bottom_z_distance": "0.2", + "support_top_z_distance": "0.2" +} diff --git a/resources/profiles/Flashforge/process/0.24mm Draft @FF Adventurer A5 0.4 nozzle.json b/resources/profiles/Flashforge/process/0.24mm Draft @FF Adventurer A5 0.4 nozzle.json new file mode 100644 index 0000000000..7cbac2a836 --- /dev/null +++ b/resources/profiles/Flashforge/process/0.24mm Draft @FF Adventurer A5 0.4 nozzle.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.24mm Draft @FF Adventurer A5 0.4 nozzle", + "inherits": "0.24mm Draft @Flashforge AD5M Pro 0.4 Nozzle", + "from": "system", + "setting_id": "nniAHPVQxmVlEZqp", + "instantiation": "true", + "enable_arc_fitting": "1", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", + "compatible_printers": [ + "Flashforge Adventurer A5 0.4 nozzle" + ], + "infill_wall_overlap": "15%", + "initial_layer_print_height": "0.25", + "only_one_wall_top": "1", + "print_settings_id": "0.24mm Draft @FF Adventurer A5 0.4 nozzle", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "slowdown_for_curled_perimeters": "0", + "small_perimeter_speed": "25", + "support_bottom_z_distance": "0.2", + "support_top_z_distance": "0.2" +} diff --git a/resources/profiles/Flashforge/process/0.24mm Fine @FF Adventurer A5 0.8 nozzle.json b/resources/profiles/Flashforge/process/0.24mm Fine @FF Adventurer A5 0.8 nozzle.json new file mode 100644 index 0000000000..8ff452ef10 --- /dev/null +++ b/resources/profiles/Flashforge/process/0.24mm Fine @FF Adventurer A5 0.8 nozzle.json @@ -0,0 +1,19 @@ +{ + "type": "process", + "name": "0.24mm Fine @FF Adventurer A5 0.8 nozzle", + "inherits": "0.24mm Fine @Flashforge AD5M Pro 0.8 Nozzle", + "from": "system", + "setting_id": "INfUgOlQBMZLYrfu", + "instantiation": "true", + "bridge_flow": "1", + "enable_arc_fitting": "1", + "compatible_printers": [ + "Flashforge Adventurer A5 0.8 nozzle" + ], + "infill_wall_overlap": "15%", + "initial_layer_print_height": "0.3", + "only_one_wall_top": "1", + "print_settings_id": "0.24mm Fine @FF Adventurer A5 0.8 nozzle", + "slowdown_for_curled_perimeters": "0", + "sparse_infill_pattern": "grid" +} diff --git a/resources/profiles/Flashforge/process/0.30mm Standard @FF Adventurer A5 0.6 nozzle.json b/resources/profiles/Flashforge/process/0.30mm Standard @FF Adventurer A5 0.6 nozzle.json new file mode 100644 index 0000000000..d8376dad80 --- /dev/null +++ b/resources/profiles/Flashforge/process/0.30mm Standard @FF Adventurer A5 0.6 nozzle.json @@ -0,0 +1,22 @@ +{ + "type": "process", + "name": "0.30mm Standard @FF Adventurer A5 0.6 nozzle", + "inherits": "0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle", + "from": "system", + "setting_id": "zNxUHo9HvYPlL2KP", + "instantiation": "true", + "enable_arc_fitting": "1", + "compatible_printers": [ + "Flashforge Adventurer A5 0.6 nozzle" + ], + "infill_wall_overlap": "15%", + "only_one_wall_top": "1", + "print_settings_id": "0.30mm Standard @FF Adventurer A5 0.6 nozzle", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "slowdown_for_curled_perimeters": "0", + "small_perimeter_speed": "25", + "sparse_infill_pattern": "grid", + "support_bottom_z_distance": "0.2", + "support_top_z_distance": "0.2" +} diff --git a/resources/profiles/Flashforge/process/0.40mm Standard @FF Adventurer A5 0.8 nozzle.json b/resources/profiles/Flashforge/process/0.40mm Standard @FF Adventurer A5 0.8 nozzle.json new file mode 100644 index 0000000000..4a0300bccc --- /dev/null +++ b/resources/profiles/Flashforge/process/0.40mm Standard @FF Adventurer A5 0.8 nozzle.json @@ -0,0 +1,18 @@ +{ + "type": "process", + "name": "0.40mm Standard @FF Adventurer A5 0.8 nozzle", + "inherits": "0.40mm Standard @Flashforge AD5M Pro 0.8 Nozzle", + "from": "system", + "setting_id": "Davfy2YyV2b7ofhd", + "instantiation": "true", + "enable_arc_fitting": "1", + "compatible_printers": [ + "Flashforge Adventurer A5 0.8 nozzle" + ], + "infill_wall_overlap": "15%", + "print_settings_id": "0.40mm Standard @FF Adventurer A5 0.8 nozzle", + "slowdown_for_curled_perimeters": "0", + "sparse_infill_pattern": "grid", + "support_bottom_z_distance": "0.25", + "support_top_z_distance": "0.25" +} diff --git a/resources/profiles/Flashforge/process/0.42mm Draft @FF Adventurer A5 0.6 nozzle.json b/resources/profiles/Flashforge/process/0.42mm Draft @FF Adventurer A5 0.6 nozzle.json new file mode 100644 index 0000000000..de9c64ea11 --- /dev/null +++ b/resources/profiles/Flashforge/process/0.42mm Draft @FF Adventurer A5 0.6 nozzle.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.42mm Draft @FF Adventurer A5 0.6 nozzle", + "inherits": "0.42mm Draft @Flashforge AD5M Pro 0.6 Nozzle", + "from": "system", + "setting_id": "k35K2zIeyVhqNVC1", + "instantiation": "true", + "bridge_flow": "1", + "enable_arc_fitting": "1", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", + "compatible_printers": [ + "Flashforge Adventurer A5 0.6 nozzle" + ], + "infill_wall_overlap": "15%", + "initial_layer_print_height": "0.3", + "only_one_wall_top": "1", + "print_settings_id": "0.42mm Draft @FF Adventurer A5 0.6 nozzle", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "slowdown_for_curled_perimeters": "0", + "small_perimeter_speed": "25", + "sparse_infill_pattern": "grid" +} diff --git a/resources/profiles/Flashforge/process/0.56mm Draft @FF Adventurer A5 0.8 nozzle.json b/resources/profiles/Flashforge/process/0.56mm Draft @FF Adventurer A5 0.8 nozzle.json new file mode 100644 index 0000000000..b95c9c1895 --- /dev/null +++ b/resources/profiles/Flashforge/process/0.56mm Draft @FF Adventurer A5 0.8 nozzle.json @@ -0,0 +1,16 @@ +{ + "type": "process", + "name": "0.56mm Draft @FF Adventurer A5 0.8 nozzle", + "inherits": "0.56mm Draft @Flashforge AD5M Pro 0.8 Nozzle", + "from": "system", + "setting_id": "AMe67pwFNPpsDJ9B", + "instantiation": "true", + "enable_arc_fitting": "1", + "compatible_printers": [ + "Flashforge Adventurer A5 0.8 nozzle" + ], + "infill_wall_overlap": "25%", + "print_settings_id": "0.56mm Draft @FF Adventurer A5 0.8 nozzle", + "slowdown_for_curled_perimeters": "0", + "sparse_infill_pattern": "grid" +} diff --git a/resources/profiles/FlyingBear/machine/Ghost7/FlyingBear Ghost7 0.4 nozzle.json b/resources/profiles/FlyingBear/machine/Ghost7/FlyingBear Ghost7 0.4 nozzle.json index fd14f77ebf..9f195a4eca 100644 --- a/resources/profiles/FlyingBear/machine/Ghost7/FlyingBear Ghost7 0.4 nozzle.json +++ b/resources/profiles/FlyingBear/machine/Ghost7/FlyingBear Ghost7 0.4 nozzle.json @@ -198,6 +198,6 @@ "0.4" ], "z_hop_types": [ - "Normal Lift" + "Auto Lift" ] } diff --git a/resources/profiles/InfiMech/machine/EX+APS/InfiMech EX+APS 0.4 nozzle.json b/resources/profiles/InfiMech/machine/EX+APS/InfiMech EX+APS 0.4 nozzle.json index a77186c2fd..9fb5343da9 100644 --- a/resources/profiles/InfiMech/machine/EX+APS/InfiMech EX+APS 0.4 nozzle.json +++ b/resources/profiles/InfiMech/machine/EX+APS/InfiMech EX+APS 0.4 nozzle.json @@ -198,6 +198,6 @@ "0.4" ], "z_hop_types": [ - "Normal Lift" + "Auto Lift" ] } diff --git a/resources/profiles/InfiMech/machine/EX/InfiMech EX 0.4 nozzle.json b/resources/profiles/InfiMech/machine/EX/InfiMech EX 0.4 nozzle.json index a018e3f8a3..ec9bbc6d00 100644 --- a/resources/profiles/InfiMech/machine/EX/InfiMech EX 0.4 nozzle.json +++ b/resources/profiles/InfiMech/machine/EX/InfiMech EX 0.4 nozzle.json @@ -198,6 +198,6 @@ "0.4" ], "z_hop_types": [ - "Normal Lift" + "Auto Lift" ] } diff --git a/resources/profiles/LH.json b/resources/profiles/LH.json index 7784b42bed..09e5d17e35 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.05", + "version": "02.04.00.06", "force_update": "0", "description": "LH 3D Printer Configuration", "machine_model_list": [ diff --git a/resources/profiles/LH/LH_Stinger_MMU_buildplate_texture.png b/resources/profiles/LH/LH_Stinger_MMU_buildplate_texture.png deleted file mode 100644 index d21afe069e..0000000000 Binary files a/resources/profiles/LH/LH_Stinger_MMU_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/LH/LH_Stinger_MMU_buildplate_texture.svg b/resources/profiles/LH/LH_Stinger_MMU_buildplate_texture.svg new file mode 100644 index 0000000000..b8e11ed2a8 --- /dev/null +++ b/resources/profiles/LH/LH_Stinger_MMU_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/LH/LH_Stinger_buildplate_model.stl b/resources/profiles/LH/LH_Stinger_buildplate_model.stl index 37fd514014..a71ba5cbd4 100644 Binary files a/resources/profiles/LH/LH_Stinger_buildplate_model.stl and b/resources/profiles/LH/LH_Stinger_buildplate_model.stl differ diff --git a/resources/profiles/LH/LH_Stinger_buildplate_texture.png b/resources/profiles/LH/LH_Stinger_buildplate_texture.png deleted file mode 100644 index e03843bd23..0000000000 Binary files a/resources/profiles/LH/LH_Stinger_buildplate_texture.png and /dev/null differ diff --git a/resources/profiles/LH/LH_Stinger_buildplate_texture.svg b/resources/profiles/LH/LH_Stinger_buildplate_texture.svg new file mode 100644 index 0000000000..f5606ba2f1 --- /dev/null +++ b/resources/profiles/LH/LH_Stinger_buildplate_texture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/LH/machine/LH Stinger MMU.json b/resources/profiles/LH/machine/LH Stinger MMU.json index dd0a1201c6..9e1f1df44b 100644 --- a/resources/profiles/LH/machine/LH Stinger MMU.json +++ b/resources/profiles/LH/machine/LH Stinger MMU.json @@ -5,8 +5,8 @@ "nozzle_diameter": "0.4", "machine_tech": "FFF", "family": "LH", - "bed_model": "LH_Stinger_buildplate_model.STL", - "bed_texture": "LH_Stinger_MMU_buildplate_texture.png", + "bed_model": "LH_Stinger_buildplate_model.stl", + "bed_texture": "LH_Stinger_MMU_buildplate_texture.svg", "hotend_model": "", "default_materials": "LHS PLA;LHS PETG;LHS PCTG;LHS ASA;LHS ABS;LHS PC CF;LHS TPU Foamy 78A;LHS TPU;" } \ No newline at end of file diff --git a/resources/profiles/LH/machine/LH Stinger.json b/resources/profiles/LH/machine/LH Stinger.json index 1e29493210..f02a42da4c 100644 --- a/resources/profiles/LH/machine/LH Stinger.json +++ b/resources/profiles/LH/machine/LH Stinger.json @@ -5,8 +5,8 @@ "nozzle_diameter": "0.4", "machine_tech": "FFF", "family": "LH", - "bed_model": "LH_Stinger_buildplate_model.STL", - "bed_texture": "LH_Stinger_buildplate_texture.png", + "bed_model": "LH_Stinger_buildplate_model.stl", + "bed_texture": "LH_Stinger_buildplate_texture.svg", "hotend_model": "", "default_materials": "LHS PLA;LHS PETG;LHS PCTG;LHS ASA;LHS ABS;LHS PC CF;LHS TPU Foamy 78A;LHS TPU;" } \ No newline at end of file diff --git a/resources/profiles/Lulzbot.json b/resources/profiles/Lulzbot.json index 1ca47d7cba..39042cbe9a 100644 --- a/resources/profiles/Lulzbot.json +++ b/resources/profiles/Lulzbot.json @@ -1,10 +1,14 @@ { "name": "Lulzbot", "url": "https://ohai.lulzbot.com/group/taz-6/", - "version": "02.04.00.04", + "version": "02.04.00.05", "force_update": "0", "description": "Lulzbot configurations", "machine_model_list": [ + { + "name": "Lulzbot Mini 1", + "sub_path": "machine/Lulzbot Mini 1.json" + }, { "name": "Lulzbot Taz 4 or 5", "sub_path": "machine/Lulzbot Taz 4 or 5.json" @@ -27,6 +31,10 @@ "name": "fdm_process_common", "sub_path": "process/fdm_process_common.json" }, + { + "name": "0.25mm Standard @Lulzbot Mini 1", + "sub_path": "process/0.25mm Standard @Lulzbot Mini 1.json" + }, { "name": "0.25mm Standard @Lulzbot Taz 4 or 5", "sub_path": "process/0.25mm Standard @Lulzbot Taz 4 or 5.json" @@ -43,6 +51,10 @@ "name": "0.25mm Standard @Lulzbot Taz Pro S", "sub_path": "process/0.25mm Standard @Lulzbot Taz Pro S.json" }, + { + "name": "0.18mm High Detail @Lulzbot Mini 1", + "sub_path": "process/0.18mm High Detail @Lulzbot Mini 1.json" + }, { "name": "0.18mm High Detail @Lulzbot Taz 4 or 5", "sub_path": "process/0.18mm High Detail @Lulzbot Taz 4 or 5.json" @@ -65,13 +77,25 @@ "name": "Generic ABS @Lulzbot", "sub_path": "filament/Generic ABS @Lulzbot.json" }, + { + "name": "Generic ABS @Lulzbot Mini 1", + "sub_path": "filament/Generic ABS @Lulzbot Mini 1.json" + }, { "name": "Generic PETG @Lulzbot", "sub_path": "filament/Generic PETG @Lulzbot.json" }, + { + "name": "Generic PETG @Lulzbot Mini 1", + "sub_path": "filament/Generic PETG @Lulzbot Mini 1.json" + }, { "name": "Generic PLA @Lulzbot", "sub_path": "filament/Generic PLA @Lulzbot.json" + }, + { + "name": "Generic PLA @Lulzbot Mini 1", + "sub_path": "filament/Generic PLA @Lulzbot Mini 1.json" } ], "machine_list": [ @@ -79,6 +103,10 @@ "name": "fdm_machine_common", "sub_path": "machine/fdm_machine_common.json" }, + { + "name": "Lulzbot Mini 1 0.5 nozzle", + "sub_path": "machine/Lulzbot Mini 1 0.5 nozzle.json" + }, { "name": "Lulzbot Taz 4 or 5 0.5 nozzle", "sub_path": "machine/Lulzbot Taz 4 or 5 0.5 nozzle.json" diff --git a/resources/profiles/Lulzbot/Lulzbot Mini 1_cover.png b/resources/profiles/Lulzbot/Lulzbot Mini 1_cover.png new file mode 100644 index 0000000000..1d46d02650 Binary files /dev/null and b/resources/profiles/Lulzbot/Lulzbot Mini 1_cover.png differ diff --git a/resources/profiles/Lulzbot/filament/Generic ABS @Lulzbot Mini 1.json b/resources/profiles/Lulzbot/filament/Generic ABS @Lulzbot Mini 1.json new file mode 100644 index 0000000000..1e5c2163f1 --- /dev/null +++ b/resources/profiles/Lulzbot/filament/Generic ABS @Lulzbot Mini 1.json @@ -0,0 +1,68 @@ +{ + "type": "filament", + "name": "Generic ABS @Lulzbot Mini 1", + "inherits": "Generic ABS @System", + "from": "system", + "setting_id": "vYckNG6HUwmwixlF", + "instantiation": "true", + "filament_diameter": [ + "2.85" + ], + "filament_density": [ + "1.06" + ], + "filament_max_volumetric_speed": [ + "6" + ], + "nozzle_temperature": [ + "240" + ], + "nozzle_temperature_initial_layer": [ + "245" + ], + "cool_plate_temp": [ + "110" + ], + "cool_plate_temp_initial_layer": [ + "110" + ], + "eng_plate_temp": [ + "110" + ], + "eng_plate_temp_initial_layer": [ + "110" + ], + "hot_plate_temp": [ + "110" + ], + "hot_plate_temp_initial_layer": [ + "110" + ], + "textured_plate_temp": [ + "110" + ], + "textured_plate_temp_initial_layer": [ + "110" + ], + "fan_min_speed": [ + "40" + ], + "fan_max_speed": [ + "60" + ], + "compatible_printers": [ + "Lulzbot Mini 1 0.5 nozzle" + ], + "textured_cool_plate_temp": [ + "110" + ], + "textured_cool_plate_temp_initial_layer": [ + "110" + ], + "supertack_plate_temp": [ + "110" + ], + "supertack_plate_temp_initial_layer": [ + "110" + ] +} diff --git a/resources/profiles/Lulzbot/filament/Generic PETG @Lulzbot Mini 1.json b/resources/profiles/Lulzbot/filament/Generic PETG @Lulzbot Mini 1.json new file mode 100644 index 0000000000..bfddec7add --- /dev/null +++ b/resources/profiles/Lulzbot/filament/Generic PETG @Lulzbot Mini 1.json @@ -0,0 +1,68 @@ +{ + "type": "filament", + "name": "Generic PETG @Lulzbot Mini 1", + "inherits": "Generic PETG @System", + "from": "system", + "setting_id": "zcgAqKXFHMgCJr2q", + "instantiation": "true", + "filament_diameter": [ + "2.85" + ], + "filament_density": [ + "1.24" + ], + "filament_max_volumetric_speed": [ + "6" + ], + "nozzle_temperature": [ + "230" + ], + "nozzle_temperature_initial_layer": [ + "235" + ], + "cool_plate_temp": [ + "80" + ], + "cool_plate_temp_initial_layer": [ + "80" + ], + "eng_plate_temp": [ + "80" + ], + "eng_plate_temp_initial_layer": [ + "80" + ], + "hot_plate_temp": [ + "80" + ], + "hot_plate_temp_initial_layer": [ + "80" + ], + "textured_plate_temp": [ + "80" + ], + "textured_plate_temp_initial_layer": [ + "80" + ], + "fan_min_speed": [ + "40" + ], + "fan_max_speed": [ + "60" + ], + "compatible_printers": [ + "Lulzbot Mini 1 0.5 nozzle" + ], + "textured_cool_plate_temp": [ + "80" + ], + "textured_cool_plate_temp_initial_layer": [ + "80" + ], + "supertack_plate_temp": [ + "80" + ], + "supertack_plate_temp_initial_layer": [ + "80" + ] +} diff --git a/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA+ @base.json b/resources/profiles/Lulzbot/filament/Generic PLA @Lulzbot Mini 1.json similarity index 51% rename from resources/profiles/BBL/filament/Polymaker/PolyTerra PLA+ @base.json rename to resources/profiles/Lulzbot/filament/Generic PLA @Lulzbot Mini 1.json index 1d322a6c3e..07cae7accc 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA+ @base.json +++ b/resources/profiles/Lulzbot/filament/Generic PLA @Lulzbot Mini 1.json @@ -1,12 +1,24 @@ { "type": "filament", - "name": "PolyTerra PLA+ @base", - "inherits": "fdm_filament_pla", + "name": "Generic PLA @Lulzbot Mini 1", + "inherits": "Generic PLA @System", "from": "system", - "filament_id": "OFEjbwqG", - "instantiation": "false", - "bed_type": [ - "Cool Plate" + "setting_id": "xjWvBH3Qyc46iwAi", + "instantiation": "true", + "filament_diameter": [ + "2.85" + ], + "filament_density": [ + "1.25" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "nozzle_temperature": [ + "205" + ], + "nozzle_temperature_initial_layer": [ + "210" ], "cool_plate_temp": [ "60" @@ -20,52 +32,34 @@ "eng_plate_temp_initial_layer": [ "60" ], - "filament_cost": [ - "20.99" - ], - "filament_flow_ratio": [ - "0.95" - ], - "filament_max_volumetric_speed": [ - "16" - ], - "filament_vendor": [ - "Polymaker" - ], "hot_plate_temp": [ "60" ], "hot_plate_temp_initial_layer": [ "60" ], - "nozzle_temperature": [ - "230" - ], - "nozzle_temperature_initial_layer": [ - "230" - ], - "nozzle_temperature_range_high": [ - "230" - ], - "overhang_fan_speed": [ - "75" - ], - "slow_down_layer_time": [ - "5" - ], - "slow_down_min_speed": [ - "5" - ], - "temperature_vitrification": [ - "59" - ], "textured_plate_temp": [ "60" ], "textured_plate_temp_initial_layer": [ "60" ], - "filament_type": [ - "PLA" + "fan_min_speed": [ + "75" + ], + "compatible_printers": [ + "Lulzbot Mini 1 0.5 nozzle" + ], + "textured_cool_plate_temp": [ + "60" + ], + "textured_cool_plate_temp_initial_layer": [ + "60" + ], + "supertack_plate_temp": [ + "60" + ], + "supertack_plate_temp_initial_layer": [ + "60" ] } diff --git a/resources/profiles/Lulzbot/machine/Lulzbot Mini 1 0.5 nozzle.json b/resources/profiles/Lulzbot/machine/Lulzbot Mini 1 0.5 nozzle.json new file mode 100644 index 0000000000..4059188689 --- /dev/null +++ b/resources/profiles/Lulzbot/machine/Lulzbot Mini 1 0.5 nozzle.json @@ -0,0 +1,110 @@ +{ + "type": "machine", + "name": "Lulzbot Mini 1 0.5 nozzle", + "inherits": "fdm_machine_common", + "from": "system", + "setting_id": "Jhc8WqYmrK3y65fQ", + "instantiation": "true", + "printer_model": "Lulzbot Mini 1", + "default_print_profile": "0.25mm Standard @Lulzbot Mini 1", + "nozzle_diameter": [ + "0.5" + ], + "printable_area": [ + "0x0", + "154x0", + "154x154", + "0x154" + ], + "printable_height": "158", + "nozzle_type": "undefine", + "auxiliary_fan": "0", + "emit_machine_limits_to_gcode": "0", + "machine_max_acceleration_extruding": [ + "2000", + "2000" + ], + "machine_max_acceleration_retracting": [ + "1000", + "1000" + ], + "machine_max_acceleration_travel": [ + "2000", + "2000" + ], + "machine_max_acceleration_x": [ + "2000", + "2000" + ], + "machine_max_acceleration_y": [ + "2000", + "2000" + ], + "machine_max_acceleration_z": [ + "100", + "100" + ], + "machine_max_speed_e": [ + "40", + "40" + ], + "machine_max_speed_x": [ + "500", + "500" + ], + "machine_max_speed_y": [ + "500", + "500" + ], + "machine_max_speed_z": [ + "3", + "3" + ], + "machine_max_jerk_e": [ + "5", + "5" + ], + "machine_max_jerk_x": [ + "8", + "8" + ], + "machine_max_jerk_y": [ + "8", + "8" + ], + "machine_max_jerk_z": [ + "0.4", + "0.4" + ], + "max_layer_height": [ + "0.4" + ], + "min_layer_height": [ + "0.08" + ], + "printer_settings_id": "Lulzbot", + "retraction_minimum_travel": [ + "2" + ], + "retract_before_wipe": [ + "70%" + ], + "retraction_length": [ + "1.5" + ], + "retraction_speed": [ + "10" + ], + "deretraction_speed": [ + "10" + ], + "single_extruder_multi_material": "1", + "default_filament_profile": [ + "Generic PLA @Lulzbot Mini 1" + ], + "machine_start_gcode": ";This G-Code has been translated from LulzBot's CuraLE (resources/gcodes/mini_1) startup GCODE for the Mini 1 Single Extruder\nM73 P0; clear GLCD progress bar (ignored if no LCD is fitted)\nM75; start GLCD timer\nM107; disable fans\nM420 S0; 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; home all axes (Z homes to the top on the Mini)\nG0 X0 Y187 Z156 F200; move away from endstops\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}\nG1 E-30 F75; retract filament clear of the melt zone so it cannot ooze onto the probe washers\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}\nG1 X45 Y173 F11520; move above wiper pad\nG1 Z0 F1200; push nozzle into wiper\nG1 X42 Y173 Z-.5 F4000; wiping\nG1 X52 Y171 Z-.5 F4000; wiping\nG1 X42 Y173 Z0 F4000; wiping\nG1 X52 Y171 F4000; wiping\nG1 X42 Y173 F4000; wiping\nG1 X52 Y171 F4000; wiping\nG1 X42 Y173 F4000; wiping\nG1 X52 Y171 F4000; wiping\nG1 X57 Y173 F4000; wiping\nG1 X77 Y171 F4000; wiping\nG1 X57 Y173 F4000; wiping\nG1 X77 Y171 F4000; wiping\nG1 X57 Y173 F4000; wiping\nG1 X87 Y171 F4000; wiping\nG1 X77 Y173 F4000; wiping\nG1 X97 Y171 F4000; wiping\nG1 X77 Y173 F4000; wiping\nG1 X97 Y171 F4000; wiping\nG1 X77 Y173 F4000; wiping\nG1 X97 Y171 F4000; wiping\nG1 X107 Y173 F4000; wiping\nG1 X97 Y171 F4000; wiping\nG1 X107 Y173 F4000; wiping\nG1 X97 Y171 F4000; wiping\nG1 X107 Y173 F4000; wiping\nG1 X112 Y171 Z-0.5 F1000; wiping\nG1 Z10; raise extruder\nG28 X0 Y0; home X and Y\nG0 X0 Y187 F200; move away from endstops\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}\nM204 S300; set probing acceleration\nG29; start auto-leveling sequence\nM420 S1; enable leveling matrix\nM204 S2000; restore standard acceleration\nG28 X0 Y0; re-home to account for build variance of earlier Mini builds\nG0 X0 Y187 F200; move away from endstops\nG0 Y152 F4000; move in front of wiper pad\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 Mini Printing...; progress indicator message on LCD\n;Start G-Code End", + "machine_end_gcode": ";End G-Code Begin\nM400; wait for moves to finish\nM104 S0; disable hotend\nM140 S0; start bed cooling\nM107; disable fans\nG92 E5; set extruder to 5mm for retract on print end\nG1 X5 Y5 Z158 E0 F10000; move to cooling position, retracting on the way\nG1 E5; re-prime extruder\nM77; stop GLCD timer\nG1 X145 F1000; move extruder out of the way\nG1 Y175 F1000; present finished print\nM84; disable steppers\nG90; absolute positioning\nM117 Print Complete.; print complete message\n;End G-Code End", + "before_layer_change_gcode": "G92 E0; reset relative extrusion", + "layer_change_gcode": "; LAYER:{layer_num}\nM117 Layer: {layer_num +1} / [total_layer_count]", + "scan_first_layer": "0" +} diff --git a/resources/profiles/Lulzbot/machine/Lulzbot Mini 1.json b/resources/profiles/Lulzbot/machine/Lulzbot Mini 1.json new file mode 100644 index 0000000000..315497585a --- /dev/null +++ b/resources/profiles/Lulzbot/machine/Lulzbot Mini 1.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "Lulzbot Mini 1", + "model_id": "Lulzbot-Mini-1", + "nozzle_diameter": "0.5", + "machine_tech": "FFF", + "family": "Lulzbot", + "bed_model": "", + "bed_texture": "lulzbot_logo.svg", + "hotend_model": "", + "default_materials": "Generic PLA @Lulzbot Mini 1;Generic ABS @Lulzbot Mini 1;Generic PETG @Lulzbot Mini 1" +} diff --git a/resources/profiles/Lulzbot/process/0.18mm High Detail @Lulzbot Mini 1.json b/resources/profiles/Lulzbot/process/0.18mm High Detail @Lulzbot Mini 1.json new file mode 100644 index 0000000000..974b51f747 --- /dev/null +++ b/resources/profiles/Lulzbot/process/0.18mm High Detail @Lulzbot Mini 1.json @@ -0,0 +1,12 @@ +{ + "type": "process", + "name": "0.18mm High Detail @Lulzbot Mini 1", + "inherits": "0.25mm Standard @Lulzbot Mini 1", + "from": "system", + "setting_id": "2FKMCpTJ1Ptv1wLD", + "instantiation": "true", + "layer_height": "0.18", + "compatible_printers": [ + "Lulzbot Mini 1 0.5 nozzle" + ] +} diff --git a/resources/profiles/UltiMaker/process/0.25mm Darft @UltiMaker 2.json b/resources/profiles/Lulzbot/process/0.25mm Standard @Lulzbot Mini 1.json similarity index 69% rename from resources/profiles/UltiMaker/process/0.25mm Darft @UltiMaker 2.json rename to resources/profiles/Lulzbot/process/0.25mm Standard @Lulzbot Mini 1.json index bd77f960ac..50aa0dbfac 100644 --- a/resources/profiles/UltiMaker/process/0.25mm Darft @UltiMaker 2.json +++ b/resources/profiles/Lulzbot/process/0.25mm Standard @Lulzbot Mini 1.json @@ -1,42 +1,43 @@ { "type": "process", - "name": "0.25mm Draft @UltiMaker 2", + "name": "0.25mm Standard @Lulzbot Mini 1", "inherits": "fdm_process_common", "from": "system", - "setting_id": "dBum79P8qUSRgT90", + "setting_id": "bqY8CEHwvUYnLRPe", "instantiation": "true", "reduce_crossing_wall": "0", "layer_height": "0.25", "max_travel_detour_distance": "0", "bottom_surface_pattern": "monotonic", - "bottom_shell_layers": "3", + "bottom_shell_layers": "5", "bottom_shell_thickness": "0", - "bridge_flow": "1", - "bridge_speed": "60", + "bridge_flow": "0.85", + "bridge_speed": "25", "brim_width": "0", "brim_object_gap": "0", "compatible_printers_condition": "", "print_sequence": "by layer", "default_acceleration": "0", + "outer_wall_acceleration": "0", "top_surface_acceleration": "0", "bridge_no_support": "0", "draft_shield": "disabled", - "elefant_foot_compensation": "0", + "elefant_foot_compensation": "0.1", "enable_arc_fitting": "0", - "outer_wall_line_width": "0.4", + "outer_wall_line_width": "0.5", "wall_infill_order": "inner wall/outer wall/infill", - "line_width": "0.45", + "line_width": "0.5", "infill_direction": "45", - "sparse_infill_density": "15%", + "sparse_infill_density": "20%", "sparse_infill_pattern": "crosshatch", - "initial_layer_acceleration": "500", + "initial_layer_acceleration": "0", "travel_acceleration": "0", "inner_wall_acceleration": "0", - "initial_layer_line_width": "0.42", - "initial_layer_print_height": "0.3", + "initial_layer_line_width": "0.50", + "initial_layer_print_height": "0.425", "infill_combination": "0", - "sparse_infill_line_width": "0.45", - "infill_wall_overlap": "35%", + "sparse_infill_line_width": "0.50", + "infill_wall_overlap": "25%", "interface_shells": "0", "ironing_flow": "15%", "ironing_spacing": "0.1", @@ -49,7 +50,7 @@ "overhang_2_4_speed": "20", "overhang_3_4_speed": "15", "overhang_4_4_speed": "10", - "inner_wall_line_width": "0.45", + "inner_wall_line_width": "0.50", "wall_loops": "2", "print_settings_id": "", "raft_layers": "0", @@ -66,9 +67,9 @@ "support_type": "normal(auto)", "support_style": "grid", "support_on_build_plate_only": "0", - "support_top_z_distance": "0.2", + "support_top_z_distance": "0.19", "support_filament": "0", - "support_line_width": "0.4", + "support_line_width": "0.5", "support_interface_loop_pattern": "0", "support_interface_filament": "0", "support_interface_top_layers": "3", @@ -77,31 +78,31 @@ "support_interface_speed": "100%", "support_base_pattern": "rectilinear", "support_base_pattern_spacing": "0.2", - "support_speed": "60", + "support_speed": "40", "support_threshold_angle": "30", - "support_object_xy_distance": "50%", + "support_object_xy_distance": "60%", "tree_support_branch_angle": "40", "tree_support_wall_count": "0", "detect_thin_wall": "1", "top_surface_pattern": "monotonicline", - "top_surface_line_width": "0.4", - "top_shell_layers": "4", - "top_shell_thickness": "0.8", + "top_surface_line_width": "0.5", + "top_shell_layers": "5", + "top_shell_thickness": "1.0", "initial_layer_speed": "35%", "initial_layer_infill_speed": "35%", - "outer_wall_speed": "200", - "inner_wall_speed": "300", - "internal_solid_infill_speed": "250", - "top_surface_speed": "200", - "gap_infill_speed": "250", - "sparse_infill_speed": "270", - "travel_speed": "150", + "outer_wall_speed": "40", + "inner_wall_speed": "45", + "internal_solid_infill_speed": "40", + "top_surface_speed": "30", + "gap_infill_speed": "30", + "sparse_infill_speed": "60", + "travel_speed": "175", "enable_prime_tower": "1", "wipe_tower_no_sparse_layers": "0", - "prime_tower_width": "60", + "prime_tower_width": "30", "xy_hole_compensation": "0", "xy_contour_compensation": "0", "compatible_printers": [ - "UltiMaker 2 0.4 nozzle" + "Lulzbot Mini 1 0.5 nozzle" ] } diff --git a/resources/profiles/Meltingplot.json b/resources/profiles/Meltingplot.json new file mode 100644 index 0000000000..654d955380 --- /dev/null +++ b/resources/profiles/Meltingplot.json @@ -0,0 +1,434 @@ +{ + "name": "Meltingplot", + "version": "02.04.00.00", + "force_update": "0", + "description": "Meltingplot configurations", + "machine_model_list": [ + { + "name": "Meltingplot CHX 350", + "sub_path": "machine/Meltingplot CHX 350.json" + }, + { + "name": "Meltingplot MBL 133", + "sub_path": "machine/Meltingplot MBL 133.json" + }, + { + "name": "Meltingplot MBL 136", + "sub_path": "machine/Meltingplot MBL 136.json" + }, + { + "name": "Meltingplot MBL 308", + "sub_path": "machine/Meltingplot MBL 308.json" + }, + { + "name": "Meltingplot MBL 480", + "sub_path": "machine/Meltingplot MBL 480.json" + } + ], + "process_list": [ + { + "name": "fdm_process_common", + "sub_path": "process/fdm_process_common.json" + }, + { + "name": "fdm_process_meltingplot_chx_common", + "sub_path": "process/fdm_process_meltingplot_chx_common.json" + }, + { + "name": "fdm_process_meltingplot_mbl_common", + "sub_path": "process/fdm_process_meltingplot_mbl_common.json" + }, + { + "name": "fdm_process_meltingplot_chx_large_nozzle", + "sub_path": "process/fdm_process_meltingplot_chx_large_nozzle.json" + }, + { + "name": "fdm_process_meltingplot_chx_small_nozzle", + "sub_path": "process/fdm_process_meltingplot_chx_small_nozzle.json" + }, + { + "name": "fdm_process_meltingplot_mbl_04_nozzle", + "sub_path": "process/fdm_process_meltingplot_mbl_04_nozzle.json" + }, + { + "name": "fdm_process_meltingplot_mbl_06_nozzle", + "sub_path": "process/fdm_process_meltingplot_mbl_06_nozzle.json" + }, + { + "name": "fdm_process_meltingplot_mbl_08_nozzle", + "sub_path": "process/fdm_process_meltingplot_mbl_08_nozzle.json" + }, + { + "name": "fdm_process_meltingplot_mbl_10_nozzle", + "sub_path": "process/fdm_process_meltingplot_mbl_10_nozzle.json" + }, + { + "name": "fdm_process_meltingplot_mbl_12_nozzle", + "sub_path": "process/fdm_process_meltingplot_mbl_12_nozzle.json" + }, + { + "name": "0.32mm Fine 0.8 nozzle @Meltingplot CHX 350", + "sub_path": "process/0.32mm Fine 0.8 nozzle @Meltingplot CHX 350.json" + }, + { + "name": "0.36mm Optimal 0.8 nozzle @Meltingplot CHX 350", + "sub_path": "process/0.36mm Optimal 0.8 nozzle @Meltingplot CHX 350.json" + }, + { + "name": "0.38mm Standard 0.8 nozzle @Meltingplot CHX 350", + "sub_path": "process/0.38mm Standard 0.8 nozzle @Meltingplot CHX 350.json" + }, + { + "name": "0.44mm Fine 1.0 nozzle @Meltingplot CHX 350", + "sub_path": "process/0.44mm Fine 1.0 nozzle @Meltingplot CHX 350.json" + }, + { + "name": "0.48mm Fine 1.2 nozzle @Meltingplot CHX 350", + "sub_path": "process/0.48mm Fine 1.2 nozzle @Meltingplot CHX 350.json" + }, + { + "name": "0.48mm Optimal 1.0 nozzle @Meltingplot CHX 350", + "sub_path": "process/0.48mm Optimal 1.0 nozzle @Meltingplot CHX 350.json" + }, + { + "name": "0.56mm Optimal 1.2 nozzle @Meltingplot CHX 350", + "sub_path": "process/0.56mm Optimal 1.2 nozzle @Meltingplot CHX 350.json" + }, + { + "name": "0.18mm Fine 0.4 nozzle @Meltingplot CHX 350", + "sub_path": "process/0.18mm Fine 0.4 nozzle @Meltingplot CHX 350.json" + }, + { + "name": "0.24mm Fine 0.6 nozzle @Meltingplot CHX 350", + "sub_path": "process/0.24mm Fine 0.6 nozzle @Meltingplot CHX 350.json" + }, + { + "name": "0.28mm Optimal 0.6 nozzle @Meltingplot CHX 350", + "sub_path": "process/0.28mm Optimal 0.6 nozzle @Meltingplot CHX 350.json" + }, + { + "name": "0.30mm Standard 0.6 nozzle @Meltingplot CHX 350", + "sub_path": "process/0.30mm Standard 0.6 nozzle @Meltingplot CHX 350.json" + }, + { + "name": "0.18mm Fine 0.4 nozzle @Meltingplot MBL", + "sub_path": "process/0.18mm Fine 0.4 nozzle @Meltingplot MBL.json" + }, + { + "name": "0.24mm Fine 0.6 nozzle @Meltingplot MBL", + "sub_path": "process/0.24mm Fine 0.6 nozzle @Meltingplot MBL.json" + }, + { + "name": "0.28mm Optimal 0.6 nozzle @Meltingplot MBL", + "sub_path": "process/0.28mm Optimal 0.6 nozzle @Meltingplot MBL.json" + }, + { + "name": "0.30mm Standard 0.6 nozzle @Meltingplot MBL", + "sub_path": "process/0.30mm Standard 0.6 nozzle @Meltingplot MBL.json" + }, + { + "name": "0.34mm Fine 0.8 nozzle @Meltingplot MBL", + "sub_path": "process/0.34mm Fine 0.8 nozzle @Meltingplot MBL.json" + }, + { + "name": "0.36mm Optimal 0.8 nozzle @Meltingplot MBL", + "sub_path": "process/0.36mm Optimal 0.8 nozzle @Meltingplot MBL.json" + }, + { + "name": "0.38mm Standard 0.8 nozzle @Meltingplot MBL", + "sub_path": "process/0.38mm Standard 0.8 nozzle @Meltingplot MBL.json" + }, + { + "name": "0.44mm Fine 1.0 nozzle @Meltingplot MBL", + "sub_path": "process/0.44mm Fine 1.0 nozzle @Meltingplot MBL.json" + }, + { + "name": "0.48mm Optimal 1.0 nozzle @Meltingplot MBL", + "sub_path": "process/0.48mm Optimal 1.0 nozzle @Meltingplot MBL.json" + }, + { + "name": "0.48mm Fine 1.2 nozzle @Meltingplot MBL", + "sub_path": "process/0.48mm Fine 1.2 nozzle @Meltingplot MBL.json" + }, + { + "name": "0.56mm Optimal 1.2 nozzle @Meltingplot MBL", + "sub_path": "process/0.56mm Optimal 1.2 nozzle @Meltingplot MBL.json" + } + ], + "filament_list": [ + { + "name": "Extrudr PLA NX2 Matt", + "sub_path": "filament/Extrudr PLA NX2 Matt.json" + }, + { + "name": "Meltingplot ABS", + "sub_path": "filament/Meltingplot ABS.json" + }, + { + "name": "Meltingplot ASA", + "sub_path": "filament/Meltingplot ASA.json" + }, + { + "name": "Meltingplot PA6 CF HT", + "sub_path": "filament/Meltingplot PA6 CF HT.json" + }, + { + "name": "Meltingplot PET-CF15", + "sub_path": "filament/Meltingplot PET-CF15.json" + }, + { + "name": "Meltingplot PETG", + "sub_path": "filament/Meltingplot PETG.json" + }, + { + "name": "Meltingplot PLA", + "sub_path": "filament/Meltingplot PLA.json" + }, + { + "name": "Meltingplot TitanX", + "sub_path": "filament/Meltingplot TitanX.json" + }, + { + "name": "Extrudr PLA NX2 Matt @0.4 nozzle", + "sub_path": "filament/Extrudr PLA NX2 Matt @0.4 nozzle.json" + }, + { + "name": "Extrudr PLA NX2 Matt @0.6 nozzle", + "sub_path": "filament/Extrudr PLA NX2 Matt @0.6 nozzle.json" + }, + { + "name": "Extrudr PLA NX2 Matt @0.8 nozzle", + "sub_path": "filament/Extrudr PLA NX2 Matt @0.8 nozzle.json" + }, + { + "name": "Extrudr PLA NX2 Matt @1.0 nozzle", + "sub_path": "filament/Extrudr PLA NX2 Matt @1.0 nozzle.json" + }, + { + "name": "Meltingplot ABS @0.4 nozzle", + "sub_path": "filament/Meltingplot ABS @0.4 nozzle.json" + }, + { + "name": "Meltingplot ABS @0.6 nozzle", + "sub_path": "filament/Meltingplot ABS @0.6 nozzle.json" + }, + { + "name": "Meltingplot ABS @0.8 nozzle", + "sub_path": "filament/Meltingplot ABS @0.8 nozzle.json" + }, + { + "name": "Meltingplot ABS @1.0 nozzle", + "sub_path": "filament/Meltingplot ABS @1.0 nozzle.json" + }, + { + "name": "Meltingplot ASA @0.4 nozzle", + "sub_path": "filament/Meltingplot ASA @0.4 nozzle.json" + }, + { + "name": "Meltingplot ASA @0.6 nozzle", + "sub_path": "filament/Meltingplot ASA @0.6 nozzle.json" + }, + { + "name": "Meltingplot ASA @0.8 nozzle", + "sub_path": "filament/Meltingplot ASA @0.8 nozzle.json" + }, + { + "name": "Meltingplot ASA @1.0 nozzle", + "sub_path": "filament/Meltingplot ASA @1.0 nozzle.json" + }, + { + "name": "Meltingplot PA6 CF HT @0.4 nozzle", + "sub_path": "filament/Meltingplot PA6 CF HT @0.4 nozzle.json" + }, + { + "name": "Meltingplot PA6 CF HT @0.6 nozzle", + "sub_path": "filament/Meltingplot PA6 CF HT @0.6 nozzle.json" + }, + { + "name": "Meltingplot PA6 CF HT @0.8 nozzle", + "sub_path": "filament/Meltingplot PA6 CF HT @0.8 nozzle.json" + }, + { + "name": "Meltingplot PA6 CF HT @1.0 nozzle", + "sub_path": "filament/Meltingplot PA6 CF HT @1.0 nozzle.json" + }, + { + "name": "Meltingplot PET-CF15 @0.4 nozzle", + "sub_path": "filament/Meltingplot PET-CF15 @0.4 nozzle.json" + }, + { + "name": "Meltingplot PET-CF15 @0.6 nozzle", + "sub_path": "filament/Meltingplot PET-CF15 @0.6 nozzle.json" + }, + { + "name": "Meltingplot PET-CF15 @0.8 nozzle", + "sub_path": "filament/Meltingplot PET-CF15 @0.8 nozzle.json" + }, + { + "name": "Meltingplot PET-CF15 @1.0 nozzle", + "sub_path": "filament/Meltingplot PET-CF15 @1.0 nozzle.json" + }, + { + "name": "Meltingplot PETG @0.4 nozzle", + "sub_path": "filament/Meltingplot PETG @0.4 nozzle.json" + }, + { + "name": "Meltingplot PETG @0.6 nozzle", + "sub_path": "filament/Meltingplot PETG @0.6 nozzle.json" + }, + { + "name": "Meltingplot PETG @0.8 nozzle", + "sub_path": "filament/Meltingplot PETG @0.8 nozzle.json" + }, + { + "name": "Meltingplot PETG @1.0 nozzle", + "sub_path": "filament/Meltingplot PETG @1.0 nozzle.json" + }, + { + "name": "Meltingplot PLA @0.4 nozzle", + "sub_path": "filament/Meltingplot PLA @0.4 nozzle.json" + }, + { + "name": "Meltingplot PLA @0.6 nozzle", + "sub_path": "filament/Meltingplot PLA @0.6 nozzle.json" + }, + { + "name": "Meltingplot PLA @0.8 nozzle", + "sub_path": "filament/Meltingplot PLA @0.8 nozzle.json" + }, + { + "name": "Meltingplot PLA @1.0 nozzle", + "sub_path": "filament/Meltingplot PLA @1.0 nozzle.json" + }, + { + "name": "Meltingplot TitanX @0.4 nozzle", + "sub_path": "filament/Meltingplot TitanX @0.4 nozzle.json" + }, + { + "name": "Meltingplot TitanX @0.6 nozzle", + "sub_path": "filament/Meltingplot TitanX @0.6 nozzle.json" + }, + { + "name": "Meltingplot TitanX @0.8 nozzle", + "sub_path": "filament/Meltingplot TitanX @0.8 nozzle.json" + }, + { + "name": "Meltingplot TitanX @1.0 nozzle", + "sub_path": "filament/Meltingplot TitanX @1.0 nozzle.json" + } + ], + "machine_list": [ + { + "name": "fdm_machine_common", + "sub_path": "machine/fdm_machine_common.json" + }, + { + "name": "fdm_machine_meltingplot_chx", + "sub_path": "machine/fdm_machine_meltingplot_chx.json" + }, + { + "name": "fdm_machine_meltingplot_mbl", + "sub_path": "machine/fdm_machine_meltingplot_mbl.json" + }, + { + "name": "Meltingplot CHX 350 0.4 nozzle", + "sub_path": "machine/Meltingplot CHX 350 0.4 nozzle.json" + }, + { + "name": "Meltingplot CHX 350 0.6 nozzle", + "sub_path": "machine/Meltingplot CHX 350 0.6 nozzle.json" + }, + { + "name": "Meltingplot CHX 350 0.8 nozzle", + "sub_path": "machine/Meltingplot CHX 350 0.8 nozzle.json" + }, + { + "name": "Meltingplot CHX 350 1.0 nozzle", + "sub_path": "machine/Meltingplot CHX 350 1.0 nozzle.json" + }, + { + "name": "Meltingplot CHX 350 1.2 nozzle", + "sub_path": "machine/Meltingplot CHX 350 1.2 nozzle.json" + }, + { + "name": "Meltingplot MBL 133 0.4 nozzle", + "sub_path": "machine/Meltingplot MBL 133 0.4 nozzle.json" + }, + { + "name": "Meltingplot MBL 133 0.6 nozzle", + "sub_path": "machine/Meltingplot MBL 133 0.6 nozzle.json" + }, + { + "name": "Meltingplot MBL 133 0.8 nozzle", + "sub_path": "machine/Meltingplot MBL 133 0.8 nozzle.json" + }, + { + "name": "Meltingplot MBL 133 1.0 nozzle", + "sub_path": "machine/Meltingplot MBL 133 1.0 nozzle.json" + }, + { + "name": "Meltingplot MBL 133 1.2 nozzle", + "sub_path": "machine/Meltingplot MBL 133 1.2 nozzle.json" + }, + { + "name": "Meltingplot MBL 136 0.4 nozzle", + "sub_path": "machine/Meltingplot MBL 136 0.4 nozzle.json" + }, + { + "name": "Meltingplot MBL 136 0.6 nozzle", + "sub_path": "machine/Meltingplot MBL 136 0.6 nozzle.json" + }, + { + "name": "Meltingplot MBL 136 0.8 nozzle", + "sub_path": "machine/Meltingplot MBL 136 0.8 nozzle.json" + }, + { + "name": "Meltingplot MBL 136 1.0 nozzle", + "sub_path": "machine/Meltingplot MBL 136 1.0 nozzle.json" + }, + { + "name": "Meltingplot MBL 136 1.2 nozzle", + "sub_path": "machine/Meltingplot MBL 136 1.2 nozzle.json" + }, + { + "name": "Meltingplot MBL 308 0.4 nozzle", + "sub_path": "machine/Meltingplot MBL 308 0.4 nozzle.json" + }, + { + "name": "Meltingplot MBL 308 0.6 nozzle", + "sub_path": "machine/Meltingplot MBL 308 0.6 nozzle.json" + }, + { + "name": "Meltingplot MBL 308 0.8 nozzle", + "sub_path": "machine/Meltingplot MBL 308 0.8 nozzle.json" + }, + { + "name": "Meltingplot MBL 308 1.0 nozzle", + "sub_path": "machine/Meltingplot MBL 308 1.0 nozzle.json" + }, + { + "name": "Meltingplot MBL 308 1.2 nozzle", + "sub_path": "machine/Meltingplot MBL 308 1.2 nozzle.json" + }, + { + "name": "Meltingplot MBL 480 0.4 nozzle", + "sub_path": "machine/Meltingplot MBL 480 0.4 nozzle.json" + }, + { + "name": "Meltingplot MBL 480 0.6 nozzle", + "sub_path": "machine/Meltingplot MBL 480 0.6 nozzle.json" + }, + { + "name": "Meltingplot MBL 480 0.8 nozzle", + "sub_path": "machine/Meltingplot MBL 480 0.8 nozzle.json" + }, + { + "name": "Meltingplot MBL 480 1.0 nozzle", + "sub_path": "machine/Meltingplot MBL 480 1.0 nozzle.json" + }, + { + "name": "Meltingplot MBL 480 1.2 nozzle", + "sub_path": "machine/Meltingplot MBL 480 1.2 nozzle.json" + } + ] +} diff --git a/resources/profiles/Meltingplot/Meltingplot CHX 350_cover.png b/resources/profiles/Meltingplot/Meltingplot CHX 350_cover.png new file mode 100644 index 0000000000..2f625aedc4 Binary files /dev/null and b/resources/profiles/Meltingplot/Meltingplot CHX 350_cover.png differ diff --git a/resources/profiles/Meltingplot/Meltingplot MBL 133_cover.png b/resources/profiles/Meltingplot/Meltingplot MBL 133_cover.png new file mode 100644 index 0000000000..eb9865c0cb Binary files /dev/null and b/resources/profiles/Meltingplot/Meltingplot MBL 133_cover.png differ diff --git a/resources/profiles/Meltingplot/Meltingplot MBL 136_cover.png b/resources/profiles/Meltingplot/Meltingplot MBL 136_cover.png new file mode 100644 index 0000000000..746dfb1fbb Binary files /dev/null and b/resources/profiles/Meltingplot/Meltingplot MBL 136_cover.png differ diff --git a/resources/profiles/Meltingplot/Meltingplot MBL 308_cover.png b/resources/profiles/Meltingplot/Meltingplot MBL 308_cover.png new file mode 100644 index 0000000000..cb4df7250e Binary files /dev/null and b/resources/profiles/Meltingplot/Meltingplot MBL 308_cover.png differ diff --git a/resources/profiles/Meltingplot/Meltingplot MBL 480_cover.png b/resources/profiles/Meltingplot/Meltingplot MBL 480_cover.png new file mode 100644 index 0000000000..fb7e11d5b2 Binary files /dev/null and b/resources/profiles/Meltingplot/Meltingplot MBL 480_cover.png differ diff --git a/resources/profiles/Meltingplot/chx350-printbed.stl b/resources/profiles/Meltingplot/chx350-printbed.stl new file mode 100644 index 0000000000..34255a2d73 Binary files /dev/null and b/resources/profiles/Meltingplot/chx350-printbed.stl differ diff --git a/resources/profiles/Meltingplot/chx350-texture.svg b/resources/profiles/Meltingplot/chx350-texture.svg new file mode 100644 index 0000000000..130afe556e --- /dev/null +++ b/resources/profiles/Meltingplot/chx350-texture.svg @@ -0,0 +1,5 @@ + + +Meltingplot CHX350 build plate — 1C Navy HUD (outlined) + + \ No newline at end of file diff --git a/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt @0.4 nozzle.json b/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt @0.4 nozzle.json new file mode 100644 index 0000000000..1f759767fa --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt @0.4 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Extrudr PLA NX2 Matt @0.4 nozzle", + "inherits": "Extrudr PLA NX2 Matt", + "from": "system", + "setting_id": "AL4mb7soA7L0FKTb", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "10" + ], + "slow_down_layer_time": [ + "9" + ], + "compatible_printers": [ + "Meltingplot MBL 133 0.4 nozzle", + "Meltingplot MBL 136 0.4 nozzle", + "Meltingplot MBL 308 0.4 nozzle", + "Meltingplot MBL 480 0.4 nozzle", + "Meltingplot CHX 350 0.4 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt @0.6 nozzle.json b/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt @0.6 nozzle.json new file mode 100644 index 0000000000..c7984aa06d --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt @0.6 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Extrudr PLA NX2 Matt @0.6 nozzle", + "inherits": "Extrudr PLA NX2 Matt", + "from": "system", + "setting_id": "OCnoqOQbcfgikNmA", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "15" + ], + "slow_down_layer_time": [ + "20" + ], + "compatible_printers": [ + "Meltingplot MBL 133 0.6 nozzle", + "Meltingplot MBL 136 0.6 nozzle", + "Meltingplot MBL 308 0.6 nozzle", + "Meltingplot MBL 480 0.6 nozzle", + "Meltingplot CHX 350 0.6 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt @0.8 nozzle.json b/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt @0.8 nozzle.json new file mode 100644 index 0000000000..a28a1feca0 --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt @0.8 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Extrudr PLA NX2 Matt @0.8 nozzle", + "inherits": "Extrudr PLA NX2 Matt", + "from": "system", + "setting_id": "HO2NCV1i1l21mokh", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "20" + ], + "slow_down_layer_time": [ + "38" + ], + "compatible_printers": [ + "Meltingplot MBL 133 0.8 nozzle", + "Meltingplot MBL 136 0.8 nozzle", + "Meltingplot MBL 308 0.8 nozzle", + "Meltingplot MBL 480 0.8 nozzle", + "Meltingplot CHX 350 0.8 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt @1.0 nozzle.json b/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt @1.0 nozzle.json new file mode 100644 index 0000000000..545acdf113 --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt @1.0 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Extrudr PLA NX2 Matt @1.0 nozzle", + "inherits": "Extrudr PLA NX2 Matt", + "from": "system", + "setting_id": "dRH4HfWHQPwo33cP", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "25" + ], + "slow_down_layer_time": [ + "56" + ], + "compatible_printers": [ + "Meltingplot MBL 133 1.0 nozzle", + "Meltingplot MBL 136 1.0 nozzle", + "Meltingplot MBL 308 1.0 nozzle", + "Meltingplot MBL 480 1.0 nozzle", + "Meltingplot CHX 350 1.0 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA Marble @base.json b/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt.json similarity index 51% rename from resources/profiles/BBL/filament/Polymaker/PolyTerra PLA Marble @base.json rename to resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt.json index ea65b41ec4..b9f864f79f 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA Marble @base.json +++ b/resources/profiles/Meltingplot/filament/Extrudr PLA NX2 Matt.json @@ -1,77 +1,79 @@ { "type": "filament", - "name": "PolyTerra PLA Marble @base", - "inherits": "fdm_filament_pla", + "name": "Extrudr PLA NX2 Matt", + "inherits": "Generic PLA Matte @System", "from": "system", - "filament_id": "OFxe4rXr", - "instantiation": "false", - "bed_type": [ - "Cool Plate" + "setting_id": "qmPRaTcPlmtk6zB2", + "filament_id": "OF1PznHI", + "instantiation": "true", + "filament_vendor": [ + "Extrudr" + ], + "nozzle_temperature_range_low": [ + "200" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "filament_max_volumetric_speed": [ + "30" + ], + "filament_adaptive_volumetric_speed": [ + "1" + ], + "filament_density": [ + "1.3" + ], + "filament_cost": [ + "13" + ], + "temperature_vitrification": [ + "50" + ], + "full_fan_speed_layer": [ + "1" + ], + "overhang_fan_threshold": [ + "25%" + ], + "fan_cooling_layer_time": [ + "100" + ], + "slow_down_layer_time": [ + "83" ], "cool_plate_temp": [ "60" ], - "cool_plate_temp_initial_layer": [ - "60" - ], "eng_plate_temp": [ "60" ], - "eng_plate_temp_initial_layer": [ - "60" - ], - "fan_cooling_layer_time": [ - "80" - ], - "fan_max_speed": [ - "80" - ], - "fan_min_speed": [ - "60" - ], - "filament_cost": [ - "21.99" - ], - "filament_density": [ - "1.37" - ], - "filament_flow_ratio": [ - "0.98" - ], - "filament_max_volumetric_speed": [ - "22" - ], - "filament_vendor": [ - "Polymaker" - ], "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" ], - "nozzle_temperature_range_high": [ - "230" - ], - "overhang_fan_speed": [ - "75" - ], - "slow_down_layer_time": [ - "8" - ], - "slow_down_min_speed": [ - "5" - ], - "temperature_vitrification": [ - "61" - ], - "textured_plate_temp": [ - "60" - ], "textured_plate_temp_initial_layer": [ "60" ], - "filament_type": [ - "PLA" + "filament_diameter": [ + "2.85" + ], + "compatible_printers": [ + "Meltingplot MBL 133 1.2 nozzle", + "Meltingplot MBL 136 1.2 nozzle", + "Meltingplot MBL 308 1.2 nozzle", + "Meltingplot MBL 480 1.2 nozzle", + "Meltingplot CHX 350 1.2 nozzle" ] } diff --git a/resources/profiles/Meltingplot/filament/Meltingplot ABS @0.4 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot ABS @0.4 nozzle.json new file mode 100644 index 0000000000..837e55a36f --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot ABS @0.4 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Meltingplot ABS @0.4 nozzle", + "inherits": "Meltingplot ABS", + "from": "system", + "setting_id": "NjuuWYHSc7IlwWAy", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "11" + ], + "slow_down_layer_time": [ + "5" + ], + "compatible_printers": [ + "Meltingplot MBL 133 0.4 nozzle", + "Meltingplot MBL 136 0.4 nozzle", + "Meltingplot MBL 308 0.4 nozzle", + "Meltingplot MBL 480 0.4 nozzle", + "Meltingplot CHX 350 0.4 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Meltingplot ABS @0.6 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot ABS @0.6 nozzle.json new file mode 100644 index 0000000000..d73964b709 --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot ABS @0.6 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Meltingplot ABS @0.6 nozzle", + "inherits": "Meltingplot ABS", + "from": "system", + "setting_id": "md24RPsRyxBhGRoW", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "16" + ], + "slow_down_layer_time": [ + "11" + ], + "compatible_printers": [ + "Meltingplot MBL 133 0.6 nozzle", + "Meltingplot MBL 136 0.6 nozzle", + "Meltingplot MBL 308 0.6 nozzle", + "Meltingplot MBL 480 0.6 nozzle", + "Meltingplot CHX 350 0.6 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Meltingplot ABS @0.8 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot ABS @0.8 nozzle.json new file mode 100644 index 0000000000..82c5ed8935 --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot ABS @0.8 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Meltingplot ABS @0.8 nozzle", + "inherits": "Meltingplot ABS", + "from": "system", + "setting_id": "Y2LYeWL7Zxel3m0c", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "22" + ], + "slow_down_layer_time": [ + "20" + ], + "compatible_printers": [ + "Meltingplot MBL 133 0.8 nozzle", + "Meltingplot MBL 136 0.8 nozzle", + "Meltingplot MBL 308 0.8 nozzle", + "Meltingplot MBL 480 0.8 nozzle", + "Meltingplot CHX 350 0.8 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Meltingplot ABS @1.0 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot ABS @1.0 nozzle.json new file mode 100644 index 0000000000..a74a3a1925 --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot ABS @1.0 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Meltingplot ABS @1.0 nozzle", + "inherits": "Meltingplot ABS", + "from": "system", + "setting_id": "G2UYPHTEWjun65jj", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "27" + ], + "slow_down_layer_time": [ + "30" + ], + "compatible_printers": [ + "Meltingplot MBL 133 1.0 nozzle", + "Meltingplot MBL 136 1.0 nozzle", + "Meltingplot MBL 308 1.0 nozzle", + "Meltingplot MBL 480 1.0 nozzle", + "Meltingplot CHX 350 1.0 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Meltingplot ABS.json b/resources/profiles/Meltingplot/filament/Meltingplot ABS.json new file mode 100644 index 0000000000..c947cd55e9 --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot ABS.json @@ -0,0 +1,70 @@ +{ + "type": "filament", + "name": "Meltingplot ABS", + "inherits": "Generic ABS @System", + "from": "system", + "setting_id": "zVQixgSSn1jm1c7n", + "filament_id": "OFVIMei2", + "instantiation": "true", + "filament_vendor": [ + "Meltingplot" + ], + "filament_flow_ratio": [ + "0.93" + ], + "filament_shrink": [ + "99%" + ], + "filament_shrinkage_compensation_z": [ + "99%" + ], + "filament_density": [ + "1.1" + ], + "filament_cost": [ + "30" + ], + "default_filament_colour": [ + "#F8F8F8" + ], + "slow_down_layer_time": [ + "44" + ], + "cool_plate_temp": [ + "110" + ], + "eng_plate_temp": [ + "110" + ], + "hot_plate_temp": [ + "110" + ], + "textured_plate_temp": [ + "110" + ], + "cool_plate_temp_initial_layer": [ + "110" + ], + "eng_plate_temp_initial_layer": [ + "110" + ], + "hot_plate_temp_initial_layer": [ + "110" + ], + "textured_plate_temp_initial_layer": [ + "110" + ], + "filament_diameter": [ + "2.85" + ], + "filament_max_volumetric_speed": [ + "33" + ], + "compatible_printers": [ + "Meltingplot MBL 133 1.2 nozzle", + "Meltingplot MBL 136 1.2 nozzle", + "Meltingplot MBL 308 1.2 nozzle", + "Meltingplot MBL 480 1.2 nozzle", + "Meltingplot CHX 350 1.2 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Meltingplot ASA @0.4 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot ASA @0.4 nozzle.json new file mode 100644 index 0000000000..f567231b8d --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot ASA @0.4 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Meltingplot ASA @0.4 nozzle", + "inherits": "Meltingplot ASA", + "from": "system", + "setting_id": "4EBXMyiXoLrw5rLC", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "11" + ], + "slow_down_layer_time": [ + "2" + ], + "compatible_printers": [ + "Meltingplot MBL 133 0.4 nozzle", + "Meltingplot MBL 136 0.4 nozzle", + "Meltingplot MBL 308 0.4 nozzle", + "Meltingplot MBL 480 0.4 nozzle", + "Meltingplot CHX 350 0.4 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Meltingplot ASA @0.6 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot ASA @0.6 nozzle.json new file mode 100644 index 0000000000..96553662a8 --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot ASA @0.6 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Meltingplot ASA @0.6 nozzle", + "inherits": "Meltingplot ASA", + "from": "system", + "setting_id": "2UdzXwYGT5nqtcdK", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "16" + ], + "slow_down_layer_time": [ + "5" + ], + "compatible_printers": [ + "Meltingplot MBL 133 0.6 nozzle", + "Meltingplot MBL 136 0.6 nozzle", + "Meltingplot MBL 308 0.6 nozzle", + "Meltingplot MBL 480 0.6 nozzle", + "Meltingplot CHX 350 0.6 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Meltingplot ASA @0.8 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot ASA @0.8 nozzle.json new file mode 100644 index 0000000000..9e6d846c7f --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot ASA @0.8 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Meltingplot ASA @0.8 nozzle", + "inherits": "Meltingplot ASA", + "from": "system", + "setting_id": "4hk1aKrMkppVYH4z", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "22" + ], + "slow_down_layer_time": [ + "10" + ], + "compatible_printers": [ + "Meltingplot MBL 133 0.8 nozzle", + "Meltingplot MBL 136 0.8 nozzle", + "Meltingplot MBL 308 0.8 nozzle", + "Meltingplot MBL 480 0.8 nozzle", + "Meltingplot CHX 350 0.8 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Meltingplot ASA @1.0 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot ASA @1.0 nozzle.json new file mode 100644 index 0000000000..e8bc7d7a32 --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot ASA @1.0 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Meltingplot ASA @1.0 nozzle", + "inherits": "Meltingplot ASA", + "from": "system", + "setting_id": "JRSnSdwkvrQx8uH8", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "27" + ], + "slow_down_layer_time": [ + "15" + ], + "compatible_printers": [ + "Meltingplot MBL 133 1.0 nozzle", + "Meltingplot MBL 136 1.0 nozzle", + "Meltingplot MBL 308 1.0 nozzle", + "Meltingplot MBL 480 1.0 nozzle", + "Meltingplot CHX 350 1.0 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Meltingplot ASA.json b/resources/profiles/Meltingplot/filament/Meltingplot ASA.json new file mode 100644 index 0000000000..180ef14e39 --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot ASA.json @@ -0,0 +1,70 @@ +{ + "type": "filament", + "name": "Meltingplot ASA", + "inherits": "Generic ASA @System", + "from": "system", + "setting_id": "5VuPxdOXfTIidM4X", + "filament_id": "OFRdywGp", + "instantiation": "true", + "filament_vendor": [ + "Meltingplot" + ], + "nozzle_temperature": [ + "255" + ], + "nozzle_temperature_initial_layer": [ + "255" + ], + "filament_max_volumetric_speed": [ + "33" + ], + "filament_density": [ + "1.11" + ], + "filament_cost": [ + "46.65" + ], + "default_filament_colour": [ + "#123123" + ], + "slow_down_layer_time": [ + "22" + ], + "slow_down_min_speed": [ + "15" + ], + "cool_plate_temp": [ + "90" + ], + "eng_plate_temp": [ + "90" + ], + "hot_plate_temp": [ + "90" + ], + "textured_plate_temp": [ + "90" + ], + "cool_plate_temp_initial_layer": [ + "90" + ], + "eng_plate_temp_initial_layer": [ + "90" + ], + "hot_plate_temp_initial_layer": [ + "90" + ], + "textured_plate_temp_initial_layer": [ + "90" + ], + "filament_diameter": [ + "2.85" + ], + "compatible_printers": [ + "Meltingplot MBL 133 1.2 nozzle", + "Meltingplot MBL 136 1.2 nozzle", + "Meltingplot MBL 308 1.2 nozzle", + "Meltingplot MBL 480 1.2 nozzle", + "Meltingplot CHX 350 1.2 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT @0.4 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT @0.4 nozzle.json new file mode 100644 index 0000000000..5fd012ed93 --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT @0.4 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Meltingplot PA6 CF HT @0.4 nozzle", + "inherits": "Meltingplot PA6 CF HT", + "from": "system", + "setting_id": "yUlzU6KMVx8bpxj1", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "7" + ], + "slow_down_layer_time": [ + "4" + ], + "compatible_printers": [ + "Meltingplot MBL 133 0.4 nozzle", + "Meltingplot MBL 136 0.4 nozzle", + "Meltingplot MBL 308 0.4 nozzle", + "Meltingplot MBL 480 0.4 nozzle", + "Meltingplot CHX 350 0.4 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT @0.6 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT @0.6 nozzle.json new file mode 100644 index 0000000000..4ece916d20 --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT @0.6 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Meltingplot PA6 CF HT @0.6 nozzle", + "inherits": "Meltingplot PA6 CF HT", + "from": "system", + "setting_id": "9XzYyYbJ4jnO4nhJ", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "11" + ], + "slow_down_layer_time": [ + "8" + ], + "compatible_printers": [ + "Meltingplot MBL 133 0.6 nozzle", + "Meltingplot MBL 136 0.6 nozzle", + "Meltingplot MBL 308 0.6 nozzle", + "Meltingplot MBL 480 0.6 nozzle", + "Meltingplot CHX 350 0.6 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT @0.8 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT @0.8 nozzle.json new file mode 100644 index 0000000000..b1b4d489f8 --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT @0.8 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Meltingplot PA6 CF HT @0.8 nozzle", + "inherits": "Meltingplot PA6 CF HT", + "from": "system", + "setting_id": "BMbLehqxegpSvMci", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "15" + ], + "slow_down_layer_time": [ + "15" + ], + "compatible_printers": [ + "Meltingplot MBL 133 0.8 nozzle", + "Meltingplot MBL 136 0.8 nozzle", + "Meltingplot MBL 308 0.8 nozzle", + "Meltingplot MBL 480 0.8 nozzle", + "Meltingplot CHX 350 0.8 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT @1.0 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT @1.0 nozzle.json new file mode 100644 index 0000000000..b2ab6f3cf5 --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT @1.0 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Meltingplot PA6 CF HT @1.0 nozzle", + "inherits": "Meltingplot PA6 CF HT", + "from": "system", + "setting_id": "7R3XuQlzD8IHq4PZ", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "18" + ], + "slow_down_layer_time": [ + "22" + ], + "compatible_printers": [ + "Meltingplot MBL 133 1.0 nozzle", + "Meltingplot MBL 136 1.0 nozzle", + "Meltingplot MBL 308 1.0 nozzle", + "Meltingplot MBL 480 1.0 nozzle", + "Meltingplot CHX 350 1.0 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT.json b/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT.json new file mode 100644 index 0000000000..6b2852b4b2 --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot PA6 CF HT.json @@ -0,0 +1,94 @@ +{ + "type": "filament", + "name": "Meltingplot PA6 CF HT", + "inherits": "Generic PA-CF @System", + "from": "system", + "setting_id": "kzlYLTM6H5CgpQ8y", + "filament_id": "OFdPevOo", + "instantiation": "true", + "filament_vendor": [ + "Meltingplot" + ], + "nozzle_temperature": [ + "275" + ], + "nozzle_temperature_initial_layer": [ + "275" + ], + "filament_max_volumetric_speed": [ + "22" + ], + "filament_density": [ + "1.25" + ], + "filament_cost": [ + "89" + ], + "default_filament_colour": [ + "#858078" + ], + "filament_shrink": [ + "99.9%" + ], + "filament_shrinkage_compensation_z": [ + "99.9%" + ], + "fan_min_speed": [ + "40" + ], + "fan_max_speed": [ + "100" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "95%" + ], + "additional_cooling_fan_speed": [ + "40" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "slow_down_layer_time": [ + "33" + ], + "cool_plate_temp": [ + "80" + ], + "eng_plate_temp": [ + "80" + ], + "hot_plate_temp": [ + "80" + ], + "textured_plate_temp": [ + "80" + ], + "cool_plate_temp_initial_layer": [ + "80" + ], + "eng_plate_temp_initial_layer": [ + "80" + ], + "hot_plate_temp_initial_layer": [ + "80" + ], + "textured_plate_temp_initial_layer": [ + "80" + ], + "filament_diameter": [ + "2.85" + ], + "compatible_printers": [ + "Meltingplot MBL 133 1.2 nozzle", + "Meltingplot MBL 136 1.2 nozzle", + "Meltingplot MBL 308 1.2 nozzle", + "Meltingplot MBL 480 1.2 nozzle", + "Meltingplot CHX 350 1.2 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15 @0.4 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15 @0.4 nozzle.json new file mode 100644 index 0000000000..f828906a7c --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15 @0.4 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Meltingplot PET-CF15 @0.4 nozzle", + "inherits": "Meltingplot PET-CF15", + "from": "system", + "setting_id": "2fkQa1BwTGZbSi2z", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "10" + ], + "slow_down_layer_time": [ + "1" + ], + "compatible_printers": [ + "Meltingplot MBL 133 0.4 nozzle", + "Meltingplot MBL 136 0.4 nozzle", + "Meltingplot MBL 308 0.4 nozzle", + "Meltingplot MBL 480 0.4 nozzle", + "Meltingplot CHX 350 0.4 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15 @0.6 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15 @0.6 nozzle.json new file mode 100644 index 0000000000..11b9bb2550 --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15 @0.6 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Meltingplot PET-CF15 @0.6 nozzle", + "inherits": "Meltingplot PET-CF15", + "from": "system", + "setting_id": "PcNAj2kwuUNBAjQE", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "16" + ], + "slow_down_layer_time": [ + "3" + ], + "compatible_printers": [ + "Meltingplot MBL 133 0.6 nozzle", + "Meltingplot MBL 136 0.6 nozzle", + "Meltingplot MBL 308 0.6 nozzle", + "Meltingplot MBL 480 0.6 nozzle", + "Meltingplot CHX 350 0.6 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15 @0.8 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15 @0.8 nozzle.json new file mode 100644 index 0000000000..20039024ce --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15 @0.8 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Meltingplot PET-CF15 @0.8 nozzle", + "inherits": "Meltingplot PET-CF15", + "from": "system", + "setting_id": "70EwKatuncZBKgoD", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "21" + ], + "slow_down_layer_time": [ + "5" + ], + "compatible_printers": [ + "Meltingplot MBL 133 0.8 nozzle", + "Meltingplot MBL 136 0.8 nozzle", + "Meltingplot MBL 308 0.8 nozzle", + "Meltingplot MBL 480 0.8 nozzle", + "Meltingplot CHX 350 0.8 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15 @1.0 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15 @1.0 nozzle.json new file mode 100644 index 0000000000..9913b5f812 --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15 @1.0 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Meltingplot PET-CF15 @1.0 nozzle", + "inherits": "Meltingplot PET-CF15", + "from": "system", + "setting_id": "X2yhWBjK4j46bUYW", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "26" + ], + "slow_down_layer_time": [ + "7" + ], + "compatible_printers": [ + "Meltingplot MBL 133 1.0 nozzle", + "Meltingplot MBL 136 1.0 nozzle", + "Meltingplot MBL 308 1.0 nozzle", + "Meltingplot MBL 480 1.0 nozzle", + "Meltingplot CHX 350 1.0 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/Polymaker/Fiberon PETG-rCF08 @base.json b/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15.json similarity index 54% rename from resources/profiles/BBL/filament/Polymaker/Fiberon PETG-rCF08 @base.json rename to resources/profiles/Meltingplot/filament/Meltingplot PET-CF15.json index fe8eca06cb..f932be9d05 100644 --- a/resources/profiles/BBL/filament/Polymaker/Fiberon PETG-rCF08 @base.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot PET-CF15.json @@ -1,101 +1,91 @@ { "type": "filament", - "name": "Fiberon PETG-rCF08 @base", - "inherits": "fdm_filament_pet", + "name": "Meltingplot PET-CF15", + "inherits": "Generic PETG-CF @System", "from": "system", - "filament_id": "OFw4WD4T", - "instantiation": "false", - "bed_type": [ - "Cool Plate" - ], - "close_fan_the_first_x_layers": [ - "3" - ], - "cool_plate_temp": [ - "0" - ], - "cool_plate_temp_initial_layer": [ - "0" - ], - "eng_plate_temp": [ - "70" - ], - "eng_plate_temp_initial_layer": [ - "70" - ], - "fan_cooling_layer_time": [ - "12" - ], - "fan_max_speed": [ - "80" - ], - "fan_min_speed": [ - "0" - ], - "filament_cost": [ - "39.99" - ], - "filament_density": [ - "1.3" - ], - "filament_flow_ratio": [ - "0.95" - ], - "filament_max_volumetric_speed": [ - "12" + "setting_id": "IdqfEh7xRXKTYmV3", + "filament_id": "OFJdf5nt", + "instantiation": "true", + "filament_vendor": [ + "Meltingplot" ], "filament_type": [ - "PETG-CF" - ], - "filament_vendor": [ - "Polymaker" - ], - "full_fan_speed_layer": [ - "0" - ], - "hot_plate_temp": [ - "70" - ], - "hot_plate_temp_initial_layer": [ - "70" + "PET-CF" ], "nozzle_temperature": [ - "270" + "280" ], "nozzle_temperature_initial_layer": [ - "270" - ], - "nozzle_temperature_range_high": [ - "270" + "280" ], "nozzle_temperature_range_low": [ - "240" + "260" ], - "overhang_fan_speed": [ - "70" + "nozzle_temperature_range_high": [ + "290" ], - "overhang_fan_threshold": [ - "95%" + "filament_max_volumetric_speed": [ + "31" ], - "reduce_fan_stop_start_freq": [ - "1" + "filament_density": [ + "1.4" ], - "slow_down_for_layer_cooling": [ - "1" + "filament_cost": [ + "77.5" ], - "slow_down_layer_time": [ - "2" + "filament_shrink": [ + "99.9%" ], - "slow_down_min_speed": [ - "20" + "filament_shrinkage_compensation_z": [ + "99.9%" ], "temperature_vitrification": [ - "69.7" + "125" + ], + "fan_min_speed": [ + "100" + ], + "fan_max_speed": [ + "100" + ], + "slow_down_layer_time": [ + "11" + ], + "cool_plate_temp": [ + "90" + ], + "eng_plate_temp": [ + "90" + ], + "hot_plate_temp": [ + "90" ], "textured_plate_temp": [ - "70" + "90" + ], + "cool_plate_temp_initial_layer": [ + "90" + ], + "eng_plate_temp_initial_layer": [ + "90" + ], + "hot_plate_temp_initial_layer": [ + "90" ], "textured_plate_temp_initial_layer": [ - "70" + "90" + ], + "filament_diameter": [ + "2.85" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "compatible_printers": [ + "Meltingplot MBL 133 1.2 nozzle", + "Meltingplot MBL 136 1.2 nozzle", + "Meltingplot MBL 308 1.2 nozzle", + "Meltingplot MBL 480 1.2 nozzle", + "Meltingplot CHX 350 1.2 nozzle" ] } diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PETG @0.4 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PETG @0.4 nozzle.json new file mode 100644 index 0000000000..55df65bb99 --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot PETG @0.4 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Meltingplot PETG @0.4 nozzle", + "inherits": "Meltingplot PETG", + "from": "system", + "setting_id": "2ohDGd34awK2DVbV", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "9" + ], + "slow_down_layer_time": [ + "4" + ], + "compatible_printers": [ + "Meltingplot MBL 133 0.4 nozzle", + "Meltingplot MBL 136 0.4 nozzle", + "Meltingplot MBL 308 0.4 nozzle", + "Meltingplot MBL 480 0.4 nozzle", + "Meltingplot CHX 350 0.4 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PETG @0.6 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PETG @0.6 nozzle.json new file mode 100644 index 0000000000..5d77c69c8f --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot PETG @0.6 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Meltingplot PETG @0.6 nozzle", + "inherits": "Meltingplot PETG", + "from": "system", + "setting_id": "DZe1WokuOM5byttU", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "14" + ], + "slow_down_layer_time": [ + "8" + ], + "compatible_printers": [ + "Meltingplot MBL 133 0.6 nozzle", + "Meltingplot MBL 136 0.6 nozzle", + "Meltingplot MBL 308 0.6 nozzle", + "Meltingplot MBL 480 0.6 nozzle", + "Meltingplot CHX 350 0.6 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PETG @0.8 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PETG @0.8 nozzle.json new file mode 100644 index 0000000000..4e5f16b411 --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot PETG @0.8 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Meltingplot PETG @0.8 nozzle", + "inherits": "Meltingplot PETG", + "from": "system", + "setting_id": "LwFY7N8Uisy6ivOV", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "18" + ], + "slow_down_layer_time": [ + "15" + ], + "compatible_printers": [ + "Meltingplot MBL 133 0.8 nozzle", + "Meltingplot MBL 136 0.8 nozzle", + "Meltingplot MBL 308 0.8 nozzle", + "Meltingplot MBL 480 0.8 nozzle", + "Meltingplot CHX 350 0.8 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PETG @1.0 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PETG @1.0 nozzle.json new file mode 100644 index 0000000000..cdc4620078 --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot PETG @1.0 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Meltingplot PETG @1.0 nozzle", + "inherits": "Meltingplot PETG", + "from": "system", + "setting_id": "kR8Vbizk0CPciCbD", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "23" + ], + "slow_down_layer_time": [ + "22" + ], + "compatible_printers": [ + "Meltingplot MBL 133 1.0 nozzle", + "Meltingplot MBL 136 1.0 nozzle", + "Meltingplot MBL 308 1.0 nozzle", + "Meltingplot MBL 480 1.0 nozzle", + "Meltingplot CHX 350 1.0 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PETG.json b/resources/profiles/Meltingplot/filament/Meltingplot PETG.json new file mode 100644 index 0000000000..d6ed4e25cb --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot PETG.json @@ -0,0 +1,70 @@ +{ + "type": "filament", + "name": "Meltingplot PETG", + "inherits": "Generic PETG @System", + "from": "system", + "setting_id": "dsW7JrzWhKAY1fey", + "filament_id": "OFvlreVF", + "instantiation": "true", + "filament_vendor": [ + "Meltingplot" + ], + "nozzle_temperature": [ + "245" + ], + "nozzle_temperature_initial_layer": [ + "245" + ], + "filament_max_volumetric_speed": [ + "27" + ], + "filament_cost": [ + "35" + ], + "default_filament_colour": [ + "#123123" + ], + "fan_min_speed": [ + "50" + ], + "fan_cooling_layer_time": [ + "60" + ], + "slow_down_layer_time": [ + "33" + ], + "cool_plate_temp": [ + "90" + ], + "eng_plate_temp": [ + "90" + ], + "hot_plate_temp": [ + "90" + ], + "textured_plate_temp": [ + "90" + ], + "cool_plate_temp_initial_layer": [ + "90" + ], + "eng_plate_temp_initial_layer": [ + "90" + ], + "hot_plate_temp_initial_layer": [ + "90" + ], + "textured_plate_temp_initial_layer": [ + "90" + ], + "filament_diameter": [ + "2.85" + ], + "compatible_printers": [ + "Meltingplot MBL 133 1.2 nozzle", + "Meltingplot MBL 136 1.2 nozzle", + "Meltingplot MBL 308 1.2 nozzle", + "Meltingplot MBL 480 1.2 nozzle", + "Meltingplot CHX 350 1.2 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PLA @0.4 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PLA @0.4 nozzle.json new file mode 100644 index 0000000000..4ec8bc1fb5 --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot PLA @0.4 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Meltingplot PLA @0.4 nozzle", + "inherits": "Meltingplot PLA", + "from": "system", + "setting_id": "T3OEfrhyZ6ISyv20", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "11" + ], + "slow_down_layer_time": [ + "8" + ], + "compatible_printers": [ + "Meltingplot MBL 133 0.4 nozzle", + "Meltingplot MBL 136 0.4 nozzle", + "Meltingplot MBL 308 0.4 nozzle", + "Meltingplot MBL 480 0.4 nozzle", + "Meltingplot CHX 350 0.4 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PLA @0.6 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PLA @0.6 nozzle.json new file mode 100644 index 0000000000..054bc03ab6 --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot PLA @0.6 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Meltingplot PLA @0.6 nozzle", + "inherits": "Meltingplot PLA", + "from": "system", + "setting_id": "hsgzwjPc26BJ4sQu", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "16" + ], + "slow_down_layer_time": [ + "17" + ], + "compatible_printers": [ + "Meltingplot MBL 133 0.6 nozzle", + "Meltingplot MBL 136 0.6 nozzle", + "Meltingplot MBL 308 0.6 nozzle", + "Meltingplot MBL 480 0.6 nozzle", + "Meltingplot CHX 350 0.6 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PLA @0.8 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PLA @0.8 nozzle.json new file mode 100644 index 0000000000..7fa45fc182 --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot PLA @0.8 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Meltingplot PLA @0.8 nozzle", + "inherits": "Meltingplot PLA", + "from": "system", + "setting_id": "cz6RkfsQ0hJE0hYG", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "22" + ], + "slow_down_layer_time": [ + "30" + ], + "compatible_printers": [ + "Meltingplot MBL 133 0.8 nozzle", + "Meltingplot MBL 136 0.8 nozzle", + "Meltingplot MBL 308 0.8 nozzle", + "Meltingplot MBL 480 0.8 nozzle", + "Meltingplot CHX 350 0.8 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Meltingplot PLA @1.0 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot PLA @1.0 nozzle.json new file mode 100644 index 0000000000..bbb19233db --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot PLA @1.0 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Meltingplot PLA @1.0 nozzle", + "inherits": "Meltingplot PLA", + "from": "system", + "setting_id": "H3n0VPl3CymiK9VN", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "27" + ], + "slow_down_layer_time": [ + "45" + ], + "compatible_printers": [ + "Meltingplot MBL 133 1.0 nozzle", + "Meltingplot MBL 136 1.0 nozzle", + "Meltingplot MBL 308 1.0 nozzle", + "Meltingplot MBL 480 1.0 nozzle", + "Meltingplot CHX 350 1.0 nozzle" + ] +} diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite CosPLA @base.json b/resources/profiles/Meltingplot/filament/Meltingplot PLA.json similarity index 52% rename from resources/profiles/BBL/filament/Polymaker/PolyLite CosPLA @base.json rename to resources/profiles/Meltingplot/filament/Meltingplot PLA.json index 92739d13bb..60575e7aa6 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite CosPLA @base.json +++ b/resources/profiles/Meltingplot/filament/Meltingplot PLA.json @@ -1,71 +1,67 @@ { "type": "filament", - "name": "PolyLite CosPLA @base", - "inherits": "fdm_filament_pla", + "name": "Meltingplot PLA", + "inherits": "Generic PLA @System", "from": "system", - "filament_id": "OFJgijky", - "instantiation": "false", - "bed_type": [ - "Cool Plate" + "setting_id": "ONpaHlfJVJyh7Shb", + "filament_id": "OFwXRVbB", + "instantiation": "true", + "filament_vendor": [ + "Meltingplot" + ], + "nozzle_temperature": [ + "210" + ], + "nozzle_temperature_initial_layer": [ + "215" + ], + "filament_cost": [ + "34.9" + ], + "default_filament_colour": [ + "#F8F8F8" + ], + "slow_down_layer_time": [ + "66" + ], + "slow_down_min_speed": [ + "15" ], "cool_plate_temp": [ "60" ], - "cool_plate_temp_initial_layer": [ - "60" - ], "eng_plate_temp": [ "60" ], - "eng_plate_temp_initial_layer": [ - "60" - ], - "filament_cost": [ - "20.99" - ], - "filament_flow_ratio": [ - "0.95" - ], - "filament_max_volumetric_speed": [ - "16" - ], - "filament_vendor": [ - "Polymaker" - ], "hot_plate_temp": [ "60" ], - "hot_plate_temp_initial_layer": [ - "60" - ], - "nozzle_temperature": [ - "230" - ], - "nozzle_temperature_initial_layer": [ - "230" - ], - "nozzle_temperature_range_high": [ - "230" - ], - "overhang_fan_speed": [ - "75" - ], - "slow_down_layer_time": [ - "5" - ], - "slow_down_min_speed": [ - "5" - ], - "temperature_vitrification": [ - "59" - ], "textured_plate_temp": [ "60" ], - "textured_plate_temp_initial_layer": [ - "60" + "cool_plate_temp_initial_layer": [ + "65" ], - "filament_type": [ - "PLA" + "eng_plate_temp_initial_layer": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "textured_plate_temp_initial_layer": [ + "65" + ], + "filament_diameter": [ + "2.85" + ], + "filament_max_volumetric_speed": [ + "33" + ], + "compatible_printers": [ + "Meltingplot MBL 133 1.2 nozzle", + "Meltingplot MBL 136 1.2 nozzle", + "Meltingplot MBL 308 1.2 nozzle", + "Meltingplot MBL 480 1.2 nozzle", + "Meltingplot CHX 350 1.2 nozzle" ] } diff --git a/resources/profiles/Meltingplot/filament/Meltingplot TitanX @0.4 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot TitanX @0.4 nozzle.json new file mode 100644 index 0000000000..6804806002 --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot TitanX @0.4 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Meltingplot TitanX @0.4 nozzle", + "inherits": "Meltingplot TitanX", + "from": "system", + "setting_id": "i5ttRpqpqF3Kg8IF", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "11" + ], + "slow_down_layer_time": [ + "4" + ], + "compatible_printers": [ + "Meltingplot MBL 133 0.4 nozzle", + "Meltingplot MBL 136 0.4 nozzle", + "Meltingplot MBL 308 0.4 nozzle", + "Meltingplot MBL 480 0.4 nozzle", + "Meltingplot CHX 350 0.4 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Meltingplot TitanX @0.6 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot TitanX @0.6 nozzle.json new file mode 100644 index 0000000000..a80febac3f --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot TitanX @0.6 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Meltingplot TitanX @0.6 nozzle", + "inherits": "Meltingplot TitanX", + "from": "system", + "setting_id": "Vbm6NJb4il6QAU6v", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "16" + ], + "slow_down_layer_time": [ + "8" + ], + "compatible_printers": [ + "Meltingplot MBL 133 0.6 nozzle", + "Meltingplot MBL 136 0.6 nozzle", + "Meltingplot MBL 308 0.6 nozzle", + "Meltingplot MBL 480 0.6 nozzle", + "Meltingplot CHX 350 0.6 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Meltingplot TitanX @0.8 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot TitanX @0.8 nozzle.json new file mode 100644 index 0000000000..3815b36da9 --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot TitanX @0.8 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Meltingplot TitanX @0.8 nozzle", + "inherits": "Meltingplot TitanX", + "from": "system", + "setting_id": "jYrElhVPtK2Dpb9K", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "22" + ], + "slow_down_layer_time": [ + "15" + ], + "compatible_printers": [ + "Meltingplot MBL 133 0.8 nozzle", + "Meltingplot MBL 136 0.8 nozzle", + "Meltingplot MBL 308 0.8 nozzle", + "Meltingplot MBL 480 0.8 nozzle", + "Meltingplot CHX 350 0.8 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Meltingplot TitanX @1.0 nozzle.json b/resources/profiles/Meltingplot/filament/Meltingplot TitanX @1.0 nozzle.json new file mode 100644 index 0000000000..51ccd444e2 --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot TitanX @1.0 nozzle.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Meltingplot TitanX @1.0 nozzle", + "inherits": "Meltingplot TitanX", + "from": "system", + "setting_id": "lQDEFxTsxFsT5A4n", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "27" + ], + "slow_down_layer_time": [ + "22" + ], + "compatible_printers": [ + "Meltingplot MBL 133 1.0 nozzle", + "Meltingplot MBL 136 1.0 nozzle", + "Meltingplot MBL 308 1.0 nozzle", + "Meltingplot MBL 480 1.0 nozzle", + "Meltingplot CHX 350 1.0 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/filament/Meltingplot TitanX.json b/resources/profiles/Meltingplot/filament/Meltingplot TitanX.json new file mode 100644 index 0000000000..5082e6e19e --- /dev/null +++ b/resources/profiles/Meltingplot/filament/Meltingplot TitanX.json @@ -0,0 +1,61 @@ +{ + "type": "filament", + "name": "Meltingplot TitanX", + "inherits": "Generic ABS @System", + "from": "system", + "setting_id": "LDPRmxlvX97NXF0F", + "filament_id": "OFyYfgDM", + "instantiation": "true", + "filament_vendor": [ + "Meltingplot" + ], + "filament_flow_ratio": [ + "0.93" + ], + "filament_shrink": [ + "99.75%" + ], + "filament_density": [ + "1.07" + ], + "slow_down_layer_time": [ + "33" + ], + "cool_plate_temp": [ + "110" + ], + "eng_plate_temp": [ + "110" + ], + "hot_plate_temp": [ + "110" + ], + "textured_plate_temp": [ + "110" + ], + "cool_plate_temp_initial_layer": [ + "110" + ], + "eng_plate_temp_initial_layer": [ + "110" + ], + "hot_plate_temp_initial_layer": [ + "110" + ], + "textured_plate_temp_initial_layer": [ + "110" + ], + "filament_diameter": [ + "2.85" + ], + "filament_max_volumetric_speed": [ + "33" + ], + "compatible_printers": [ + "Meltingplot MBL 133 1.2 nozzle", + "Meltingplot MBL 136 1.2 nozzle", + "Meltingplot MBL 308 1.2 nozzle", + "Meltingplot MBL 480 1.2 nozzle", + "Meltingplot CHX 350 1.2 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/machine/Meltingplot CHX 350 0.4 nozzle.json b/resources/profiles/Meltingplot/machine/Meltingplot CHX 350 0.4 nozzle.json new file mode 100644 index 0000000000..c59db36162 --- /dev/null +++ b/resources/profiles/Meltingplot/machine/Meltingplot CHX 350 0.4 nozzle.json @@ -0,0 +1,30 @@ +{ + "type": "machine", + "name": "Meltingplot CHX 350 0.4 nozzle", + "inherits": "fdm_machine_meltingplot_chx", + "from": "system", + "setting_id": "gyTKYZ8qKgen4dOM", + "instantiation": "true", + "printer_model": "Meltingplot CHX 350", + "printer_variant": "0.4", + "nozzle_diameter": [ + "0.4" + ], + "min_layer_height": [ + "0.16" + ], + "max_layer_height": [ + "0.24" + ], + "printable_area": [ + "0x0", + "880x0", + "880x422", + "0x422" + ], + "printable_height": "943", + "default_print_profile": "0.18mm Fine 0.4 nozzle @Meltingplot CHX 350", + "default_filament_profile": [ + "Meltingplot PLA @0.4 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/machine/Meltingplot CHX 350 0.6 nozzle.json b/resources/profiles/Meltingplot/machine/Meltingplot CHX 350 0.6 nozzle.json new file mode 100644 index 0000000000..bddf34e56a --- /dev/null +++ b/resources/profiles/Meltingplot/machine/Meltingplot CHX 350 0.6 nozzle.json @@ -0,0 +1,30 @@ +{ + "type": "machine", + "name": "Meltingplot CHX 350 0.6 nozzle", + "inherits": "fdm_machine_meltingplot_chx", + "from": "system", + "setting_id": "OeqLbNEMEImXnJBz", + "instantiation": "true", + "printer_model": "Meltingplot CHX 350", + "printer_variant": "0.6", + "nozzle_diameter": [ + "0.6" + ], + "min_layer_height": [ + "0.24" + ], + "max_layer_height": [ + "0.36" + ], + "printable_area": [ + "0x0", + "880x0", + "880x422", + "0x422" + ], + "printable_height": "943", + "default_print_profile": "0.30mm Standard 0.6 nozzle @Meltingplot CHX 350", + "default_filament_profile": [ + "Meltingplot PLA @0.6 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/machine/Meltingplot CHX 350 0.8 nozzle.json b/resources/profiles/Meltingplot/machine/Meltingplot CHX 350 0.8 nozzle.json new file mode 100644 index 0000000000..bb3a56b5ce --- /dev/null +++ b/resources/profiles/Meltingplot/machine/Meltingplot CHX 350 0.8 nozzle.json @@ -0,0 +1,32 @@ +{ + "type": "machine", + "name": "Meltingplot CHX 350 0.8 nozzle", + "inherits": "fdm_machine_meltingplot_chx", + "from": "system", + "setting_id": "IlK23KWfTD7BLPpZ", + "instantiation": "true", + "printer_model": "Meltingplot CHX 350", + "printer_variant": "0.8", + "nozzle_diameter": [ + "0.8" + ], + "min_layer_height": [ + "0.32" + ], + "max_layer_height": [ + "0.48" + ], + "printable_area": [ + "0x0", + "880x0", + "880x422", + "0x422" + ], + "printable_height": "943", + "default_print_profile": "0.38mm Standard 0.8 nozzle @Meltingplot CHX 350", + "default_filament_profile": [ + "Meltingplot PLA @0.8 nozzle" + ], + "min_resonance_avoidance_speed": "55", + "max_resonance_avoidance_speed": "115" +} diff --git a/resources/profiles/Meltingplot/machine/Meltingplot CHX 350 1.0 nozzle.json b/resources/profiles/Meltingplot/machine/Meltingplot CHX 350 1.0 nozzle.json new file mode 100644 index 0000000000..0c2f656c94 --- /dev/null +++ b/resources/profiles/Meltingplot/machine/Meltingplot CHX 350 1.0 nozzle.json @@ -0,0 +1,33 @@ +{ + "type": "machine", + "name": "Meltingplot CHX 350 1.0 nozzle", + "inherits": "fdm_machine_meltingplot_chx", + "from": "system", + "setting_id": "AGIxh7arXUPLFcnj", + "instantiation": "true", + "printer_model": "Meltingplot CHX 350", + "printer_variant": "1.0", + "nozzle_diameter": [ + "1.0" + ], + "min_layer_height": [ + "0.40" + ], + "max_layer_height": [ + "0.60" + ], + "printable_area": [ + "0x0", + "880x0", + "880x422", + "0x422" + ], + "printable_height": "943", + "default_print_profile": "0.48mm Optimal 1.0 nozzle @Meltingplot CHX 350", + "default_filament_profile": [ + "Meltingplot PLA @1.0 nozzle" + ], + "nozzle_type": [ + "hardened_steel" + ] +} diff --git a/resources/profiles/Meltingplot/machine/Meltingplot CHX 350 1.2 nozzle.json b/resources/profiles/Meltingplot/machine/Meltingplot CHX 350 1.2 nozzle.json new file mode 100644 index 0000000000..fa511ee85a --- /dev/null +++ b/resources/profiles/Meltingplot/machine/Meltingplot CHX 350 1.2 nozzle.json @@ -0,0 +1,33 @@ +{ + "type": "machine", + "name": "Meltingplot CHX 350 1.2 nozzle", + "inherits": "fdm_machine_meltingplot_chx", + "from": "system", + "setting_id": "xcwkp9Kdund0y4Zh", + "instantiation": "true", + "printer_model": "Meltingplot CHX 350", + "printer_variant": "1.2", + "nozzle_diameter": [ + "1.2" + ], + "min_layer_height": [ + "0.48" + ], + "max_layer_height": [ + "0.72" + ], + "printable_area": [ + "0x0", + "880x0", + "880x422", + "0x422" + ], + "printable_height": "943", + "default_print_profile": "0.56mm Optimal 1.2 nozzle @Meltingplot CHX 350", + "default_filament_profile": [ + "Meltingplot PLA" + ], + "nozzle_type": [ + "hardened_steel" + ] +} diff --git a/resources/profiles/Meltingplot/machine/Meltingplot CHX 350.json b/resources/profiles/Meltingplot/machine/Meltingplot CHX 350.json new file mode 100644 index 0000000000..22d9b57d30 --- /dev/null +++ b/resources/profiles/Meltingplot/machine/Meltingplot CHX 350.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "Meltingplot CHX 350", + "model_id": "Meltingplot-CHX-350", + "nozzle_diameter": "0.4;0.6;0.8;1.0;1.2", + "machine_tech": "FFF", + "family": "Meltingplot", + "bed_model": "chx350-printbed.stl", + "bed_texture": "chx350-texture.svg", + "hotend_model": "", + "default_materials": "Meltingplot PLA @0.4 nozzle;Meltingplot PLA @0.6 nozzle;Meltingplot PLA @0.8 nozzle;Meltingplot PLA @1.0 nozzle;Meltingplot PLA;Meltingplot PETG @0.4 nozzle;Meltingplot PETG @0.6 nozzle;Meltingplot PETG @0.8 nozzle;Meltingplot PETG @1.0 nozzle;Meltingplot PETG;Meltingplot ABS @0.4 nozzle;Meltingplot ABS @0.6 nozzle;Meltingplot ABS @0.8 nozzle;Meltingplot ABS @1.0 nozzle;Meltingplot ABS;Meltingplot ASA @0.4 nozzle;Meltingplot ASA @0.6 nozzle;Meltingplot ASA @0.8 nozzle;Meltingplot ASA @1.0 nozzle;Meltingplot ASA" +} diff --git a/resources/profiles/Meltingplot/machine/Meltingplot MBL 133 0.4 nozzle.json b/resources/profiles/Meltingplot/machine/Meltingplot MBL 133 0.4 nozzle.json new file mode 100644 index 0000000000..413b86a245 --- /dev/null +++ b/resources/profiles/Meltingplot/machine/Meltingplot MBL 133 0.4 nozzle.json @@ -0,0 +1,30 @@ +{ + "type": "machine", + "name": "Meltingplot MBL 133 0.4 nozzle", + "inherits": "fdm_machine_meltingplot_mbl", + "from": "system", + "setting_id": "wyroTvO4uFQPS3Se", + "instantiation": "true", + "printer_model": "Meltingplot MBL 133", + "printer_variant": "0.4", + "nozzle_diameter": [ + "0.4" + ], + "min_layer_height": [ + "0.16" + ], + "max_layer_height": [ + "0.24" + ], + "printable_area": [ + "0x0", + "835x0", + "835x405", + "0x405" + ], + "printable_height": "394", + "default_print_profile": "0.18mm Fine 0.4 nozzle @Meltingplot MBL", + "default_filament_profile": [ + "Meltingplot PLA @0.4 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/machine/Meltingplot MBL 133 0.6 nozzle.json b/resources/profiles/Meltingplot/machine/Meltingplot MBL 133 0.6 nozzle.json new file mode 100644 index 0000000000..1f6e02ec96 --- /dev/null +++ b/resources/profiles/Meltingplot/machine/Meltingplot MBL 133 0.6 nozzle.json @@ -0,0 +1,30 @@ +{ + "type": "machine", + "name": "Meltingplot MBL 133 0.6 nozzle", + "inherits": "fdm_machine_meltingplot_mbl", + "from": "system", + "setting_id": "QbxTZqa4I7jaXUzw", + "instantiation": "true", + "printer_model": "Meltingplot MBL 133", + "printer_variant": "0.6", + "nozzle_diameter": [ + "0.6" + ], + "min_layer_height": [ + "0.24" + ], + "max_layer_height": [ + "0.36" + ], + "printable_area": [ + "0x0", + "835x0", + "835x405", + "0x405" + ], + "printable_height": "394", + "default_print_profile": "0.30mm Standard 0.6 nozzle @Meltingplot MBL", + "default_filament_profile": [ + "Meltingplot PLA @0.6 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/machine/Meltingplot MBL 133 0.8 nozzle.json b/resources/profiles/Meltingplot/machine/Meltingplot MBL 133 0.8 nozzle.json new file mode 100644 index 0000000000..506acfdf6f --- /dev/null +++ b/resources/profiles/Meltingplot/machine/Meltingplot MBL 133 0.8 nozzle.json @@ -0,0 +1,30 @@ +{ + "type": "machine", + "name": "Meltingplot MBL 133 0.8 nozzle", + "inherits": "fdm_machine_meltingplot_mbl", + "from": "system", + "setting_id": "VXumP32DSNKwddyS", + "instantiation": "true", + "printer_model": "Meltingplot MBL 133", + "printer_variant": "0.8", + "nozzle_diameter": [ + "0.8" + ], + "min_layer_height": [ + "0.32" + ], + "max_layer_height": [ + "0.48" + ], + "printable_area": [ + "0x0", + "835x0", + "835x405", + "0x405" + ], + "printable_height": "394", + "default_print_profile": "0.38mm Standard 0.8 nozzle @Meltingplot MBL", + "default_filament_profile": [ + "Meltingplot PLA @0.8 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/machine/Meltingplot MBL 133 1.0 nozzle.json b/resources/profiles/Meltingplot/machine/Meltingplot MBL 133 1.0 nozzle.json new file mode 100644 index 0000000000..d4943d8642 --- /dev/null +++ b/resources/profiles/Meltingplot/machine/Meltingplot MBL 133 1.0 nozzle.json @@ -0,0 +1,30 @@ +{ + "type": "machine", + "name": "Meltingplot MBL 133 1.0 nozzle", + "inherits": "fdm_machine_meltingplot_mbl", + "from": "system", + "setting_id": "A2a4j8nclQxokoHn", + "instantiation": "true", + "printer_model": "Meltingplot MBL 133", + "printer_variant": "1.0", + "nozzle_diameter": [ + "1.0" + ], + "min_layer_height": [ + "0.40" + ], + "max_layer_height": [ + "0.60" + ], + "printable_area": [ + "0x0", + "835x0", + "835x405", + "0x405" + ], + "printable_height": "394", + "default_print_profile": "0.48mm Optimal 1.0 nozzle @Meltingplot MBL", + "default_filament_profile": [ + "Meltingplot PLA @1.0 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/machine/Meltingplot MBL 133 1.2 nozzle.json b/resources/profiles/Meltingplot/machine/Meltingplot MBL 133 1.2 nozzle.json new file mode 100644 index 0000000000..6107f64728 --- /dev/null +++ b/resources/profiles/Meltingplot/machine/Meltingplot MBL 133 1.2 nozzle.json @@ -0,0 +1,30 @@ +{ + "type": "machine", + "name": "Meltingplot MBL 133 1.2 nozzle", + "inherits": "fdm_machine_meltingplot_mbl", + "from": "system", + "setting_id": "wn8Ez4ZM1ubuftLv", + "instantiation": "true", + "printer_model": "Meltingplot MBL 133", + "printer_variant": "1.2", + "nozzle_diameter": [ + "1.2" + ], + "min_layer_height": [ + "0.48" + ], + "max_layer_height": [ + "0.72" + ], + "printable_area": [ + "0x0", + "835x0", + "835x405", + "0x405" + ], + "printable_height": "394", + "default_print_profile": "0.56mm Optimal 1.2 nozzle @Meltingplot MBL", + "default_filament_profile": [ + "Meltingplot PLA" + ] +} diff --git a/resources/profiles/Meltingplot/machine/Meltingplot MBL 133.json b/resources/profiles/Meltingplot/machine/Meltingplot MBL 133.json new file mode 100644 index 0000000000..5a8d76e344 --- /dev/null +++ b/resources/profiles/Meltingplot/machine/Meltingplot MBL 133.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "Meltingplot MBL 133", + "model_id": "Meltingplot-MBL-133", + "nozzle_diameter": "0.8;0.4;0.6;1.0;1.2", + "machine_tech": "FFF", + "family": "Meltingplot", + "bed_model": "mbl133-printbed.stl", + "bed_texture": "mbl-133-texture.svg", + "hotend_model": "", + "default_materials": "Meltingplot PLA @0.4 nozzle;Meltingplot PLA @0.6 nozzle;Meltingplot PLA @0.8 nozzle;Meltingplot PLA @1.0 nozzle;Meltingplot PLA;Meltingplot PETG @0.4 nozzle;Meltingplot PETG @0.6 nozzle;Meltingplot PETG @0.8 nozzle;Meltingplot PETG @1.0 nozzle;Meltingplot PETG;Meltingplot ABS @0.4 nozzle;Meltingplot ABS @0.6 nozzle;Meltingplot ABS @0.8 nozzle;Meltingplot ABS @1.0 nozzle;Meltingplot ABS;Meltingplot ASA @0.4 nozzle;Meltingplot ASA @0.6 nozzle;Meltingplot ASA @0.8 nozzle;Meltingplot ASA @1.0 nozzle;Meltingplot ASA" +} diff --git a/resources/profiles/Meltingplot/machine/Meltingplot MBL 136 0.4 nozzle.json b/resources/profiles/Meltingplot/machine/Meltingplot MBL 136 0.4 nozzle.json new file mode 100644 index 0000000000..efcd27c2ec --- /dev/null +++ b/resources/profiles/Meltingplot/machine/Meltingplot MBL 136 0.4 nozzle.json @@ -0,0 +1,30 @@ +{ + "type": "machine", + "name": "Meltingplot MBL 136 0.4 nozzle", + "inherits": "fdm_machine_meltingplot_mbl", + "from": "system", + "setting_id": "Wv2F2INNahYnIP2n", + "instantiation": "true", + "printer_model": "Meltingplot MBL 136", + "printer_variant": "0.4", + "nozzle_diameter": [ + "0.4" + ], + "min_layer_height": [ + "0.16" + ], + "max_layer_height": [ + "0.24" + ], + "printable_area": [ + "0x0", + "850x0", + "850x405", + "0x405" + ], + "printable_height": "396", + "default_print_profile": "0.18mm Fine 0.4 nozzle @Meltingplot MBL", + "default_filament_profile": [ + "Meltingplot PLA @0.4 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/machine/Meltingplot MBL 136 0.6 nozzle.json b/resources/profiles/Meltingplot/machine/Meltingplot MBL 136 0.6 nozzle.json new file mode 100644 index 0000000000..2bf1e00ae6 --- /dev/null +++ b/resources/profiles/Meltingplot/machine/Meltingplot MBL 136 0.6 nozzle.json @@ -0,0 +1,30 @@ +{ + "type": "machine", + "name": "Meltingplot MBL 136 0.6 nozzle", + "inherits": "fdm_machine_meltingplot_mbl", + "from": "system", + "setting_id": "bmYfNrpRLtITsguf", + "instantiation": "true", + "printer_model": "Meltingplot MBL 136", + "printer_variant": "0.6", + "nozzle_diameter": [ + "0.6" + ], + "min_layer_height": [ + "0.24" + ], + "max_layer_height": [ + "0.36" + ], + "printable_area": [ + "0x0", + "850x0", + "850x405", + "0x405" + ], + "printable_height": "396", + "default_print_profile": "0.30mm Standard 0.6 nozzle @Meltingplot MBL", + "default_filament_profile": [ + "Meltingplot PLA @0.6 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/machine/Meltingplot MBL 136 0.8 nozzle.json b/resources/profiles/Meltingplot/machine/Meltingplot MBL 136 0.8 nozzle.json new file mode 100644 index 0000000000..922ec96fce --- /dev/null +++ b/resources/profiles/Meltingplot/machine/Meltingplot MBL 136 0.8 nozzle.json @@ -0,0 +1,30 @@ +{ + "type": "machine", + "name": "Meltingplot MBL 136 0.8 nozzle", + "inherits": "fdm_machine_meltingplot_mbl", + "from": "system", + "setting_id": "9fv3aEc4tAsdeaPI", + "instantiation": "true", + "printer_model": "Meltingplot MBL 136", + "printer_variant": "0.8", + "nozzle_diameter": [ + "0.8" + ], + "min_layer_height": [ + "0.32" + ], + "max_layer_height": [ + "0.48" + ], + "printable_area": [ + "0x0", + "850x0", + "850x405", + "0x405" + ], + "printable_height": "396", + "default_print_profile": "0.38mm Standard 0.8 nozzle @Meltingplot MBL", + "default_filament_profile": [ + "Meltingplot PLA @0.8 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/machine/Meltingplot MBL 136 1.0 nozzle.json b/resources/profiles/Meltingplot/machine/Meltingplot MBL 136 1.0 nozzle.json new file mode 100644 index 0000000000..0e1e6dadb7 --- /dev/null +++ b/resources/profiles/Meltingplot/machine/Meltingplot MBL 136 1.0 nozzle.json @@ -0,0 +1,30 @@ +{ + "type": "machine", + "name": "Meltingplot MBL 136 1.0 nozzle", + "inherits": "fdm_machine_meltingplot_mbl", + "from": "system", + "setting_id": "l45hlHUCFi1UcGpM", + "instantiation": "true", + "printer_model": "Meltingplot MBL 136", + "printer_variant": "1.0", + "nozzle_diameter": [ + "1.0" + ], + "min_layer_height": [ + "0.40" + ], + "max_layer_height": [ + "0.60" + ], + "printable_area": [ + "0x0", + "850x0", + "850x405", + "0x405" + ], + "printable_height": "396", + "default_print_profile": "0.48mm Optimal 1.0 nozzle @Meltingplot MBL", + "default_filament_profile": [ + "Meltingplot PLA @1.0 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/machine/Meltingplot MBL 136 1.2 nozzle.json b/resources/profiles/Meltingplot/machine/Meltingplot MBL 136 1.2 nozzle.json new file mode 100644 index 0000000000..1fb6101070 --- /dev/null +++ b/resources/profiles/Meltingplot/machine/Meltingplot MBL 136 1.2 nozzle.json @@ -0,0 +1,30 @@ +{ + "type": "machine", + "name": "Meltingplot MBL 136 1.2 nozzle", + "inherits": "fdm_machine_meltingplot_mbl", + "from": "system", + "setting_id": "LAAqt3v5IkT75PMJ", + "instantiation": "true", + "printer_model": "Meltingplot MBL 136", + "printer_variant": "1.2", + "nozzle_diameter": [ + "1.2" + ], + "min_layer_height": [ + "0.48" + ], + "max_layer_height": [ + "0.72" + ], + "printable_area": [ + "0x0", + "850x0", + "850x405", + "0x405" + ], + "printable_height": "396", + "default_print_profile": "0.56mm Optimal 1.2 nozzle @Meltingplot MBL", + "default_filament_profile": [ + "Meltingplot PLA" + ] +} diff --git a/resources/profiles/Meltingplot/machine/Meltingplot MBL 136.json b/resources/profiles/Meltingplot/machine/Meltingplot MBL 136.json new file mode 100644 index 0000000000..1afe141a6b --- /dev/null +++ b/resources/profiles/Meltingplot/machine/Meltingplot MBL 136.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "Meltingplot MBL 136", + "model_id": "Meltingplot-MBL-136", + "nozzle_diameter": "0.8;0.4;0.6;1.0;1.2", + "machine_tech": "FFF", + "family": "Meltingplot", + "bed_model": "mbl136-printbed.stl", + "bed_texture": "mbl-136-texture.svg", + "hotend_model": "", + "default_materials": "Meltingplot PLA @0.4 nozzle;Meltingplot PLA @0.6 nozzle;Meltingplot PLA @0.8 nozzle;Meltingplot PLA @1.0 nozzle;Meltingplot PLA;Meltingplot PETG @0.4 nozzle;Meltingplot PETG @0.6 nozzle;Meltingplot PETG @0.8 nozzle;Meltingplot PETG @1.0 nozzle;Meltingplot PETG;Meltingplot ABS @0.4 nozzle;Meltingplot ABS @0.6 nozzle;Meltingplot ABS @0.8 nozzle;Meltingplot ABS @1.0 nozzle;Meltingplot ABS;Meltingplot ASA @0.4 nozzle;Meltingplot ASA @0.6 nozzle;Meltingplot ASA @0.8 nozzle;Meltingplot ASA @1.0 nozzle;Meltingplot ASA" +} diff --git a/resources/profiles/Meltingplot/machine/Meltingplot MBL 308 0.4 nozzle.json b/resources/profiles/Meltingplot/machine/Meltingplot MBL 308 0.4 nozzle.json new file mode 100644 index 0000000000..2e3f428374 --- /dev/null +++ b/resources/profiles/Meltingplot/machine/Meltingplot MBL 308 0.4 nozzle.json @@ -0,0 +1,30 @@ +{ + "type": "machine", + "name": "Meltingplot MBL 308 0.4 nozzle", + "inherits": "fdm_machine_meltingplot_mbl", + "from": "system", + "setting_id": "AbxDaZCTmysg7JTf", + "instantiation": "true", + "printer_model": "Meltingplot MBL 308", + "printer_variant": "0.4", + "nozzle_diameter": [ + "0.4" + ], + "min_layer_height": [ + "0.16" + ], + "max_layer_height": [ + "0.24" + ], + "printable_area": [ + "0x0", + "850x0", + "850x405", + "0x405" + ], + "printable_height": "896", + "default_print_profile": "0.18mm Fine 0.4 nozzle @Meltingplot MBL", + "default_filament_profile": [ + "Meltingplot PLA @0.4 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/machine/Meltingplot MBL 308 0.6 nozzle.json b/resources/profiles/Meltingplot/machine/Meltingplot MBL 308 0.6 nozzle.json new file mode 100644 index 0000000000..d21e5b08df --- /dev/null +++ b/resources/profiles/Meltingplot/machine/Meltingplot MBL 308 0.6 nozzle.json @@ -0,0 +1,30 @@ +{ + "type": "machine", + "name": "Meltingplot MBL 308 0.6 nozzle", + "inherits": "fdm_machine_meltingplot_mbl", + "from": "system", + "setting_id": "YRQhtucLD6iZRcY0", + "instantiation": "true", + "printer_model": "Meltingplot MBL 308", + "printer_variant": "0.6", + "nozzle_diameter": [ + "0.6" + ], + "min_layer_height": [ + "0.24" + ], + "max_layer_height": [ + "0.36" + ], + "printable_area": [ + "0x0", + "850x0", + "850x405", + "0x405" + ], + "printable_height": "896", + "default_print_profile": "0.30mm Standard 0.6 nozzle @Meltingplot MBL", + "default_filament_profile": [ + "Meltingplot PLA @0.6 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/machine/Meltingplot MBL 308 0.8 nozzle.json b/resources/profiles/Meltingplot/machine/Meltingplot MBL 308 0.8 nozzle.json new file mode 100644 index 0000000000..2feb7f2162 --- /dev/null +++ b/resources/profiles/Meltingplot/machine/Meltingplot MBL 308 0.8 nozzle.json @@ -0,0 +1,30 @@ +{ + "type": "machine", + "name": "Meltingplot MBL 308 0.8 nozzle", + "inherits": "fdm_machine_meltingplot_mbl", + "from": "system", + "setting_id": "3scvx4P2vXtmoMmI", + "instantiation": "true", + "printer_model": "Meltingplot MBL 308", + "printer_variant": "0.8", + "nozzle_diameter": [ + "0.8" + ], + "min_layer_height": [ + "0.32" + ], + "max_layer_height": [ + "0.48" + ], + "printable_area": [ + "0x0", + "850x0", + "850x405", + "0x405" + ], + "printable_height": "896", + "default_print_profile": "0.38mm Standard 0.8 nozzle @Meltingplot MBL", + "default_filament_profile": [ + "Meltingplot PLA @0.8 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/machine/Meltingplot MBL 308 1.0 nozzle.json b/resources/profiles/Meltingplot/machine/Meltingplot MBL 308 1.0 nozzle.json new file mode 100644 index 0000000000..dd54275283 --- /dev/null +++ b/resources/profiles/Meltingplot/machine/Meltingplot MBL 308 1.0 nozzle.json @@ -0,0 +1,30 @@ +{ + "type": "machine", + "name": "Meltingplot MBL 308 1.0 nozzle", + "inherits": "fdm_machine_meltingplot_mbl", + "from": "system", + "setting_id": "VpAHWQ6v3aZLUIs1", + "instantiation": "true", + "printer_model": "Meltingplot MBL 308", + "printer_variant": "1.0", + "nozzle_diameter": [ + "1.0" + ], + "min_layer_height": [ + "0.40" + ], + "max_layer_height": [ + "0.60" + ], + "printable_area": [ + "0x0", + "850x0", + "850x405", + "0x405" + ], + "printable_height": "896", + "default_print_profile": "0.48mm Optimal 1.0 nozzle @Meltingplot MBL", + "default_filament_profile": [ + "Meltingplot PLA @1.0 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/machine/Meltingplot MBL 308 1.2 nozzle.json b/resources/profiles/Meltingplot/machine/Meltingplot MBL 308 1.2 nozzle.json new file mode 100644 index 0000000000..eb56bc5da6 --- /dev/null +++ b/resources/profiles/Meltingplot/machine/Meltingplot MBL 308 1.2 nozzle.json @@ -0,0 +1,30 @@ +{ + "type": "machine", + "name": "Meltingplot MBL 308 1.2 nozzle", + "inherits": "fdm_machine_meltingplot_mbl", + "from": "system", + "setting_id": "WuT3Qj2xyAPfDsXW", + "instantiation": "true", + "printer_model": "Meltingplot MBL 308", + "printer_variant": "1.2", + "nozzle_diameter": [ + "1.2" + ], + "min_layer_height": [ + "0.48" + ], + "max_layer_height": [ + "0.72" + ], + "printable_area": [ + "0x0", + "850x0", + "850x405", + "0x405" + ], + "printable_height": "896", + "default_print_profile": "0.56mm Optimal 1.2 nozzle @Meltingplot MBL", + "default_filament_profile": [ + "Meltingplot PLA" + ] +} diff --git a/resources/profiles/Meltingplot/machine/Meltingplot MBL 308.json b/resources/profiles/Meltingplot/machine/Meltingplot MBL 308.json new file mode 100644 index 0000000000..7d43a425a7 --- /dev/null +++ b/resources/profiles/Meltingplot/machine/Meltingplot MBL 308.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "Meltingplot MBL 308", + "model_id": "Meltingplot-MBL-308", + "nozzle_diameter": "0.8;0.4;0.6;1.0;1.2", + "machine_tech": "FFF", + "family": "Meltingplot", + "bed_model": "mbl308-printbed.stl", + "bed_texture": "mbl-308-texture.svg", + "hotend_model": "", + "default_materials": "Meltingplot PLA @0.4 nozzle;Meltingplot PLA @0.6 nozzle;Meltingplot PLA @0.8 nozzle;Meltingplot PLA @1.0 nozzle;Meltingplot PLA;Meltingplot PETG @0.4 nozzle;Meltingplot PETG @0.6 nozzle;Meltingplot PETG @0.8 nozzle;Meltingplot PETG @1.0 nozzle;Meltingplot PETG;Meltingplot ABS @0.4 nozzle;Meltingplot ABS @0.6 nozzle;Meltingplot ABS @0.8 nozzle;Meltingplot ABS @1.0 nozzle;Meltingplot ABS;Meltingplot ASA @0.4 nozzle;Meltingplot ASA @0.6 nozzle;Meltingplot ASA @0.8 nozzle;Meltingplot ASA @1.0 nozzle;Meltingplot ASA" +} diff --git a/resources/profiles/Meltingplot/machine/Meltingplot MBL 480 0.4 nozzle.json b/resources/profiles/Meltingplot/machine/Meltingplot MBL 480 0.4 nozzle.json new file mode 100644 index 0000000000..1638cf61e5 --- /dev/null +++ b/resources/profiles/Meltingplot/machine/Meltingplot MBL 480 0.4 nozzle.json @@ -0,0 +1,30 @@ +{ + "type": "machine", + "name": "Meltingplot MBL 480 0.4 nozzle", + "inherits": "fdm_machine_meltingplot_mbl", + "from": "system", + "setting_id": "14E0ywGwPgPzuR7q", + "instantiation": "true", + "printer_model": "Meltingplot MBL 480", + "printer_variant": "0.4", + "nozzle_diameter": [ + "0.4" + ], + "min_layer_height": [ + "0.16" + ], + "max_layer_height": [ + "0.24" + ], + "printable_area": [ + "0x0", + "850x0", + "850x405", + "0x405" + ], + "printable_height": "1396", + "default_print_profile": "0.18mm Fine 0.4 nozzle @Meltingplot MBL", + "default_filament_profile": [ + "Meltingplot PLA @0.4 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/machine/Meltingplot MBL 480 0.6 nozzle.json b/resources/profiles/Meltingplot/machine/Meltingplot MBL 480 0.6 nozzle.json new file mode 100644 index 0000000000..d727e6e540 --- /dev/null +++ b/resources/profiles/Meltingplot/machine/Meltingplot MBL 480 0.6 nozzle.json @@ -0,0 +1,30 @@ +{ + "type": "machine", + "name": "Meltingplot MBL 480 0.6 nozzle", + "inherits": "fdm_machine_meltingplot_mbl", + "from": "system", + "setting_id": "RntAZ9kYe1JiK9qL", + "instantiation": "true", + "printer_model": "Meltingplot MBL 480", + "printer_variant": "0.6", + "nozzle_diameter": [ + "0.6" + ], + "min_layer_height": [ + "0.24" + ], + "max_layer_height": [ + "0.36" + ], + "printable_area": [ + "0x0", + "850x0", + "850x405", + "0x405" + ], + "printable_height": "1396", + "default_print_profile": "0.30mm Standard 0.6 nozzle @Meltingplot MBL", + "default_filament_profile": [ + "Meltingplot PLA @0.6 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/machine/Meltingplot MBL 480 0.8 nozzle.json b/resources/profiles/Meltingplot/machine/Meltingplot MBL 480 0.8 nozzle.json new file mode 100644 index 0000000000..2ca80661af --- /dev/null +++ b/resources/profiles/Meltingplot/machine/Meltingplot MBL 480 0.8 nozzle.json @@ -0,0 +1,30 @@ +{ + "type": "machine", + "name": "Meltingplot MBL 480 0.8 nozzle", + "inherits": "fdm_machine_meltingplot_mbl", + "from": "system", + "setting_id": "3wnBTip16mjzuNaR", + "instantiation": "true", + "printer_model": "Meltingplot MBL 480", + "printer_variant": "0.8", + "nozzle_diameter": [ + "0.8" + ], + "min_layer_height": [ + "0.32" + ], + "max_layer_height": [ + "0.48" + ], + "printable_area": [ + "0x0", + "850x0", + "850x405", + "0x405" + ], + "printable_height": "1396", + "default_print_profile": "0.38mm Standard 0.8 nozzle @Meltingplot MBL", + "default_filament_profile": [ + "Meltingplot PLA @0.8 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/machine/Meltingplot MBL 480 1.0 nozzle.json b/resources/profiles/Meltingplot/machine/Meltingplot MBL 480 1.0 nozzle.json new file mode 100644 index 0000000000..95a2b7a7da --- /dev/null +++ b/resources/profiles/Meltingplot/machine/Meltingplot MBL 480 1.0 nozzle.json @@ -0,0 +1,30 @@ +{ + "type": "machine", + "name": "Meltingplot MBL 480 1.0 nozzle", + "inherits": "fdm_machine_meltingplot_mbl", + "from": "system", + "setting_id": "KXzVlZQpxRpoYCZC", + "instantiation": "true", + "printer_model": "Meltingplot MBL 480", + "printer_variant": "1.0", + "nozzle_diameter": [ + "1.0" + ], + "min_layer_height": [ + "0.40" + ], + "max_layer_height": [ + "0.60" + ], + "printable_area": [ + "0x0", + "850x0", + "850x405", + "0x405" + ], + "printable_height": "1396", + "default_print_profile": "0.48mm Optimal 1.0 nozzle @Meltingplot MBL", + "default_filament_profile": [ + "Meltingplot PLA @1.0 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/machine/Meltingplot MBL 480 1.2 nozzle.json b/resources/profiles/Meltingplot/machine/Meltingplot MBL 480 1.2 nozzle.json new file mode 100644 index 0000000000..2a992dc643 --- /dev/null +++ b/resources/profiles/Meltingplot/machine/Meltingplot MBL 480 1.2 nozzle.json @@ -0,0 +1,30 @@ +{ + "type": "machine", + "name": "Meltingplot MBL 480 1.2 nozzle", + "inherits": "fdm_machine_meltingplot_mbl", + "from": "system", + "setting_id": "FhIoFCxemK2Miw2J", + "instantiation": "true", + "printer_model": "Meltingplot MBL 480", + "printer_variant": "1.2", + "nozzle_diameter": [ + "1.2" + ], + "min_layer_height": [ + "0.48" + ], + "max_layer_height": [ + "0.72" + ], + "printable_area": [ + "0x0", + "850x0", + "850x405", + "0x405" + ], + "printable_height": "1396", + "default_print_profile": "0.56mm Optimal 1.2 nozzle @Meltingplot MBL", + "default_filament_profile": [ + "Meltingplot PLA" + ] +} diff --git a/resources/profiles/Meltingplot/machine/Meltingplot MBL 480.json b/resources/profiles/Meltingplot/machine/Meltingplot MBL 480.json new file mode 100644 index 0000000000..0360c5bcee --- /dev/null +++ b/resources/profiles/Meltingplot/machine/Meltingplot MBL 480.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "Meltingplot MBL 480", + "model_id": "Meltingplot-MBL-480", + "nozzle_diameter": "0.8;0.4;0.6;1.0;1.2", + "machine_tech": "FFF", + "family": "Meltingplot", + "bed_model": "mbl480-printbed.stl", + "bed_texture": "mbl-480-texture.svg", + "hotend_model": "", + "default_materials": "Meltingplot PLA @0.4 nozzle;Meltingplot PLA @0.6 nozzle;Meltingplot PLA @0.8 nozzle;Meltingplot PLA @1.0 nozzle;Meltingplot PLA;Meltingplot PETG @0.4 nozzle;Meltingplot PETG @0.6 nozzle;Meltingplot PETG @0.8 nozzle;Meltingplot PETG @1.0 nozzle;Meltingplot PETG;Meltingplot ABS @0.4 nozzle;Meltingplot ABS @0.6 nozzle;Meltingplot ABS @0.8 nozzle;Meltingplot ABS @1.0 nozzle;Meltingplot ABS;Meltingplot ASA @0.4 nozzle;Meltingplot ASA @0.6 nozzle;Meltingplot ASA @0.8 nozzle;Meltingplot ASA @1.0 nozzle;Meltingplot ASA" +} diff --git a/resources/profiles/Meltingplot/machine/fdm_machine_common.json b/resources/profiles/Meltingplot/machine/fdm_machine_common.json new file mode 100644 index 0000000000..a27cc95405 --- /dev/null +++ b/resources/profiles/Meltingplot/machine/fdm_machine_common.json @@ -0,0 +1,68 @@ +{ + "type": "machine", + "name": "fdm_machine_common", + "from": "system", + "instantiation": "false", + "printer_technology": "FFF", + "gcode_flavor": "reprapfirmware", + "host_type": "duet", + "disable_m73": "1", + "emit_machine_limits_to_gcode": "0", + "extruder_colour": [ + "#FCE94F" + ], + "extruder_offset": [ + "0x0" + ], + "machine_min_extruding_rate": [ + "0" + ], + "machine_min_travel_rate": [ + "0" + ], + "machine_max_speed_e": [ + "60" + ], + "printer_settings_id": "", + "resonance_avoidance": "0", + "retraction_length": [ + "0" + ], + "use_firmware_retraction": "1", + "retract_when_changing_layer": [ + "1" + ], + "retract_before_wipe": [ + "0%" + ], + "retract_length_toolchange": [ + "0" + ], + "retract_restart_extra": [ + "0" + ], + "retract_restart_extra_toolchange": [ + "0" + ], + "wipe": [ + "0" + ], + "z_hop": [ + "0" + ], + "z_hop_types": [ + "Normal Lift" + ], + "travel_slope": [ + "1" + ], + "single_extruder_multi_material": "0", + "purge_in_prime_tower": "0", + "time_cost": "2", + "default_print_profile": "", + "change_filament_gcode": "", + "machine_pause_gcode": "M226", + "machine_end_gcode": "G90\nG1 Z{min(max_layer_z + 5, printable_height)} F600\nM98 P\"0:/sys/meltingplot/print_end\"", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\n" +} diff --git a/resources/profiles/Meltingplot/machine/fdm_machine_meltingplot_chx.json b/resources/profiles/Meltingplot/machine/fdm_machine_meltingplot_chx.json new file mode 100644 index 0000000000..f68678716e --- /dev/null +++ b/resources/profiles/Meltingplot/machine/fdm_machine_meltingplot_chx.json @@ -0,0 +1,71 @@ +{ + "type": "machine", + "name": "fdm_machine_meltingplot_chx", + "inherits": "fdm_machine_common", + "from": "system", + "instantiation": "false", + "fan_kickstart": "0.5", + "fan_speedup_time": "1", + "machine_max_acceleration_e": [ + "3000" + ], + "machine_max_acceleration_extruding": [ + "6000" + ], + "machine_max_acceleration_retracting": [ + "3000" + ], + "machine_max_acceleration_travel": [ + "6000" + ], + "machine_max_acceleration_x": [ + "6000" + ], + "machine_max_acceleration_y": [ + "6000" + ], + "machine_max_acceleration_z": [ + "400" + ], + "machine_max_jerk_e": [ + "33.33" + ], + "machine_max_jerk_x": [ + "12" + ], + "machine_max_jerk_y": [ + "12" + ], + "machine_max_jerk_z": [ + "1.2" + ], + "machine_max_speed_x": [ + "833.33" + ], + "machine_max_speed_y": [ + "1000" + ], + "machine_max_speed_z": [ + "30" + ], + "extruder_clearance_radius": "65", + "extruder_clearance_height_to_rod": "20", + "extruder_clearance_height_to_lid": "150", + "nozzle_type": [ + "stainless_steel" + ], + "min_resonance_avoidance_speed": "40", + "max_resonance_avoidance_speed": "105", + "time_cost": "5", + "retraction_minimum_travel": [ + "2" + ], + "retraction_speed": [ + "60" + ], + "deretraction_speed": [ + "40" + ], + "printable_height": "943", + "machine_start_gcode": "M140 P0 S{first_layer_bed_temperature[0]} ; set bed temp\nG10 P0 S{first_layer_temperature[0]}\nM568 P0 R{first_layer_temperature[0] + standby_temperature_delta} S{first_layer_temperature[0]} A2\n\nM83 ; use relative distances for extrusion\nG90 ; use absolute coordinates\n\nM98 P\"0:/sys/meltingplot/print_start\"" +} diff --git a/resources/profiles/Meltingplot/machine/fdm_machine_meltingplot_mbl.json b/resources/profiles/Meltingplot/machine/fdm_machine_meltingplot_mbl.json new file mode 100644 index 0000000000..6d8f974073 --- /dev/null +++ b/resources/profiles/Meltingplot/machine/fdm_machine_meltingplot_mbl.json @@ -0,0 +1,69 @@ +{ + "type": "machine", + "name": "fdm_machine_meltingplot_mbl", + "inherits": "fdm_machine_common", + "from": "system", + "instantiation": "false", + "fan_kickstart": "0.5", + "fan_speedup_time": "0.5", + "machine_max_acceleration_e": [ + "2500" + ], + "machine_max_acceleration_extruding": [ + "800" + ], + "machine_max_acceleration_retracting": [ + "1250" + ], + "machine_max_acceleration_travel": [ + "1500" + ], + "machine_max_acceleration_x": [ + "1500" + ], + "machine_max_acceleration_y": [ + "1500" + ], + "machine_max_acceleration_z": [ + "72" + ], + "machine_max_jerk_e": [ + "3" + ], + "machine_max_jerk_x": [ + "9" + ], + "machine_max_jerk_y": [ + "9" + ], + "machine_max_jerk_z": [ + "0.3" + ], + "machine_max_speed_x": [ + "240" + ], + "machine_max_speed_y": [ + "240" + ], + "machine_max_speed_z": [ + "12" + ], + "extruder_clearance_radius": "75", + "extruder_clearance_height_to_rod": "30", + "extruder_clearance_height_to_lid": "30", + "retraction_minimum_travel": [ + "4" + ], + "retraction_speed": [ + "35" + ], + "deretraction_speed": [ + "0" + ], + "thumbnails": [ + "64x64", + "400x300" + ], + "thumbnails_format": "PNG", + "machine_start_gcode": "M140 P0 S{first_layer_bed_temperature[0]} ; set bed temp\nG10 P0 R{first_layer_temperature[0] + standby_temperature_delta} S{first_layer_temperature[0]}\n\nM83 ; use relative distances for extrusion\nG90 ; use absolute coordinates\n\nM98 P\"0:/sys/meltingplot/print_start\"" +} diff --git a/resources/profiles/Meltingplot/mbl-133-texture.svg b/resources/profiles/Meltingplot/mbl-133-texture.svg new file mode 100644 index 0000000000..d7572a5a2e --- /dev/null +++ b/resources/profiles/Meltingplot/mbl-133-texture.svg @@ -0,0 +1,158 @@ + + + + + + image/svg+xml + + MBL133 + + + + + + MBL133 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/profiles/Meltingplot/mbl-136-texture.svg b/resources/profiles/Meltingplot/mbl-136-texture.svg new file mode 100644 index 0000000000..415bd0fdc0 --- /dev/null +++ b/resources/profiles/Meltingplot/mbl-136-texture.svg @@ -0,0 +1,158 @@ + + + + + + image/svg+xml + + MBL133 + + + + + + MBL133 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/profiles/Meltingplot/mbl-308-texture.svg b/resources/profiles/Meltingplot/mbl-308-texture.svg new file mode 100644 index 0000000000..96ee77c84d --- /dev/null +++ b/resources/profiles/Meltingplot/mbl-308-texture.svg @@ -0,0 +1,158 @@ + + + + + + image/svg+xml + + MBL133 + + + + + + MBL133 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/profiles/Meltingplot/mbl-480-texture.svg b/resources/profiles/Meltingplot/mbl-480-texture.svg new file mode 100644 index 0000000000..e76d969d72 --- /dev/null +++ b/resources/profiles/Meltingplot/mbl-480-texture.svg @@ -0,0 +1,158 @@ + + + + + + image/svg+xml + + MBL133 + + + + + + MBL133 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/profiles/Meltingplot/mbl133-printbed.stl b/resources/profiles/Meltingplot/mbl133-printbed.stl new file mode 100644 index 0000000000..888491edea Binary files /dev/null and b/resources/profiles/Meltingplot/mbl133-printbed.stl differ diff --git a/resources/profiles/Meltingplot/mbl136-printbed.stl b/resources/profiles/Meltingplot/mbl136-printbed.stl new file mode 100644 index 0000000000..ab25288591 Binary files /dev/null and b/resources/profiles/Meltingplot/mbl136-printbed.stl differ diff --git a/resources/profiles/Meltingplot/mbl308-printbed.stl b/resources/profiles/Meltingplot/mbl308-printbed.stl new file mode 100644 index 0000000000..ab25288591 Binary files /dev/null and b/resources/profiles/Meltingplot/mbl308-printbed.stl differ diff --git a/resources/profiles/Meltingplot/mbl480-printbed.stl b/resources/profiles/Meltingplot/mbl480-printbed.stl new file mode 100644 index 0000000000..ab25288591 Binary files /dev/null and b/resources/profiles/Meltingplot/mbl480-printbed.stl differ diff --git a/resources/profiles/Meltingplot/process/0.18mm Fine 0.4 nozzle @Meltingplot CHX 350.json b/resources/profiles/Meltingplot/process/0.18mm Fine 0.4 nozzle @Meltingplot CHX 350.json new file mode 100644 index 0000000000..29b161150e --- /dev/null +++ b/resources/profiles/Meltingplot/process/0.18mm Fine 0.4 nozzle @Meltingplot CHX 350.json @@ -0,0 +1,12 @@ +{ + "type": "process", + "name": "0.18mm Fine 0.4 nozzle @Meltingplot CHX 350", + "inherits": "fdm_process_meltingplot_chx_small_nozzle", + "from": "system", + "setting_id": "AbSOyKLL1fGceKJM", + "instantiation": "true", + "layer_height": "0.18", + "compatible_printers": [ + "Meltingplot CHX 350 0.4 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/process/0.18mm Fine 0.4 nozzle @Meltingplot MBL.json b/resources/profiles/Meltingplot/process/0.18mm Fine 0.4 nozzle @Meltingplot MBL.json new file mode 100644 index 0000000000..09624e8d1d --- /dev/null +++ b/resources/profiles/Meltingplot/process/0.18mm Fine 0.4 nozzle @Meltingplot MBL.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "0.18mm Fine 0.4 nozzle @Meltingplot MBL", + "inherits": "fdm_process_meltingplot_mbl_04_nozzle", + "from": "system", + "setting_id": "WF0wYUMc1HUHPyVQ", + "instantiation": "true", + "layer_height": "0.18", + "compatible_printers": [ + "Meltingplot MBL 133 0.4 nozzle", + "Meltingplot MBL 136 0.4 nozzle", + "Meltingplot MBL 308 0.4 nozzle", + "Meltingplot MBL 480 0.4 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/process/0.24mm Fine 0.6 nozzle @Meltingplot CHX 350.json b/resources/profiles/Meltingplot/process/0.24mm Fine 0.6 nozzle @Meltingplot CHX 350.json new file mode 100644 index 0000000000..b5114e1fee --- /dev/null +++ b/resources/profiles/Meltingplot/process/0.24mm Fine 0.6 nozzle @Meltingplot CHX 350.json @@ -0,0 +1,12 @@ +{ + "type": "process", + "name": "0.24mm Fine 0.6 nozzle @Meltingplot CHX 350", + "inherits": "fdm_process_meltingplot_chx_small_nozzle", + "from": "system", + "setting_id": "KrZSDq4Tsnlnu0Dm", + "instantiation": "true", + "layer_height": "0.24", + "compatible_printers": [ + "Meltingplot CHX 350 0.6 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/process/0.24mm Fine 0.6 nozzle @Meltingplot MBL.json b/resources/profiles/Meltingplot/process/0.24mm Fine 0.6 nozzle @Meltingplot MBL.json new file mode 100644 index 0000000000..c6ff710938 --- /dev/null +++ b/resources/profiles/Meltingplot/process/0.24mm Fine 0.6 nozzle @Meltingplot MBL.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "0.24mm Fine 0.6 nozzle @Meltingplot MBL", + "inherits": "fdm_process_meltingplot_mbl_06_nozzle", + "from": "system", + "setting_id": "9PDbCLSnBEocONzB", + "instantiation": "true", + "layer_height": "0.24", + "compatible_printers": [ + "Meltingplot MBL 133 0.6 nozzle", + "Meltingplot MBL 136 0.6 nozzle", + "Meltingplot MBL 308 0.6 nozzle", + "Meltingplot MBL 480 0.6 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/process/0.28mm Optimal 0.6 nozzle @Meltingplot CHX 350.json b/resources/profiles/Meltingplot/process/0.28mm Optimal 0.6 nozzle @Meltingplot CHX 350.json new file mode 100644 index 0000000000..476156be3a --- /dev/null +++ b/resources/profiles/Meltingplot/process/0.28mm Optimal 0.6 nozzle @Meltingplot CHX 350.json @@ -0,0 +1,12 @@ +{ + "type": "process", + "name": "0.28mm Optimal 0.6 nozzle @Meltingplot CHX 350", + "inherits": "fdm_process_meltingplot_chx_small_nozzle", + "from": "system", + "setting_id": "RrsJ1yXD61T1Sk2u", + "instantiation": "true", + "layer_height": "0.28", + "compatible_printers": [ + "Meltingplot CHX 350 0.6 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/process/0.28mm Optimal 0.6 nozzle @Meltingplot MBL.json b/resources/profiles/Meltingplot/process/0.28mm Optimal 0.6 nozzle @Meltingplot MBL.json new file mode 100644 index 0000000000..4187f5f899 --- /dev/null +++ b/resources/profiles/Meltingplot/process/0.28mm Optimal 0.6 nozzle @Meltingplot MBL.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "0.28mm Optimal 0.6 nozzle @Meltingplot MBL", + "inherits": "fdm_process_meltingplot_mbl_06_nozzle", + "from": "system", + "setting_id": "ewObaiyN5k5Jl17T", + "instantiation": "true", + "layer_height": "0.28", + "compatible_printers": [ + "Meltingplot MBL 133 0.6 nozzle", + "Meltingplot MBL 136 0.6 nozzle", + "Meltingplot MBL 308 0.6 nozzle", + "Meltingplot MBL 480 0.6 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/process/0.30mm Standard 0.6 nozzle @Meltingplot CHX 350.json b/resources/profiles/Meltingplot/process/0.30mm Standard 0.6 nozzle @Meltingplot CHX 350.json new file mode 100644 index 0000000000..90de66ee6e --- /dev/null +++ b/resources/profiles/Meltingplot/process/0.30mm Standard 0.6 nozzle @Meltingplot CHX 350.json @@ -0,0 +1,12 @@ +{ + "type": "process", + "name": "0.30mm Standard 0.6 nozzle @Meltingplot CHX 350", + "inherits": "fdm_process_meltingplot_chx_small_nozzle", + "from": "system", + "setting_id": "nHe2gihvCHahJ4Pw", + "instantiation": "true", + "layer_height": "0.30", + "compatible_printers": [ + "Meltingplot CHX 350 0.6 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/process/0.30mm Standard 0.6 nozzle @Meltingplot MBL.json b/resources/profiles/Meltingplot/process/0.30mm Standard 0.6 nozzle @Meltingplot MBL.json new file mode 100644 index 0000000000..6ef66db3bc --- /dev/null +++ b/resources/profiles/Meltingplot/process/0.30mm Standard 0.6 nozzle @Meltingplot MBL.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "0.30mm Standard 0.6 nozzle @Meltingplot MBL", + "inherits": "fdm_process_meltingplot_mbl_06_nozzle", + "from": "system", + "setting_id": "6exgbZxVLHjH3Bhd", + "instantiation": "true", + "layer_height": "0.30", + "compatible_printers": [ + "Meltingplot MBL 133 0.6 nozzle", + "Meltingplot MBL 136 0.6 nozzle", + "Meltingplot MBL 308 0.6 nozzle", + "Meltingplot MBL 480 0.6 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/process/0.32mm Fine 0.8 nozzle @Meltingplot CHX 350.json b/resources/profiles/Meltingplot/process/0.32mm Fine 0.8 nozzle @Meltingplot CHX 350.json new file mode 100644 index 0000000000..285d6594aa --- /dev/null +++ b/resources/profiles/Meltingplot/process/0.32mm Fine 0.8 nozzle @Meltingplot CHX 350.json @@ -0,0 +1,12 @@ +{ + "type": "process", + "name": "0.32mm Fine 0.8 nozzle @Meltingplot CHX 350", + "inherits": "fdm_process_meltingplot_chx_large_nozzle", + "from": "system", + "setting_id": "HSqTmgZq9mxKpWzq", + "instantiation": "true", + "layer_height": "0.32", + "compatible_printers": [ + "Meltingplot CHX 350 0.8 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/process/0.34mm Fine 0.8 nozzle @Meltingplot MBL.json b/resources/profiles/Meltingplot/process/0.34mm Fine 0.8 nozzle @Meltingplot MBL.json new file mode 100644 index 0000000000..1acc2ebb64 --- /dev/null +++ b/resources/profiles/Meltingplot/process/0.34mm Fine 0.8 nozzle @Meltingplot MBL.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "0.34mm Fine 0.8 nozzle @Meltingplot MBL", + "inherits": "fdm_process_meltingplot_mbl_08_nozzle", + "from": "system", + "setting_id": "XVRHVR0F8UrpWAeP", + "instantiation": "true", + "layer_height": "0.34", + "compatible_printers": [ + "Meltingplot MBL 133 0.8 nozzle", + "Meltingplot MBL 136 0.8 nozzle", + "Meltingplot MBL 308 0.8 nozzle", + "Meltingplot MBL 480 0.8 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/process/0.36mm Optimal 0.8 nozzle @Meltingplot CHX 350.json b/resources/profiles/Meltingplot/process/0.36mm Optimal 0.8 nozzle @Meltingplot CHX 350.json new file mode 100644 index 0000000000..fc6c41bd75 --- /dev/null +++ b/resources/profiles/Meltingplot/process/0.36mm Optimal 0.8 nozzle @Meltingplot CHX 350.json @@ -0,0 +1,12 @@ +{ + "type": "process", + "name": "0.36mm Optimal 0.8 nozzle @Meltingplot CHX 350", + "inherits": "fdm_process_meltingplot_chx_large_nozzle", + "from": "system", + "setting_id": "KLnV7sCKomrmvKxU", + "instantiation": "true", + "layer_height": "0.36", + "compatible_printers": [ + "Meltingplot CHX 350 0.8 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/process/0.36mm Optimal 0.8 nozzle @Meltingplot MBL.json b/resources/profiles/Meltingplot/process/0.36mm Optimal 0.8 nozzle @Meltingplot MBL.json new file mode 100644 index 0000000000..9694cff7d9 --- /dev/null +++ b/resources/profiles/Meltingplot/process/0.36mm Optimal 0.8 nozzle @Meltingplot MBL.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "0.36mm Optimal 0.8 nozzle @Meltingplot MBL", + "inherits": "fdm_process_meltingplot_mbl_08_nozzle", + "from": "system", + "setting_id": "WpPpQuf0jWaXQaPU", + "instantiation": "true", + "layer_height": "0.36", + "compatible_printers": [ + "Meltingplot MBL 133 0.8 nozzle", + "Meltingplot MBL 136 0.8 nozzle", + "Meltingplot MBL 308 0.8 nozzle", + "Meltingplot MBL 480 0.8 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/process/0.38mm Standard 0.8 nozzle @Meltingplot CHX 350.json b/resources/profiles/Meltingplot/process/0.38mm Standard 0.8 nozzle @Meltingplot CHX 350.json new file mode 100644 index 0000000000..40d74e2bb3 --- /dev/null +++ b/resources/profiles/Meltingplot/process/0.38mm Standard 0.8 nozzle @Meltingplot CHX 350.json @@ -0,0 +1,12 @@ +{ + "type": "process", + "name": "0.38mm Standard 0.8 nozzle @Meltingplot CHX 350", + "inherits": "fdm_process_meltingplot_chx_large_nozzle", + "from": "system", + "setting_id": "pKcgDKQM9IVmXiym", + "instantiation": "true", + "layer_height": "0.38", + "compatible_printers": [ + "Meltingplot CHX 350 0.8 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/process/0.38mm Standard 0.8 nozzle @Meltingplot MBL.json b/resources/profiles/Meltingplot/process/0.38mm Standard 0.8 nozzle @Meltingplot MBL.json new file mode 100644 index 0000000000..c555721f40 --- /dev/null +++ b/resources/profiles/Meltingplot/process/0.38mm Standard 0.8 nozzle @Meltingplot MBL.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "0.38mm Standard 0.8 nozzle @Meltingplot MBL", + "inherits": "fdm_process_meltingplot_mbl_08_nozzle", + "from": "system", + "setting_id": "IMZxMsLnd5IfiDFQ", + "instantiation": "true", + "layer_height": "0.38", + "compatible_printers": [ + "Meltingplot MBL 133 0.8 nozzle", + "Meltingplot MBL 136 0.8 nozzle", + "Meltingplot MBL 308 0.8 nozzle", + "Meltingplot MBL 480 0.8 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/process/0.44mm Fine 1.0 nozzle @Meltingplot CHX 350.json b/resources/profiles/Meltingplot/process/0.44mm Fine 1.0 nozzle @Meltingplot CHX 350.json new file mode 100644 index 0000000000..4f8e9487d5 --- /dev/null +++ b/resources/profiles/Meltingplot/process/0.44mm Fine 1.0 nozzle @Meltingplot CHX 350.json @@ -0,0 +1,12 @@ +{ + "type": "process", + "name": "0.44mm Fine 1.0 nozzle @Meltingplot CHX 350", + "inherits": "fdm_process_meltingplot_chx_large_nozzle", + "from": "system", + "setting_id": "QLMHgE0vHGQWiuz7", + "instantiation": "true", + "layer_height": "0.44", + "compatible_printers": [ + "Meltingplot CHX 350 1.0 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/process/0.44mm Fine 1.0 nozzle @Meltingplot MBL.json b/resources/profiles/Meltingplot/process/0.44mm Fine 1.0 nozzle @Meltingplot MBL.json new file mode 100644 index 0000000000..4f321f0192 --- /dev/null +++ b/resources/profiles/Meltingplot/process/0.44mm Fine 1.0 nozzle @Meltingplot MBL.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "0.44mm Fine 1.0 nozzle @Meltingplot MBL", + "inherits": "fdm_process_meltingplot_mbl_10_nozzle", + "from": "system", + "setting_id": "tjLfITsaMySQV6OC", + "instantiation": "true", + "layer_height": "0.44", + "compatible_printers": [ + "Meltingplot MBL 133 1.0 nozzle", + "Meltingplot MBL 136 1.0 nozzle", + "Meltingplot MBL 308 1.0 nozzle", + "Meltingplot MBL 480 1.0 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/process/0.48mm Fine 1.2 nozzle @Meltingplot CHX 350.json b/resources/profiles/Meltingplot/process/0.48mm Fine 1.2 nozzle @Meltingplot CHX 350.json new file mode 100644 index 0000000000..2df947e174 --- /dev/null +++ b/resources/profiles/Meltingplot/process/0.48mm Fine 1.2 nozzle @Meltingplot CHX 350.json @@ -0,0 +1,12 @@ +{ + "type": "process", + "name": "0.48mm Fine 1.2 nozzle @Meltingplot CHX 350", + "inherits": "fdm_process_meltingplot_chx_large_nozzle", + "from": "system", + "setting_id": "yzaZIGtEhvf2GGbl", + "instantiation": "true", + "layer_height": "0.48", + "compatible_printers": [ + "Meltingplot CHX 350 1.2 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/process/0.48mm Fine 1.2 nozzle @Meltingplot MBL.json b/resources/profiles/Meltingplot/process/0.48mm Fine 1.2 nozzle @Meltingplot MBL.json new file mode 100644 index 0000000000..7702399184 --- /dev/null +++ b/resources/profiles/Meltingplot/process/0.48mm Fine 1.2 nozzle @Meltingplot MBL.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "0.48mm Fine 1.2 nozzle @Meltingplot MBL", + "inherits": "fdm_process_meltingplot_mbl_12_nozzle", + "from": "system", + "setting_id": "erJDLPP5pRQnGwoJ", + "instantiation": "true", + "layer_height": "0.48", + "compatible_printers": [ + "Meltingplot MBL 133 1.2 nozzle", + "Meltingplot MBL 136 1.2 nozzle", + "Meltingplot MBL 308 1.2 nozzle", + "Meltingplot MBL 480 1.2 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/process/0.48mm Optimal 1.0 nozzle @Meltingplot CHX 350.json b/resources/profiles/Meltingplot/process/0.48mm Optimal 1.0 nozzle @Meltingplot CHX 350.json new file mode 100644 index 0000000000..d88e9a538c --- /dev/null +++ b/resources/profiles/Meltingplot/process/0.48mm Optimal 1.0 nozzle @Meltingplot CHX 350.json @@ -0,0 +1,12 @@ +{ + "type": "process", + "name": "0.48mm Optimal 1.0 nozzle @Meltingplot CHX 350", + "inherits": "fdm_process_meltingplot_chx_large_nozzle", + "from": "system", + "setting_id": "dZw2B5t8nN5lhyXI", + "instantiation": "true", + "layer_height": "0.48", + "compatible_printers": [ + "Meltingplot CHX 350 1.0 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/process/0.48mm Optimal 1.0 nozzle @Meltingplot MBL.json b/resources/profiles/Meltingplot/process/0.48mm Optimal 1.0 nozzle @Meltingplot MBL.json new file mode 100644 index 0000000000..2b20bba856 --- /dev/null +++ b/resources/profiles/Meltingplot/process/0.48mm Optimal 1.0 nozzle @Meltingplot MBL.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "0.48mm Optimal 1.0 nozzle @Meltingplot MBL", + "inherits": "fdm_process_meltingplot_mbl_10_nozzle", + "from": "system", + "setting_id": "5wtjDWniGYAAtn79", + "instantiation": "true", + "layer_height": "0.48", + "compatible_printers": [ + "Meltingplot MBL 133 1.0 nozzle", + "Meltingplot MBL 136 1.0 nozzle", + "Meltingplot MBL 308 1.0 nozzle", + "Meltingplot MBL 480 1.0 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/process/0.56mm Optimal 1.2 nozzle @Meltingplot CHX 350.json b/resources/profiles/Meltingplot/process/0.56mm Optimal 1.2 nozzle @Meltingplot CHX 350.json new file mode 100644 index 0000000000..c29d827b2e --- /dev/null +++ b/resources/profiles/Meltingplot/process/0.56mm Optimal 1.2 nozzle @Meltingplot CHX 350.json @@ -0,0 +1,12 @@ +{ + "type": "process", + "name": "0.56mm Optimal 1.2 nozzle @Meltingplot CHX 350", + "inherits": "fdm_process_meltingplot_chx_large_nozzle", + "from": "system", + "setting_id": "l6wYSAIFuyQFgT5X", + "instantiation": "true", + "layer_height": "0.56", + "compatible_printers": [ + "Meltingplot CHX 350 1.2 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/process/0.56mm Optimal 1.2 nozzle @Meltingplot MBL.json b/resources/profiles/Meltingplot/process/0.56mm Optimal 1.2 nozzle @Meltingplot MBL.json new file mode 100644 index 0000000000..f33064051a --- /dev/null +++ b/resources/profiles/Meltingplot/process/0.56mm Optimal 1.2 nozzle @Meltingplot MBL.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "0.56mm Optimal 1.2 nozzle @Meltingplot MBL", + "inherits": "fdm_process_meltingplot_mbl_12_nozzle", + "from": "system", + "setting_id": "i2aDrQXA45e6DpzC", + "instantiation": "true", + "layer_height": "0.56", + "compatible_printers": [ + "Meltingplot MBL 133 1.2 nozzle", + "Meltingplot MBL 136 1.2 nozzle", + "Meltingplot MBL 308 1.2 nozzle", + "Meltingplot MBL 480 1.2 nozzle" + ] +} diff --git a/resources/profiles/Meltingplot/process/fdm_process_common.json b/resources/profiles/Meltingplot/process/fdm_process_common.json new file mode 100644 index 0000000000..ae3651d8fd --- /dev/null +++ b/resources/profiles/Meltingplot/process/fdm_process_common.json @@ -0,0 +1,107 @@ +{ + "type": "process", + "name": "fdm_process_common", + "from": "system", + "instantiation": "false", + "reduce_crossing_wall": "0", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_thickness": "0", + "bridge_speed": "50", + "brim_width": "5", + "brim_object_gap": "0.1", + "compatible_printers": [], + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "1000", + "initial_layer_acceleration": "500", + "top_surface_acceleration": "1000", + "travel_acceleration": "1000", + "inner_wall_acceleration": "1000", + "outer_wall_acceleration": "700", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0", + "enable_arc_fitting": "0", + "wall_infill_order": "inner wall/outer wall/infill", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "crosshatch", + "initial_layer_print_height": "0.2", + "infill_combination": "0", + "infill_wall_overlap": "25%", + "interface_shells": "0", + "ironing_flow": "10%", + "ironing_spacing": "0.15", + "ironing_speed": "30", + "ironing_type": "no ironing", + "reduce_infill_retraction": "1", + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[initial_tool]}_{printer_model}_{print_time}.gcode", + "detect_overhang_wall": "1", + "slowdown_for_curled_perimeters": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "50", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "10", + "line_width": "110%", + "inner_wall_line_width": "110%", + "outer_wall_line_width": "100%", + "precise_outer_wall": "0", + "top_surface_line_width": "93.75%", + "sparse_infill_line_width": "110%", + "initial_layer_line_width": "120%", + "internal_solid_infill_line_width": "120%", + "support_line_width": "96%", + "wall_loops": "3", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "2", + "skirt_height": "3", + "min_skirt_length": "4", + "skirt_loops": "0", + "minimum_sparse_infill_area": "15", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.2", + "support_bottom_z_distance": "0.2", + "support_filament": "0", + "support_interface_loop_pattern": "0", + "support_interface_filament": "0", + "support_interface_top_layers": "2", + "support_interface_bottom_layers": "2", + "support_interface_spacing": "0.5", + "support_interface_speed": "80", + "support_base_pattern": "default", + "support_base_pattern_spacing": "2.5", + "support_speed": "150", + "support_threshold_angle": "30", + "support_object_xy_distance": "0.35", + "tree_support_branch_angle": "30", + "tree_support_wall_count": "0", + "detect_thin_wall": "0", + "top_surface_pattern": "monotonicline", + "top_shell_thickness": "0.8", + "enable_prime_tower": "1", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "layer_height": "0.2", + "bottom_shell_layers": "3", + "top_shell_layers": "4", + "bridge_flow": "1", + "initial_layer_speed": "45", + "initial_layer_infill_speed": "45", + "outer_wall_speed": "45", + "inner_wall_speed": "80", + "sparse_infill_speed": "150", + "internal_solid_infill_speed": "150", + "top_surface_speed": "50", + "gap_infill_speed": "30", + "travel_speed": "200" +} diff --git a/resources/profiles/Meltingplot/process/fdm_process_meltingplot_chx_common.json b/resources/profiles/Meltingplot/process/fdm_process_meltingplot_chx_common.json new file mode 100644 index 0000000000..2a27efcb54 --- /dev/null +++ b/resources/profiles/Meltingplot/process/fdm_process_meltingplot_chx_common.json @@ -0,0 +1,39 @@ +{ + "type": "process", + "name": "fdm_process_meltingplot_chx_common", + "inherits": "fdm_process_common", + "from": "system", + "instantiation": "false", + "filename_format": "{input_filename_base}_L{layer_height}mm_N{nozzle_diameter[0]}_{filament_type[initial_tool]}_{printer_model}_{print_time}.gcode", + "brim_object_gap": "0", + "brim_type": "outer_only", + "default_acceleration": "6000", + "slowdown_for_curled_perimeters": "0", + "enable_support": "1", + "extrusion_rate_smoothing_external_perimeter_only": "1", + "gap_infill_speed": "250", + "infill_wall_overlap": "15%", + "initial_layer_acceleration": "500", + "initial_layer_infill_speed": "30", + "initial_layer_line_width": "120%", + "initial_layer_speed": "20", + "inner_wall_line_width": "110%", + "inner_wall_speed": "300", + "internal_solid_infill_line_width": "115%", + "internal_solid_infill_speed": "250", + "line_width": "120%", + "reduce_infill_retraction": "0", + "seam_gap": "0", + "skirt_speed": "20", + "skirt_type": "perobject", + "slow_down_layers": "3", + "sparse_infill_line_width": "110%", + "support_line_width": "110%", + "support_type": "tree(auto)", + "top_shell_layers": "5", + "top_surface_acceleration": "2000", + "top_surface_line_width": "110%", + "top_surface_speed": "200", + "travel_speed": "1000", + "wall_generator": "classic" +} diff --git a/resources/profiles/Meltingplot/process/fdm_process_meltingplot_chx_large_nozzle.json b/resources/profiles/Meltingplot/process/fdm_process_meltingplot_chx_large_nozzle.json new file mode 100644 index 0000000000..63bf9517b0 --- /dev/null +++ b/resources/profiles/Meltingplot/process/fdm_process_meltingplot_chx_large_nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "fdm_process_meltingplot_chx_large_nozzle", + "inherits": "fdm_process_meltingplot_chx_common", + "from": "system", + "instantiation": "false", + "bottom_shell_layers": "4", + "initial_layer_print_height": "0.5", + "inner_wall_acceleration": "6000", + "max_volumetric_extrusion_rate_slope": "300", + "outer_wall_acceleration": "2000", + "outer_wall_line_width": "110%", + "outer_wall_speed": "80", + "sparse_infill_pattern": "cubic", + "sparse_infill_speed": "300", + "support_base_pattern_spacing": "7.5", + "support_interface_speed": "80", + "support_object_first_layer_gap": "0.5", + "support_object_xy_distance": "0.45", + "support_speed": "200", + "support_style": "tree_slim", + "support_threshold_angle": "22", + "top_shell_thickness": "0.6", + "travel_acceleration": "6000", + "tree_support_tip_diameter": "1.2" +} diff --git a/resources/profiles/Meltingplot/process/fdm_process_meltingplot_chx_small_nozzle.json b/resources/profiles/Meltingplot/process/fdm_process_meltingplot_chx_small_nozzle.json new file mode 100644 index 0000000000..95506dcd70 --- /dev/null +++ b/resources/profiles/Meltingplot/process/fdm_process_meltingplot_chx_small_nozzle.json @@ -0,0 +1,24 @@ +{ + "type": "process", + "name": "fdm_process_meltingplot_chx_small_nozzle", + "inherits": "fdm_process_meltingplot_chx_common", + "from": "system", + "instantiation": "false", + "bottom_shell_thickness": "2", + "default_jerk": "12", + "infill_jerk": "12", + "initial_layer_jerk": "5", + "initial_layer_print_height": "0.4", + "inner_wall_acceleration": "6000", + "outer_wall_acceleration": "3000", + "outer_wall_jerk": "6", + "outer_wall_line_width": "115%", + "outer_wall_speed": "220", + "sparse_infill_speed": "270", + "support_top_z_distance": "0.3", + "top_shell_thickness": "2", + "top_surface_jerk": "6", + "travel_acceleration": "6000", + "wall_sequence": "inner-outer-inner wall", + "wipe_before_external_loop": "1" +} diff --git a/resources/profiles/Meltingplot/process/fdm_process_meltingplot_mbl_04_nozzle.json b/resources/profiles/Meltingplot/process/fdm_process_meltingplot_mbl_04_nozzle.json new file mode 100644 index 0000000000..bef0abf7e6 --- /dev/null +++ b/resources/profiles/Meltingplot/process/fdm_process_meltingplot_mbl_04_nozzle.json @@ -0,0 +1,14 @@ +{ + "type": "process", + "name": "fdm_process_meltingplot_mbl_04_nozzle", + "inherits": "fdm_process_meltingplot_mbl_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "0.85", + "initial_layer_print_height": "0.3", + "line_width": "115%", + "inner_wall_line_width": "115%", + "outer_wall_line_width": "115%", + "sparse_infill_line_width": "115%", + "internal_solid_infill_line_width": "115%" +} diff --git a/resources/profiles/Meltingplot/process/fdm_process_meltingplot_mbl_06_nozzle.json b/resources/profiles/Meltingplot/process/fdm_process_meltingplot_mbl_06_nozzle.json new file mode 100644 index 0000000000..e35d4446c1 --- /dev/null +++ b/resources/profiles/Meltingplot/process/fdm_process_meltingplot_mbl_06_nozzle.json @@ -0,0 +1,14 @@ +{ + "type": "process", + "name": "fdm_process_meltingplot_mbl_06_nozzle", + "inherits": "fdm_process_meltingplot_mbl_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "0.65", + "initial_layer_print_height": "0.4", + "line_width": "120%", + "inner_wall_line_width": "120%", + "outer_wall_line_width": "110%", + "sparse_infill_line_width": "120%", + "internal_solid_infill_line_width": "120%" +} diff --git a/resources/profiles/Meltingplot/process/fdm_process_meltingplot_mbl_08_nozzle.json b/resources/profiles/Meltingplot/process/fdm_process_meltingplot_mbl_08_nozzle.json new file mode 100644 index 0000000000..7548418e1f --- /dev/null +++ b/resources/profiles/Meltingplot/process/fdm_process_meltingplot_mbl_08_nozzle.json @@ -0,0 +1,14 @@ +{ + "type": "process", + "name": "fdm_process_meltingplot_mbl_08_nozzle", + "inherits": "fdm_process_meltingplot_mbl_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "0.5", + "initial_layer_print_height": "0.5", + "line_width": "120%", + "inner_wall_line_width": "120%", + "outer_wall_line_width": "115%", + "sparse_infill_line_width": "115%", + "internal_solid_infill_line_width": "120%" +} diff --git a/resources/profiles/Meltingplot/process/fdm_process_meltingplot_mbl_10_nozzle.json b/resources/profiles/Meltingplot/process/fdm_process_meltingplot_mbl_10_nozzle.json new file mode 100644 index 0000000000..811916f197 --- /dev/null +++ b/resources/profiles/Meltingplot/process/fdm_process_meltingplot_mbl_10_nozzle.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "fdm_process_meltingplot_mbl_10_nozzle", + "inherits": "fdm_process_meltingplot_mbl_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "0.4", + "initial_layer_print_height": "0.5", + "infill_wall_overlap": "15%", + "line_width": "120%", + "inner_wall_line_width": "120%", + "outer_wall_line_width": "110%", + "sparse_infill_line_width": "120%", + "internal_solid_infill_line_width": "120%" +} diff --git a/resources/profiles/Meltingplot/process/fdm_process_meltingplot_mbl_12_nozzle.json b/resources/profiles/Meltingplot/process/fdm_process_meltingplot_mbl_12_nozzle.json new file mode 100644 index 0000000000..02f4221eb9 --- /dev/null +++ b/resources/profiles/Meltingplot/process/fdm_process_meltingplot_mbl_12_nozzle.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "fdm_process_meltingplot_mbl_12_nozzle", + "inherits": "fdm_process_meltingplot_mbl_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "0.4", + "initial_layer_print_height": "0.5", + "infill_wall_overlap": "15%", + "line_width": "120%", + "inner_wall_line_width": "120%", + "outer_wall_line_width": "110%", + "sparse_infill_line_width": "120%", + "internal_solid_infill_line_width": "120%" +} diff --git a/resources/profiles/Meltingplot/process/fdm_process_meltingplot_mbl_common.json b/resources/profiles/Meltingplot/process/fdm_process_meltingplot_mbl_common.json new file mode 100644 index 0000000000..0e94be6513 --- /dev/null +++ b/resources/profiles/Meltingplot/process/fdm_process_meltingplot_mbl_common.json @@ -0,0 +1,60 @@ +{ + "type": "process", + "name": "fdm_process_meltingplot_mbl_common", + "inherits": "fdm_process_common", + "from": "system", + "instantiation": "false", + "filename_format": "{input_filename_base}_L{layer_height}mm_N{nozzle_diameter[0]}_{filament_type[initial_tool]}_{printer_model}_{print_time}.gcode", + "bottom_shell_layers": "4", + "bottom_shell_thickness": "0.8", + "bridge_speed": "20", + "slowdown_for_curled_perimeters": "0", + "default_acceleration": "0", + "initial_layer_acceleration": "0", + "inner_wall_acceleration": "0", + "outer_wall_acceleration": "0", + "top_surface_acceleration": "0", + "travel_acceleration": "0", + "detect_thin_wall": "1", + "elefant_foot_compensation": "0.1", + "enable_prime_tower": "0", + "enable_support": "0", + "gap_infill_speed": "42", + "infill_wall_overlap": "20%", + "initial_layer_infill_speed": "30", + "initial_layer_line_width": "120%", + "initial_layer_speed": "20", + "inner_wall_speed": "45", + "internal_solid_infill_speed": "80", + "outer_wall_speed": "42", + "prime_tower_width": "60", + "resolution": "0.01", + "seam_position": "aligned", + "skirt_distance": "5", + "skirt_height": "1", + "skirt_loops": "3", + "small_perimeter_speed": "42", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "cubic", + "sparse_infill_speed": "80", + "standby_temperature_delta": "-100", + "support_base_pattern": "rectilinear", + "support_base_pattern_spacing": "5", + "support_interface_spacing": "0.2", + "support_interface_speed": "40", + "support_interface_top_layers": "4", + "support_interface_bottom_layers": "4", + "support_line_width": "100%", + "support_object_xy_distance": "0.2", + "support_on_build_plate_only": "1", + "support_speed": "50", + "support_style": "snug", + "support_threshold_angle": "55", + "support_top_z_distance": "0.1", + "top_shell_layers": "5", + "top_shell_thickness": "1", + "top_surface_line_width": "110%", + "top_surface_speed": "42", + "travel_speed": "350", + "wall_loops": "2" +} diff --git a/resources/profiles/OrcaFilamentLibrary.json b/resources/profiles/OrcaFilamentLibrary.json index 58abbb2be0..7368c41633 100644 --- a/resources/profiles/OrcaFilamentLibrary.json +++ b/resources/profiles/OrcaFilamentLibrary.json @@ -1,6 +1,6 @@ { "name": "OrcaFilamentLibrary", - "version": "02.04.00.09", + "version": "02.04.00.11", "force_update": "0", "description": "Orca Filament Library", "filament_list": [ @@ -92,10 +92,18 @@ "name": "fdm_filament_tpu", "sub_path": "filament/base/fdm_filament_tpu.json" }, + { + "name": "FusRock ABS-GF @BBL base", + "sub_path": "filament/FusRock/BBL/FusRock ABS-GF @BBL base.json" + }, { "name": "FusRock ABS-GF @System", "sub_path": "filament/FusRock/FusRock ABS-GF @System.json" }, + { + "name": "BETA ABS @base", + "sub_path": "filament/BETA/BETA ABS @base.json" + }, { "name": "Bambu ABS @base", "sub_path": "filament/Bambu/Bambu ABS @base.json" @@ -140,6 +148,10 @@ "name": "FDplast ABS @base", "sub_path": "filament/FDplast/FDplast ABS @base.json" }, + { + "name": "Generic ABS @BBL base", + "sub_path": "filament/addnorth/BBL/Generic ABS @BBL base.json" + }, { "name": "Generic ABS @System", "sub_path": "filament/Generic ABS @System.json" @@ -156,6 +168,14 @@ "name": "PolyLite ABS @base", "sub_path": "filament/Polymaker/PolyLite ABS @base.json" }, + { + "name": "Printalot ABS @base", + "sub_path": "filament/Printalot/Printalot ABS @base.json" + }, + { + "name": "BETA ASA @base", + "sub_path": "filament/BETA/BETA ASA @base.json" + }, { "name": "Bambu ASA @base", "sub_path": "filament/Bambu/Bambu ASA @base.json" @@ -220,6 +240,10 @@ "name": "Generic EVA @System", "sub_path": "filament/Generic EVA @System.json" }, + { + "name": "BETA HIPS @base", + "sub_path": "filament/BETA/BETA HIPS @base.json" + }, { "name": "FDplast HIPS @base", "sub_path": "filament/FDplast/FDplast HIPS @base.json" @@ -232,6 +256,10 @@ "name": "AliZ PA-CF @base", "sub_path": "filament/AliZ/AliZ PA-CF @base.json" }, + { + "name": "BETA PAHT-CF @base", + "sub_path": "filament/BETA/BETA PAHT-CF @base.json" + }, { "name": "Bambu PA-CF @base", "sub_path": "filament/Bambu/Bambu PA-CF @base.json" @@ -284,22 +312,46 @@ "name": "Fiberon PA12-CF @base", "sub_path": "filament/Polymaker/Fiberon PA12-CF @base.json" }, + { + "name": "Fiberon PA12-CF10 @base", + "sub_path": "filament/Polymaker/Fiberon PA12-CF10 @base.json" + }, { "name": "Fiberon PA6-CF @base", "sub_path": "filament/Polymaker/Fiberon PA6-CF @base.json" }, + { + "name": "Fiberon PA6-CF20 @base", + "sub_path": "filament/Polymaker/Fiberon PA6-CF20 @base.json" + }, { "name": "Fiberon PA6-GF @base", "sub_path": "filament/Polymaker/Fiberon PA6-GF @base.json" }, + { + "name": "Fiberon PA6-GF25 @base", + "sub_path": "filament/Polymaker/Fiberon PA6-GF25 @base.json" + }, { "name": "Fiberon PA612-CF @base", "sub_path": "filament/Polymaker/Fiberon PA612-CF @base.json" }, + { + "name": "Fiberon PA612-CF15 @base", + "sub_path": "filament/Polymaker/Fiberon PA612-CF15 @base.json" + }, + { + "name": "Generic PA @BBL base", + "sub_path": "filament/addnorth/BBL/Generic PA @BBL base.json" + }, { "name": "Generic PA @System", "sub_path": "filament/Generic PA @System.json" }, + { + "name": "Generic PA-CF @BBL base", + "sub_path": "filament/addnorth/BBL/Generic PA-CF @BBL base.json" + }, { "name": "Generic PA-CF @System", "sub_path": "filament/Generic PA-CF @System.json" @@ -324,6 +376,10 @@ "name": "Elegoo PC @base", "sub_path": "filament/Elegoo/Elegoo PC @base.json" }, + { + "name": "Generic PC @BBL base", + "sub_path": "filament/addnorth/BBL/Generic PC @BBL base.json" + }, { "name": "Generic PC @System", "sub_path": "filament/Generic PC @System.json" @@ -348,6 +404,62 @@ "name": "AliZ PETG @base", "sub_path": "filament/AliZ/AliZ PETG @base.json" }, + { + "name": "BETA PETG @base", + "sub_path": "filament/BETA/BETA PETG @base.json" + }, + { + "name": "BETA PETG Fluorescence @base", + "sub_path": "filament/BETA/BETA PETG Fluorescence @base.json" + }, + { + "name": "BETA PETG Glitter @base", + "sub_path": "filament/BETA/BETA PETG Glitter @base.json" + }, + { + "name": "BETA PETG Glow @base", + "sub_path": "filament/BETA/BETA PETG Glow @base.json" + }, + { + "name": "BETA PETG Gradient @base", + "sub_path": "filament/BETA/BETA PETG Gradient @base.json" + }, + { + "name": "BETA PETG HF @base", + "sub_path": "filament/BETA/BETA PETG HF @base.json" + }, + { + "name": "BETA PETG Heat Color Change @base", + "sub_path": "filament/BETA/BETA PETG Heat Color Change @base.json" + }, + { + "name": "BETA PETG Marble @base", + "sub_path": "filament/BETA/BETA PETG Marble @base.json" + }, + { + "name": "BETA PETG Matte @base", + "sub_path": "filament/BETA/BETA PETG Matte @base.json" + }, + { + "name": "BETA PETG Metallic @base", + "sub_path": "filament/BETA/BETA PETG Metallic @base.json" + }, + { + "name": "BETA PETG Transparent @base", + "sub_path": "filament/BETA/BETA PETG Transparent @base.json" + }, + { + "name": "BETA PETG UV Color Change @base", + "sub_path": "filament/BETA/BETA PETG UV Color Change @base.json" + }, + { + "name": "BETA PETG-CF @base", + "sub_path": "filament/BETA/BETA PETG-CF @base.json" + }, + { + "name": "BETA PETG-GF @base", + "sub_path": "filament/BETA/BETA PETG-GF @base.json" + }, { "name": "Bambu PET-CF @base", "sub_path": "filament/Bambu/Bambu PET-CF @base.json" @@ -416,6 +528,10 @@ "name": "Fiberon PET-CF @base", "sub_path": "filament/Polymaker/Fiberon PET-CF @base.json" }, + { + "name": "Fiberon PET-CF17 @base", + "sub_path": "filament/Polymaker/Fiberon PET-CF17 @base.json" + }, { "name": "Fiberon PETG-ESD @base", "sub_path": "filament/Polymaker/Fiberon PETG-ESD @base.json" @@ -424,10 +540,18 @@ "name": "Fiberon PETG-rCF @base", "sub_path": "filament/Polymaker/Fiberon PETG-rCF @base.json" }, + { + "name": "Fiberon PETG-rCF08 @base", + "sub_path": "filament/Polymaker/Fiberon PETG-rCF08 @base.json" + }, { "name": "FilAr PETG @base", "sub_path": "filament/FilAr/FilAr PETG @base.json" }, + { + "name": "Generic PETG @BBL base", + "sub_path": "filament/addnorth/BBL/Generic PETG @BBL base.json" + }, { "name": "Generic PETG @System", "sub_path": "filament/Generic PETG @System.json" @@ -476,6 +600,90 @@ "name": "AliZ PLA @base", "sub_path": "filament/AliZ/AliZ PLA @base.json" }, + { + "name": "BETA PLA Basic @base", + "sub_path": "filament/BETA/BETA PLA Basic @base.json" + }, + { + "name": "BETA PLA Chameleon @base", + "sub_path": "filament/BETA/BETA PLA Chameleon @base.json" + }, + { + "name": "BETA PLA Fluorescence @base", + "sub_path": "filament/BETA/BETA PLA Fluorescence @base.json" + }, + { + "name": "BETA PLA Glitter @base", + "sub_path": "filament/BETA/BETA PLA Glitter @base.json" + }, + { + "name": "BETA PLA Glow @base", + "sub_path": "filament/BETA/BETA PLA Glow @base.json" + }, + { + "name": "BETA PLA Gradient @base", + "sub_path": "filament/BETA/BETA PLA Gradient @base.json" + }, + { + "name": "BETA PLA Heat Color Change @base", + "sub_path": "filament/BETA/BETA PLA Heat Color Change @base.json" + }, + { + "name": "BETA PLA High Speed @base", + "sub_path": "filament/BETA/BETA PLA High Speed @base.json" + }, + { + "name": "BETA PLA High Temp @base", + "sub_path": "filament/BETA/BETA PLA High Temp @base.json" + }, + { + "name": "BETA PLA Marble @base", + "sub_path": "filament/BETA/BETA PLA Marble @base.json" + }, + { + "name": "BETA PLA Matte @base", + "sub_path": "filament/BETA/BETA PLA Matte @base.json" + }, + { + "name": "BETA PLA Metal @base", + "sub_path": "filament/BETA/BETA PLA Metal @base.json" + }, + { + "name": "BETA PLA Metallic @base", + "sub_path": "filament/BETA/BETA PLA Metallic @base.json" + }, + { + "name": "BETA PLA PRO @base", + "sub_path": "filament/BETA/BETA PLA PRO @base.json" + }, + { + "name": "BETA PLA Silk @base", + "sub_path": "filament/BETA/BETA PLA Silk @base.json" + }, + { + "name": "BETA PLA Silk+ @base", + "sub_path": "filament/BETA/BETA PLA Silk+ @base.json" + }, + { + "name": "BETA PLA Transparent @base", + "sub_path": "filament/BETA/BETA PLA Transparent @base.json" + }, + { + "name": "BETA PLA UV Color Change @base", + "sub_path": "filament/BETA/BETA PLA UV Color Change @base.json" + }, + { + "name": "BETA PLA Wood @base", + "sub_path": "filament/BETA/BETA PLA Wood @base.json" + }, + { + "name": "BETA PLA Youth @base", + "sub_path": "filament/BETA/BETA PLA Youth @base.json" + }, + { + "name": "BETA PLA-CF @base", + "sub_path": "filament/BETA/BETA PLA-CF @base.json" + }, { "name": "Bambu PLA Aero @base", "sub_path": "filament/Bambu/Bambu PLA Aero @base.json" @@ -632,10 +840,18 @@ "name": "FilAr PLA-mate @base", "sub_path": "filament/FilAr/FilAr PLA-mate @base.json" }, + { + "name": "Generic PLA @BBL base", + "sub_path": "filament/addnorth/BBL/Generic PLA @BBL base.json" + }, { "name": "Generic PLA @System", "sub_path": "filament/Generic PLA @System.json" }, + { + "name": "Generic PLA High Speed @BBL base", + "sub_path": "filament/addnorth/BBL/Generic PLA High Speed @BBL base.json" + }, { "name": "Generic PLA High Speed @System", "sub_path": "filament/Generic PLA High Speed @System.json" @@ -644,6 +860,14 @@ "name": "Generic PLA Matte @base", "sub_path": "filament/Generic PLA Matte @base.json" }, + { + "name": "Generic PLA Silk @BBL base", + "sub_path": "filament/addnorth/BBL/Generic PLA Silk @BBL base.json" + }, + { + "name": "Generic PLA-CF @BBL base", + "sub_path": "filament/addnorth/BBL/Generic PLA-CF @BBL base.json" + }, { "name": "Generic PLA-CF @System", "sub_path": "filament/Generic PLA-CF @System.json" @@ -764,18 +988,58 @@ "name": "Panchroma PLA UV Shift @base", "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @base.json" }, + { + "name": "PlastAR PLA @base", + "sub_path": "filament/Printalot/PlastAR PLA @base.json" + }, + { + "name": "PolyLite CosPLA @base", + "sub_path": "filament/Polymaker/PolyLite CosPLA @base.json" + }, { "name": "PolyLite PLA @base", "sub_path": "filament/Polymaker/PolyLite PLA @base.json" }, + { + "name": "PolyLite PLA Galaxy @base", + "sub_path": "filament/Polymaker/PolyLite PLA Galaxy @base.json" + }, + { + "name": "PolyLite PLA Glow @base", + "sub_path": "filament/Polymaker/PolyLite PLA Glow @base.json" + }, + { + "name": "PolyLite PLA Luminous @base", + "sub_path": "filament/Polymaker/PolyLite PLA Luminous @base.json" + }, + { + "name": "PolyLite PLA Neon @base", + "sub_path": "filament/Polymaker/PolyLite PLA Neon @base.json" + }, { "name": "PolyLite PLA Pro @base", "sub_path": "filament/Polymaker/PolyLite PLA Pro @base.json" }, + { + "name": "PolyLite PLA Starlight @base", + "sub_path": "filament/Polymaker/PolyLite PLA Starlight @base.json" + }, + { + "name": "PolyLite PLA Translucent @base", + "sub_path": "filament/Polymaker/PolyLite PLA Translucent @base.json" + }, { "name": "PolyTerra PLA @base", "sub_path": "filament/Polymaker/PolyTerra PLA @base.json" }, + { + "name": "PolyTerra PLA Marble @base", + "sub_path": "filament/Polymaker/PolyTerra PLA Marble @base.json" + }, + { + "name": "PolyTerra PLA+ @base", + "sub_path": "filament/Polymaker/PolyTerra PLA+ @base.json" + }, { "name": "Polymaker HT-PLA @base", "sub_path": "filament/Polymaker/Polymaker HT-PLA @base.json" @@ -784,6 +1048,10 @@ "name": "Polymaker HT-PLA-GF @base", "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @base.json" }, + { + "name": "Polymaker PLA Pro @base", + "sub_path": "filament/Polymaker/Polymaker PLA Pro @base.json" + }, { "name": "SUNLU PLA Marble @base", "sub_path": "filament/SUNLU/SUNLU Marble PLA @base.json" @@ -904,6 +1172,26 @@ "name": "Generic SBS @System", "sub_path": "filament/Generic SBS @System.json" }, + { + "name": "BETA PEBA 90A @base", + "sub_path": "filament/BETA/BETA PEBA 90A @base.json" + }, + { + "name": "BETA TPU 90A @base", + "sub_path": "filament/BETA/BETA TPU 90A @base.json" + }, + { + "name": "BETA TPU 95A @base", + "sub_path": "filament/BETA/BETA TPU 95A @base.json" + }, + { + "name": "BETA TPU 98A @base", + "sub_path": "filament/BETA/BETA TPU 98A @base.json" + }, + { + "name": "BETA TPU Matte @base", + "sub_path": "filament/BETA/BETA TPU Matte @base.json" + }, { "name": "Bambu TPU 95A @base", "sub_path": "filament/Bambu/Bambu TPU 95A @base.json" @@ -956,6 +1244,10 @@ "name": "FDplast TPU @base", "sub_path": "filament/FDplast/FDplast TPU @base.json" }, + { + "name": "Generic TPU @BBL base", + "sub_path": "filament/addnorth/BBL/Generic TPU @BBL base.json" + }, { "name": "Generic TPU @System", "sub_path": "filament/Generic TPU @System.json" @@ -964,6 +1256,38 @@ "name": "Overture TPU @base", "sub_path": "filament/Overture/Overture TPU @base.json" }, + { + "name": "FusRock ABS-GF @BBL A1", + "sub_path": "filament/FusRock/BBL/FusRock ABS-GF @BBL A1.json" + }, + { + "name": "FusRock ABS-GF @BBL H2D", + "sub_path": "filament/FusRock/BBL/FusRock ABS-GF @BBL H2D.json" + }, + { + "name": "FusRock ABS-GF @BBL P1P", + "sub_path": "filament/FusRock/BBL/FusRock ABS-GF @BBL P1P.json" + }, + { + "name": "FusRock ABS-GF @BBL X1C", + "sub_path": "filament/FusRock/BBL/FusRock ABS-GF @BBL X1C.json" + }, + { + "name": "BETA ABS @BBL A1", + "sub_path": "filament/BETA/BBL/BETA ABS @BBL A1.json" + }, + { + "name": "BETA ABS @BBL H2D", + "sub_path": "filament/BETA/BBL/BETA ABS @BBL H2D.json" + }, + { + "name": "BETA ABS @BBL P1P", + "sub_path": "filament/BETA/BBL/BETA ABS @BBL P1P.json" + }, + { + "name": "BETA ABS @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA ABS @BBL X1C.json" + }, { "name": "Bambu ABS @System", "sub_path": "filament/Bambu/Bambu ABS @System.json" @@ -976,10 +1300,42 @@ "name": "Bambu Support for ABS @System", "sub_path": "filament/Bambu/Bambu Support for ABS @System.json" }, + { + "name": "COEX ABS @BBL X1", + "sub_path": "filament/COEX/BBL/COEX ABS @BBL X1.json" + }, + { + "name": "COEX ABS @BBL X1 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX ABS @BBL X1 0.2 nozzle.json" + }, + { + "name": "COEX ABS @BBL X1C", + "sub_path": "filament/COEX/BBL/COEX ABS @BBL X1C.json" + }, + { + "name": "COEX ABS @BBL X1C 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX ABS @BBL X1C 0.2 nozzle.json" + }, { "name": "COEX ABS @System", "sub_path": "filament/COEX/COEX ABS @System.json" }, + { + "name": "COEX ABS PRIME @BBL X1", + "sub_path": "filament/COEX/BBL/COEX ABS PRIME @BBL X1.json" + }, + { + "name": "COEX ABS PRIME @BBL X1 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX ABS PRIME @BBL X1 0.2 nozzle.json" + }, + { + "name": "COEX ABS PRIME @BBL X1C", + "sub_path": "filament/COEX/BBL/COEX ABS PRIME @BBL X1C.json" + }, + { + "name": "COEX ABS PRIME @BBL X1C 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX ABS PRIME @BBL X1C 0.2 nozzle.json" + }, { "name": "COEX ABS PRIME @System", "sub_path": "filament/COEX/COEX ABS PRIME @System.json" @@ -1004,6 +1360,10 @@ "name": "FDplast ABS @System", "sub_path": "filament/FDplast/FDplast ABS @System.json" }, + { + "name": "addnorth ABS rABS", + "sub_path": "filament/addnorth/BBL/addnorth ABS rABS.json" + }, { "name": "NIT ABS @System", "sub_path": "filament/NIT/NIT ABS @System.json" @@ -1016,6 +1376,22 @@ "name": "PolyLite ABS @System", "sub_path": "filament/Polymaker/PolyLite ABS @System.json" }, + { + "name": "Printalot ABS @System", + "sub_path": "filament/Printalot/Printalot ABS @System.json" + }, + { + "name": "BETA ASA @BBL A1 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA ASA @BBL A1 0.4 nozzle.json" + }, + { + "name": "BETA ASA @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA ASA @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA ASA @BBL X1C 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA ASA @BBL X1C 0.4 nozzle.json" + }, { "name": "Bambu ASA @System", "sub_path": "filament/Bambu/Bambu ASA @System.json" @@ -1028,6 +1404,22 @@ "name": "Bambu ASA-CF @System", "sub_path": "filament/Bambu/Bambu ASA-CF @System.json" }, + { + "name": "COEX ASA PRIME @BBL X1", + "sub_path": "filament/COEX/BBL/COEX ASA PRIME @BBL X1.json" + }, + { + "name": "COEX ASA PRIME @BBL X1 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX ASA PRIME @BBL X1 0.2 nozzle.json" + }, + { + "name": "COEX ASA PRIME @BBL X1C", + "sub_path": "filament/COEX/BBL/COEX ASA PRIME @BBL X1C.json" + }, + { + "name": "COEX ASA PRIME @BBL X1C 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX ASA PRIME @BBL X1C 0.2 nozzle.json" + }, { "name": "COEX ASA PRIME @System", "sub_path": "filament/COEX/COEX ASA PRIME @System.json" @@ -1056,6 +1448,22 @@ "name": "Elegoo ASA-CF @base", "sub_path": "filament/Elegoo/Elegoo ASA-CF @base.json" }, + { + "name": "Overture ASA @BBL X1", + "sub_path": "filament/Overture/BBL/Overture ASA @BBL X1.json" + }, + { + "name": "Overture ASA @BBL X1 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture ASA @BBL X1 0.2 nozzle.json" + }, + { + "name": "Overture ASA @BBL X1C", + "sub_path": "filament/Overture/BBL/Overture ASA @BBL X1C.json" + }, + { + "name": "Overture ASA @BBL X1C 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture ASA @BBL X1C 0.2 nozzle.json" + }, { "name": "Overture ASA @System", "sub_path": "filament/Overture/Overture ASA @System.json" @@ -1064,14 +1472,38 @@ "name": "PolyLite ASA @System", "sub_path": "filament/Polymaker/PolyLite ASA @System.json" }, + { + "name": "BETA HIPS @BBL H2D", + "sub_path": "filament/BETA/BBL/BETA HIPS @BBL H2D.json" + }, + { + "name": "BETA HIPS @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA HIPS @BBL X1C.json" + }, { "name": "FDplast HIPS @System", "sub_path": "filament/FDplast/FDplast HIPS @System.json" }, + { + "name": "AliZ PA-CF @P1-X1", + "sub_path": "filament/AliZ/BBL/AliZ PA-CF @P1-X1.json" + }, { "name": "AliZ PA-CF @System", "sub_path": "filament/AliZ/AliZ PA-CF @System.json" }, + { + "name": "BETA PAHT-CF @BBL H2D", + "sub_path": "filament/BETA/BBL/BETA PAHT-CF @BBL H2D.json" + }, + { + "name": "BETA PAHT-CF @BBL P1P", + "sub_path": "filament/BETA/BBL/BETA PAHT-CF @BBL P1P.json" + }, + { + "name": "BETA PAHT-CF @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PAHT-CF @BBL X1C.json" + }, { "name": "Bambu PA-CF @System", "sub_path": "filament/Bambu/Bambu PA-CF @System.json" @@ -1096,10 +1528,18 @@ "name": "Bambu Support G @System", "sub_path": "filament/Bambu/Bambu Support G @System.json" }, + { + "name": "COEX NYLEX PA6-CF @BBL X1C", + "sub_path": "filament/COEX/BBL/COEX NYLEX PA6-CF @BBL X1C.json" + }, { "name": "COEX NYLEX PA6-CF @System", "sub_path": "filament/COEX/COEX NYLEX PA6-CF @System.json" }, + { + "name": "COEX NYLEX UNFILLED @BBL X1C", + "sub_path": "filament/COEX/BBL/COEX NYLEX UNFILLED @BBL X1C.json" + }, { "name": "DREMC PA12-CF @System", "sub_path": "filament/DREMC/DREMC PA12-CF @System.json" @@ -1120,18 +1560,54 @@ "name": "Fiberon PA12-CF @System", "sub_path": "filament/Polymaker/Fiberon PA12-CF @System.json" }, + { + "name": "Fiberon PA12-CF10 @BBL X1", + "sub_path": "filament/Polymaker/BBL/Fiberon PA12-CF10 @BBL X1.json" + }, { "name": "Fiberon PA6-CF @System", "sub_path": "filament/Polymaker/Fiberon PA6-CF @System.json" }, + { + "name": "Fiberon PA6-CF20 @BBL X1", + "sub_path": "filament/Polymaker/BBL/Fiberon PA6-CF20 @BBL X1.json" + }, { "name": "Fiberon PA6-GF @System", "sub_path": "filament/Polymaker/Fiberon PA6-GF @System.json" }, + { + "name": "Fiberon PA6-GF25 @BBL X1", + "sub_path": "filament/Polymaker/BBL/Fiberon PA6-GF25 @BBL X1.json" + }, { "name": "Fiberon PA612-CF @System", "sub_path": "filament/Polymaker/Fiberon PA612-CF @System.json" }, + { + "name": "Fiberon PA612-CF15 @BBL X1", + "sub_path": "filament/Polymaker/BBL/Fiberon PA612-CF15 @BBL X1.json" + }, + { + "name": "addnorth PA Adura", + "sub_path": "filament/addnorth/BBL/addnorth PA Adura.json" + }, + { + "name": "addnorth PA Adura FDA", + "sub_path": "filament/addnorth/BBL/addnorth PA Adura FDA.json" + }, + { + "name": "addnorth PA6 Addlantis", + "sub_path": "filament/addnorth/BBL/addnorth PA6 Addlantis.json" + }, + { + "name": "addnorth PVDF Adamant S1", + "sub_path": "filament/addnorth/BBL/addnorth PVDF Adamant S1.json" + }, + { + "name": "addnorth PA-CF Adura X", + "sub_path": "filament/addnorth/BBL/addnorth PA-CF Adura X.json" + }, { "name": "INSLOGIC PA6-66 @BBL P2S", "sub_path": "filament/INSLOGIC/BBL/INSLOGIC PA6-66 @BBL P2S.json" @@ -1172,6 +1648,34 @@ "name": "Elegoo PC-FR @base", "sub_path": "filament/Elegoo/Elegoo PC-FR @base.json" }, + { + "name": "addnorth PC BLend HT LCF", + "sub_path": "filament/addnorth/BBL/addnorth PC BLend HT LCF.json" + }, + { + "name": "COEX PCTG PRIME @BBL A1", + "sub_path": "filament/COEX/BBL/COEX PCTG PRIME @BBL A1.json" + }, + { + "name": "COEX PCTG PRIME @BBL A1 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX PCTG PRIME @BBL A1 0.2 nozzle.json" + }, + { + "name": "COEX PCTG PRIME @BBL A1 0.8 nozzle", + "sub_path": "filament/COEX/BBL/COEX PCTG PRIME @BBL A1 0.8 nozzle.json" + }, + { + "name": "COEX PCTG PRIME @BBL X1C", + "sub_path": "filament/COEX/BBL/COEX PCTG PRIME @BBL X1C.json" + }, + { + "name": "COEX PCTG PRIME @BBL X1C 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX PCTG PRIME @BBL X1C 0.2 nozzle.json" + }, + { + "name": "COEX PCTG PRIME @BBL X1C 0.8 nozzle", + "sub_path": "filament/COEX/BBL/COEX PCTG PRIME @BBL X1C 0.8 nozzle.json" + }, { "name": "COEX PCTG PRIME @System", "sub_path": "filament/COEX/COEX PCTG PRIME @System.json" @@ -1180,6 +1684,10 @@ "name": "Generic PE-CF @System", "sub_path": "filament/Generic PE-CF @System.json" }, + { + "name": "AliZ PETG @P1-X1", + "sub_path": "filament/AliZ/BBL/AliZ PETG @P1-X1.json" + }, { "name": "AliZ PETG @System", "sub_path": "filament/AliZ/AliZ PETG @System.json" @@ -1192,6 +1700,238 @@ "name": "AliZ PETG-Metal @base", "sub_path": "filament/AliZ/AliZ PETG-Metal @base.json" }, + { + "name": "BETA PETG @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PETG @BBL A1.json" + }, + { + "name": "BETA PETG @BBL A1M 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG @BBL A1M 0.4 nozzle.json" + }, + { + "name": "BETA PETG @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA PETG @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PETG @BBL X1C.json" + }, + { + "name": "BETA PETG Fluorescence @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PETG Fluorescence @BBL A1.json" + }, + { + "name": "BETA PETG Fluorescence @BBL A1M 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG Fluorescence @BBL A1M 0.4 nozzle.json" + }, + { + "name": "BETA PETG Fluorescence @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG Fluorescence @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA PETG Fluorescence @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PETG Fluorescence @BBL X1C.json" + }, + { + "name": "BETA PETG Glitter @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PETG Glitter @BBL A1.json" + }, + { + "name": "BETA PETG Glitter @BBL A1M 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG Glitter @BBL A1M 0.4 nozzle.json" + }, + { + "name": "BETA PETG Glitter @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG Glitter @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA PETG Glitter @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PETG Glitter @BBL X1C.json" + }, + { + "name": "BETA PETG Glow @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PETG Glow @BBL A1.json" + }, + { + "name": "BETA PETG Glow @BBL A1M 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG Glow @BBL A1M 0.4 nozzle.json" + }, + { + "name": "BETA PETG Glow @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG Glow @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA PETG Glow @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PETG Glow @BBL X1C.json" + }, + { + "name": "BETA PETG Gradient @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PETG Gradient @BBL A1.json" + }, + { + "name": "BETA PETG Gradient @BBL A1M 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG Gradient @BBL A1M 0.4 nozzle.json" + }, + { + "name": "BETA PETG Gradient @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG Gradient @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA PETG Gradient @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PETG Gradient @BBL X1C.json" + }, + { + "name": "BETA PETG HF @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PETG HF @BBL A1.json" + }, + { + "name": "BETA PETG HF @BBL A1M", + "sub_path": "filament/BETA/BBL/BETA PETG HF @BBL A1M.json" + }, + { + "name": "BETA PETG HF @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG HF @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA PETG HF @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PETG HF @BBL X1C.json" + }, + { + "name": "BETA PETG Heat Color Change @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PETG Heat Color Change @BBL A1.json" + }, + { + "name": "BETA PETG Heat Color Change @BBL A1M 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG Heat Color Change @BBL A1M 0.4 nozzle.json" + }, + { + "name": "BETA PETG Heat Color Change @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG Heat Color Change @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA PETG Heat Color Change @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PETG Heat Color Change @BBL X1C.json" + }, + { + "name": "BETA PETG Marble @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PETG Marble @BBL A1.json" + }, + { + "name": "BETA PETG Marble @BBL A1M 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG Marble @BBL A1M 0.4 nozzle.json" + }, + { + "name": "BETA PETG Marble @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG Marble @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA PETG Marble @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PETG Marble @BBL X1C.json" + }, + { + "name": "BETA PETG Matte @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PETG Matte @BBL A1.json" + }, + { + "name": "BETA PETG Matte @BBL A1M 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG Matte @BBL A1M 0.4 nozzle.json" + }, + { + "name": "BETA PETG Matte @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG Matte @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA PETG Matte @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PETG Matte @BBL X1C.json" + }, + { + "name": "BETA PETG Metallic @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PETG Metallic @BBL A1.json" + }, + { + "name": "BETA PETG Metallic @BBL A1M 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG Metallic @BBL A1M 0.4 nozzle.json" + }, + { + "name": "BETA PETG Metallic @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG Metallic @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA PETG Metallic @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PETG Metallic @BBL X1C.json" + }, + { + "name": "BETA PETG Transparent @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PETG Transparent @BBL A1.json" + }, + { + "name": "BETA PETG Transparent @BBL A1M", + "sub_path": "filament/BETA/BBL/BETA PETG Transparent @BBL A1M.json" + }, + { + "name": "BETA PETG Transparent @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG Transparent @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA PETG Transparent @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PETG Transparent @BBL X1C.json" + }, + { + "name": "BETA PETG UV Color Change @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PETG UV Color Change @BBL A1.json" + }, + { + "name": "BETA PETG UV Color Change @BBL A1M 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG UV Color Change @BBL A1M 0.4 nozzle.json" + }, + { + "name": "BETA PETG UV Color Change @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG UV Color Change @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA PETG UV Color Change @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PETG UV Color Change @BBL X1C.json" + }, + { + "name": "BETA PETG-CF @BBL A1 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG-CF @BBL A1 0.4 nozzle.json" + }, + { + "name": "BETA PETG-CF @BBL A1M 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG-CF @BBL A1M 0.4 nozzle.json" + }, + { + "name": "BETA PETG-CF @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG-CF @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA PETG-CF @BBL P1P 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG-CF @BBL P1P 0.4 nozzle.json" + }, + { + "name": "BETA PETG-CF @BBL X1C 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG-CF @BBL X1C 0.4 nozzle.json" + }, + { + "name": "BETA PETG-GF @BBL A1 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG-GF @BBL A1 0.4 nozzle.json" + }, + { + "name": "BETA PETG-GF @BBL A1M 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG-GF @BBL A1M 0.4 nozzle.json" + }, + { + "name": "BETA PETG-GF @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG-GF @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA PETG-GF @BBL P1P 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG-GF @BBL P1P 0.4 nozzle.json" + }, + { + "name": "BETA PETG-GF @BBL X1C 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PETG-GF @BBL X1C 0.4 nozzle.json" + }, { "name": "Bambu PET-CF @System", "sub_path": "filament/Bambu/Bambu PET-CF @System.json" @@ -1212,6 +1952,30 @@ "name": "Bambu PETG-CF @System", "sub_path": "filament/Bambu/Bambu PETG-CF @System.json" }, + { + "name": "COEX PETG @BBL A1", + "sub_path": "filament/COEX/BBL/COEX PETG @BBL A1.json" + }, + { + "name": "COEX PETG @BBL A1 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX PETG @BBL A1 0.2 nozzle.json" + }, + { + "name": "COEX PETG @BBL A1 0.8 nozzle", + "sub_path": "filament/COEX/BBL/COEX PETG @BBL A1 0.8 nozzle.json" + }, + { + "name": "COEX PETG @BBL X1C", + "sub_path": "filament/COEX/BBL/COEX PETG @BBL X1C.json" + }, + { + "name": "COEX PETG @BBL X1C 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX PETG @BBL X1C 0.2 nozzle.json" + }, + { + "name": "COEX PETG @BBL X1C 0.8 nozzle", + "sub_path": "filament/COEX/BBL/COEX PETG @BBL X1C 0.8 nozzle.json" + }, { "name": "COEX PETG @System", "sub_path": "filament/COEX/COEX PETG @System.json" @@ -1276,6 +2040,14 @@ "name": "Fiberon PET-CF @System", "sub_path": "filament/Polymaker/Fiberon PET-CF @System.json" }, + { + "name": "Fiberon PET-CF17 @BBL X1", + "sub_path": "filament/Polymaker/BBL/Fiberon PET-CF17 @BBL X1.json" + }, + { + "name": "Fiberon PETG-ESD @BBL base", + "sub_path": "filament/Polymaker/BBL/Fiberon PETG-ESD @BBL base.json" + }, { "name": "Fiberon PETG-ESD @System", "sub_path": "filament/Polymaker/Fiberon PETG-ESD @System.json" @@ -1284,6 +2056,10 @@ "name": "Fiberon PETG-rCF @System", "sub_path": "filament/Polymaker/Fiberon PETG-rCF @System.json" }, + { + "name": "Fiberon PETG-rCF08 @BBL X1", + "sub_path": "filament/Polymaker/BBL/Fiberon PETG-rCF08 @BBL X1.json" + }, { "name": "FilAr PETG Amarillo Lima", "sub_path": "filament/FilAr/FilAr PETG Amarillo Lima.json" @@ -1340,10 +2116,38 @@ "name": "FilAr PETG Rojo Carmesi", "sub_path": "filament/FilAr/FilAr PETG Rojo Carmesi.json" }, + { + "name": "addnorth PETG Base", + "sub_path": "filament/addnorth/BBL/addnorth PETG Base.json" + }, + { + "name": "addnorth PETG ESD", + "sub_path": "filament/addnorth/BBL/addnorth PETG ESD.json" + }, + { + "name": "addnorth PETG Economy", + "sub_path": "filament/addnorth/BBL/addnorth PETG Economy.json" + }, + { + "name": "addnorth PETG Flame v0", + "sub_path": "filament/addnorth/BBL/addnorth PETG Flame v0.json" + }, + { + "name": "addnorth PETG PRO Matte", + "sub_path": "filament/addnorth/BBL/addnorth PETG PRO Matte.json" + }, + { + "name": "addnorth PETG rPETG Matte", + "sub_path": "filament/addnorth/BBL/addnorth PETG rPETG Matte.json" + }, { "name": "Generic PETG HF @System", "sub_path": "filament/Generic PETG HF @System.json" }, + { + "name": "Generic PETG-CF @BBL base", + "sub_path": "filament/addnorth/BBL/Generic PETG-CF @BBL base.json" + }, { "name": "Generic PETG-CF @System", "sub_path": "filament/Generic PETG-CF @System.json" @@ -1396,10 +2200,434 @@ "name": "eSUN PETG @System", "sub_path": "filament/eSUN/eSUN PETG @System.json" }, + { + "name": "AliZ PLA @P1-X1", + "sub_path": "filament/AliZ/BBL/AliZ PLA @P1-X1.json" + }, { "name": "AliZ PLA @System", "sub_path": "filament/AliZ/AliZ PLA @System.json" }, + { + "name": "BETA PLA Basic @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PLA Basic @BBL A1.json" + }, + { + "name": "BETA PLA Basic @BBL A1M", + "sub_path": "filament/BETA/BBL/BETA PLA Basic @BBL A1M.json" + }, + { + "name": "BETA PLA Basic @BBL H2D", + "sub_path": "filament/BETA/BBL/BETA PLA Basic @BBL H2D.json" + }, + { + "name": "BETA PLA Basic @BBL P1P", + "sub_path": "filament/BETA/BBL/BETA PLA Basic @BBL P1P.json" + }, + { + "name": "BETA PLA Basic @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PLA Basic @BBL X1C.json" + }, + { + "name": "BETA PLA Chameleon @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PLA Chameleon @BBL A1.json" + }, + { + "name": "BETA PLA Chameleon @BBL A1M", + "sub_path": "filament/BETA/BBL/BETA PLA Chameleon @BBL A1M.json" + }, + { + "name": "BETA PLA Chameleon @BBL H2D", + "sub_path": "filament/BETA/BBL/BETA PLA Chameleon @BBL H2D.json" + }, + { + "name": "BETA PLA Chameleon @BBL P1P", + "sub_path": "filament/BETA/BBL/BETA PLA Chameleon @BBL P1P.json" + }, + { + "name": "BETA PLA Chameleon @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PLA Chameleon @BBL X1C.json" + }, + { + "name": "BETA PLA Fluorescence @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PLA Fluorescence @BBL A1.json" + }, + { + "name": "BETA PLA Fluorescence @BBL A1M", + "sub_path": "filament/BETA/BBL/BETA PLA Fluorescence @BBL A1M.json" + }, + { + "name": "BETA PLA Fluorescence @BBL H2D", + "sub_path": "filament/BETA/BBL/BETA PLA Fluorescence @BBL H2D.json" + }, + { + "name": "BETA PLA Fluorescence @BBL P1P", + "sub_path": "filament/BETA/BBL/BETA PLA Fluorescence @BBL P1P.json" + }, + { + "name": "BETA PLA Fluorescence @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PLA Fluorescence @BBL X1C.json" + }, + { + "name": "BETA PLA Glitter @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PLA Glitter @BBL A1.json" + }, + { + "name": "BETA PLA Glitter @BBL A1M", + "sub_path": "filament/BETA/BBL/BETA PLA Glitter @BBL A1M.json" + }, + { + "name": "BETA PLA Glitter @BBL H2D", + "sub_path": "filament/BETA/BBL/BETA PLA Glitter @BBL H2D.json" + }, + { + "name": "BETA PLA Glitter @BBL P1P", + "sub_path": "filament/BETA/BBL/BETA PLA Glitter @BBL P1P.json" + }, + { + "name": "BETA PLA Glitter @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PLA Glitter @BBL X1C.json" + }, + { + "name": "BETA PLA Glow @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PLA Glow @BBL A1.json" + }, + { + "name": "BETA PLA Glow @BBL A1M", + "sub_path": "filament/BETA/BBL/BETA PLA Glow @BBL A1M.json" + }, + { + "name": "BETA PLA Glow @BBL H2D", + "sub_path": "filament/BETA/BBL/BETA PLA Glow @BBL H2D.json" + }, + { + "name": "BETA PLA Glow @BBL P1P", + "sub_path": "filament/BETA/BBL/BETA PLA Glow @BBL P1P.json" + }, + { + "name": "BETA PLA Glow @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PLA Glow @BBL X1C.json" + }, + { + "name": "BETA PLA Gradient @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PLA Gradient @BBL A1.json" + }, + { + "name": "BETA PLA Gradient @BBL A1M", + "sub_path": "filament/BETA/BBL/BETA PLA Gradient @BBL A1M.json" + }, + { + "name": "BETA PLA Gradient @BBL H2D", + "sub_path": "filament/BETA/BBL/BETA PLA Gradient @BBL H2D.json" + }, + { + "name": "BETA PLA Gradient @BBL P1P", + "sub_path": "filament/BETA/BBL/BETA PLA Gradient @BBL P1P.json" + }, + { + "name": "BETA PLA Gradient @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PLA Gradient @BBL X1C.json" + }, + { + "name": "BETA PLA Heat Color Change @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PLA Heat Color Change @BBL A1.json" + }, + { + "name": "BETA PLA Heat Color Change @BBL A1M", + "sub_path": "filament/BETA/BBL/BETA PLA Heat Color Change @BBL A1M.json" + }, + { + "name": "BETA PLA Heat Color Change @BBL H2D", + "sub_path": "filament/BETA/BBL/BETA PLA Heat Color Change @BBL H2D.json" + }, + { + "name": "BETA PLA Heat Color Change @BBL P1P", + "sub_path": "filament/BETA/BBL/BETA PLA Heat Color Change @BBL P1P.json" + }, + { + "name": "BETA PLA Heat Color Change @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PLA Heat Color Change @BBL X1C.json" + }, + { + "name": "BETA PLA High Speed @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PLA High Speed @BBL A1.json" + }, + { + "name": "BETA PLA High Speed @BBL A1M", + "sub_path": "filament/BETA/BBL/BETA PLA High Speed @BBL A1M.json" + }, + { + "name": "BETA PLA High Speed @BBL H2D", + "sub_path": "filament/BETA/BBL/BETA PLA High Speed @BBL H2D.json" + }, + { + "name": "BETA PLA High Speed @BBL P1P", + "sub_path": "filament/BETA/BBL/BETA PLA High Speed @BBL P1P.json" + }, + { + "name": "BETA PLA High Speed @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PLA High Speed @BBL X1C.json" + }, + { + "name": "BETA PLA High Temp @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PLA High Temp @BBL A1.json" + }, + { + "name": "BETA PLA High Temp @BBL A1M", + "sub_path": "filament/BETA/BBL/BETA PLA High Temp @BBL A1M.json" + }, + { + "name": "BETA PLA High Temp @BBL H2D", + "sub_path": "filament/BETA/BBL/BETA PLA High Temp @BBL H2D.json" + }, + { + "name": "BETA PLA High Temp @BBL P1P", + "sub_path": "filament/BETA/BBL/BETA PLA High Temp @BBL P1P.json" + }, + { + "name": "BETA PLA High Temp @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PLA High Temp @BBL X1C.json" + }, + { + "name": "BETA PLA Marble @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PLA Marble @BBL A1.json" + }, + { + "name": "BETA PLA Marble @BBL A1M", + "sub_path": "filament/BETA/BBL/BETA PLA Marble @BBL A1M.json" + }, + { + "name": "BETA PLA Marble @BBL H2D", + "sub_path": "filament/BETA/BBL/BETA PLA Marble @BBL H2D.json" + }, + { + "name": "BETA PLA Marble @BBL P1P", + "sub_path": "filament/BETA/BBL/BETA PLA Marble @BBL P1P.json" + }, + { + "name": "BETA PLA Marble @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PLA Marble @BBL X1C.json" + }, + { + "name": "BETA PLA Matte @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PLA Matte @BBL A1.json" + }, + { + "name": "BETA PLA Matte @BBL A1M", + "sub_path": "filament/BETA/BBL/BETA PLA Matte @BBL A1M.json" + }, + { + "name": "BETA PLA Matte @BBL H2D", + "sub_path": "filament/BETA/BBL/BETA PLA Matte @BBL H2D.json" + }, + { + "name": "BETA PLA Matte @BBL P1P", + "sub_path": "filament/BETA/BBL/BETA PLA Matte @BBL P1P.json" + }, + { + "name": "BETA PLA Matte @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PLA Matte @BBL X1C.json" + }, + { + "name": "BETA PLA Metal @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PLA Metal @BBL A1.json" + }, + { + "name": "BETA PLA Metal @BBL A1M", + "sub_path": "filament/BETA/BBL/BETA PLA Metal @BBL A1M.json" + }, + { + "name": "BETA PLA Metal @BBL H2D", + "sub_path": "filament/BETA/BBL/BETA PLA Metal @BBL H2D.json" + }, + { + "name": "BETA PLA Metal @BBL P1P", + "sub_path": "filament/BETA/BBL/BETA PLA Metal @BBL P1P.json" + }, + { + "name": "BETA PLA Metal @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PLA Metal @BBL X1C.json" + }, + { + "name": "BETA PLA Metallic @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PLA Metallic @BBL A1.json" + }, + { + "name": "BETA PLA Metallic @BBL A1M", + "sub_path": "filament/BETA/BBL/BETA PLA Metallic @BBL A1M.json" + }, + { + "name": "BETA PLA Metallic @BBL H2D", + "sub_path": "filament/BETA/BBL/BETA PLA Metallic @BBL H2D.json" + }, + { + "name": "BETA PLA Metallic @BBL P1P", + "sub_path": "filament/BETA/BBL/BETA PLA Metallic @BBL P1P.json" + }, + { + "name": "BETA PLA Metallic @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PLA Metallic @BBL X1C.json" + }, + { + "name": "BETA PLA PRO @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PLA PRO @BBL A1.json" + }, + { + "name": "BETA PLA PRO @BBL A1M", + "sub_path": "filament/BETA/BBL/BETA PLA PRO @BBL A1M.json" + }, + { + "name": "BETA PLA PRO @BBL H2D", + "sub_path": "filament/BETA/BBL/BETA PLA PRO @BBL H2D.json" + }, + { + "name": "BETA PLA PRO @BBL P1P", + "sub_path": "filament/BETA/BBL/BETA PLA PRO @BBL P1P.json" + }, + { + "name": "BETA PLA PRO @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PLA PRO @BBL X1C.json" + }, + { + "name": "BETA PLA Silk @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PLA Silk @BBL A1.json" + }, + { + "name": "BETA PLA Silk @BBL A1M", + "sub_path": "filament/BETA/BBL/BETA PLA Silk @BBL A1M.json" + }, + { + "name": "BETA PLA Silk @BBL H2D", + "sub_path": "filament/BETA/BBL/BETA PLA Silk @BBL H2D.json" + }, + { + "name": "BETA PLA Silk @BBL P1P", + "sub_path": "filament/BETA/BBL/BETA PLA Silk @BBL P1P.json" + }, + { + "name": "BETA PLA Silk @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PLA Silk @BBL X1C.json" + }, + { + "name": "BETA PLA Silk+ @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PLA Silk+ @BBL A1.json" + }, + { + "name": "BETA PLA Silk+ @BBL A1M", + "sub_path": "filament/BETA/BBL/BETA PLA Silk+ @BBL A1M.json" + }, + { + "name": "BETA PLA Silk+ @BBL H2D", + "sub_path": "filament/BETA/BBL/BETA PLA Silk+ @BBL H2D.json" + }, + { + "name": "BETA PLA Silk+ @BBL P1P", + "sub_path": "filament/BETA/BBL/BETA PLA Silk+ @BBL P1P.json" + }, + { + "name": "BETA PLA Silk+ @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PLA Silk+ @BBL X1C.json" + }, + { + "name": "BETA PLA Transparent @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PLA Transparent @BBL A1.json" + }, + { + "name": "BETA PLA Transparent @BBL A1M", + "sub_path": "filament/BETA/BBL/BETA PLA Transparent @BBL A1M.json" + }, + { + "name": "BETA PLA Transparent @BBL H2D", + "sub_path": "filament/BETA/BBL/BETA PLA Transparent @BBL H2D.json" + }, + { + "name": "BETA PLA Transparent @BBL P1P", + "sub_path": "filament/BETA/BBL/BETA PLA Transparent @BBL P1P.json" + }, + { + "name": "BETA PLA Transparent @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PLA Transparent @BBL X1C.json" + }, + { + "name": "BETA PLA UV Color Change @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PLA UV Color Change @BBL A1.json" + }, + { + "name": "BETA PLA UV Color Change @BBL A1M", + "sub_path": "filament/BETA/BBL/BETA PLA UV Color Change @BBL A1M.json" + }, + { + "name": "BETA PLA UV Color Change @BBL H2D", + "sub_path": "filament/BETA/BBL/BETA PLA UV Color Change @BBL H2D.json" + }, + { + "name": "BETA PLA UV Color Change @BBL P1P", + "sub_path": "filament/BETA/BBL/BETA PLA UV Color Change @BBL P1P.json" + }, + { + "name": "BETA PLA UV Color Change @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PLA UV Color Change @BBL X1C.json" + }, + { + "name": "BETA PLA Wood @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PLA Wood @BBL A1.json" + }, + { + "name": "BETA PLA Wood @BBL A1M", + "sub_path": "filament/BETA/BBL/BETA PLA Wood @BBL A1M.json" + }, + { + "name": "BETA PLA Wood @BBL H2D", + "sub_path": "filament/BETA/BBL/BETA PLA Wood @BBL H2D.json" + }, + { + "name": "BETA PLA Wood @BBL P1P", + "sub_path": "filament/BETA/BBL/BETA PLA Wood @BBL P1P.json" + }, + { + "name": "BETA PLA Wood @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PLA Wood @BBL X1C.json" + }, + { + "name": "BETA PLA Youth @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PLA Youth @BBL A1.json" + }, + { + "name": "BETA PLA Youth @BBL A1M", + "sub_path": "filament/BETA/BBL/BETA PLA Youth @BBL A1M.json" + }, + { + "name": "BETA PLA Youth @BBL H2D", + "sub_path": "filament/BETA/BBL/BETA PLA Youth @BBL H2D.json" + }, + { + "name": "BETA PLA Youth @BBL P1P", + "sub_path": "filament/BETA/BBL/BETA PLA Youth @BBL P1P.json" + }, + { + "name": "BETA PLA Youth @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PLA Youth @BBL X1C.json" + }, + { + "name": "BETA PLA-CF @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PLA-CF @BBL A1.json" + }, + { + "name": "BETA PLA-CF @BBL A1M", + "sub_path": "filament/BETA/BBL/BETA PLA-CF @BBL A1M.json" + }, + { + "name": "BETA PLA-CF @BBL H2D 0.4 nozzle", + "sub_path": "filament/BETA/BBL/BETA PLA-CF @BBL H2D 0.4 nozzle.json" + }, + { + "name": "BETA PLA-CF @BBL P1P", + "sub_path": "filament/BETA/BBL/BETA PLA-CF @BBL P1P.json" + }, + { + "name": "BETA PLA-CF @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PLA-CF @BBL X1C.json" + }, { "name": "Bambu PLA Aero @System", "sub_path": "filament/Bambu/Bambu PLA Aero @System.json" @@ -1472,10 +2700,74 @@ "name": "Bambu Support W @System", "sub_path": "filament/Bambu/Bambu Support W @System.json" }, + { + "name": "COEX PLA @BBL A1", + "sub_path": "filament/COEX/BBL/COEX PLA @BBL A1.json" + }, + { + "name": "COEX PLA @BBL A1 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX PLA @BBL A1 0.2 nozzle.json" + }, + { + "name": "COEX PLA @BBL A1M", + "sub_path": "filament/COEX/BBL/COEX PLA @BBL A1M.json" + }, + { + "name": "COEX PLA @BBL P1P", + "sub_path": "filament/COEX/BBL/COEX PLA @BBL P1P.json" + }, + { + "name": "COEX PLA @BBL X1", + "sub_path": "filament/COEX/BBL/COEX PLA @BBL X1.json" + }, + { + "name": "COEX PLA @BBL X1C", + "sub_path": "filament/COEX/BBL/COEX PLA @BBL X1C.json" + }, { "name": "COEX PLA @System", "sub_path": "filament/COEX/COEX PLA @System.json" }, + { + "name": "COEX PLA PRIME @BBL A1", + "sub_path": "filament/COEX/BBL/COEX PLA PRIME @BBL A1.json" + }, + { + "name": "COEX PLA PRIME @BBL A1 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX PLA PRIME @BBL A1 0.2 nozzle.json" + }, + { + "name": "COEX PLA PRIME @BBL A1M", + "sub_path": "filament/COEX/BBL/COEX PLA PRIME @BBL A1M.json" + }, + { + "name": "COEX PLA PRIME @BBL A1M 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX PLA PRIME @BBL A1M 0.2 nozzle.json" + }, + { + "name": "COEX PLA PRIME @BBL P1P", + "sub_path": "filament/COEX/BBL/COEX PLA PRIME @BBL P1P.json" + }, + { + "name": "COEX PLA PRIME @BBL P1P 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX PLA PRIME @BBL P1P 0.2 nozzle.json" + }, + { + "name": "COEX PLA PRIME @BBL X1", + "sub_path": "filament/COEX/BBL/COEX PLA PRIME @BBL X1.json" + }, + { + "name": "COEX PLA PRIME @BBL X1 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX PLA PRIME @BBL X1 0.2 nozzle.json" + }, + { + "name": "COEX PLA PRIME @BBL X1C", + "sub_path": "filament/COEX/BBL/COEX PLA PRIME @BBL X1C.json" + }, + { + "name": "COEX PLA PRIME @BBL X1C 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX PLA PRIME @BBL X1C 0.2 nozzle.json" + }, { "name": "COEX PLA PRIME @System", "sub_path": "filament/COEX/COEX PLA PRIME @System.json" @@ -1748,10 +3040,50 @@ "name": "FilAr PLA-mate Violeta", "sub_path": "filament/FilAr/FilAr PLA-mate Violeta.json" }, + { + "name": "addnorth PLA E-PLA", + "sub_path": "filament/addnorth/BBL/addnorth PLA E-PLA.json" + }, + { + "name": "addnorth PLA Economy", + "sub_path": "filament/addnorth/BBL/addnorth PLA Economy.json" + }, + { + "name": "addnorth PLA HT-PLA PRO Matte", + "sub_path": "filament/addnorth/BBL/addnorth PLA HT-PLA PRO Matte.json" + }, + { + "name": "addnorth PLA Textura", + "sub_path": "filament/addnorth/BBL/addnorth PLA Textura.json" + }, + { + "name": "addnorth PLA Wood", + "sub_path": "filament/addnorth/BBL/addnorth PLA Wood.json" + }, + { + "name": "addnorth PLA X-PLA", + "sub_path": "filament/addnorth/BBL/addnorth PLA X-PLA.json" + }, + { + "name": "addnorth PLA rPLA RE-ADD", + "sub_path": "filament/addnorth/BBL/addnorth PLA rPLA RE-ADD.json" + }, + { + "name": "addnorth PLA X-PLA High Speed", + "sub_path": "filament/addnorth/BBL/addnorth PLA X-PLA High Speed.json" + }, { "name": "Generic PLA Matte @System", "sub_path": "filament/Generic PLA Matte @System.json" }, + { + "name": "addnorth PLA Premium Silk", + "sub_path": "filament/addnorth/BBL/addnorth PLA Premium Silk.json" + }, + { + "name": "addnorth PLA-CF Carbon Fiber", + "sub_path": "filament/addnorth/BBL/addnorth PLA-CF Carbon Fiber.json" + }, { "name": "INSLOGIC PLA Pro @BBL P2S", "sub_path": "filament/INSLOGIC/BBL/INSLOGIC PLA Pro @BBL P2S.json" @@ -1800,14 +3132,98 @@ "name": "NIT PLA @System", "sub_path": "filament/NIT/NIT PLA @System.json" }, + { + "name": "Numakers PLA+ @BBL base", + "sub_path": "filament/Numakers/BBL/Numakers PLA+ @BBL base.json" + }, { "name": "Numakers PLA+ @System", "sub_path": "filament/Numakers/Numakers PLA+ @System.json" }, + { + "name": "Overture Air PLA @BBL A1", + "sub_path": "filament/Overture/BBL/Overture Air PLA @BBL A1.json" + }, + { + "name": "Overture Air PLA @BBL A1 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture Air PLA @BBL A1 0.2 nozzle.json" + }, + { + "name": "Overture Air PLA @BBL A1M", + "sub_path": "filament/Overture/BBL/Overture Air PLA @BBL A1M.json" + }, + { + "name": "Overture Air PLA @BBL A1M 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture Air PLA @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Overture Air PLA @BBL P1P", + "sub_path": "filament/Overture/BBL/Overture Air PLA @BBL P1P.json" + }, + { + "name": "Overture Air PLA @BBL P1P 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture Air PLA @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Overture Air PLA @BBL X1", + "sub_path": "filament/Overture/BBL/Overture Air PLA @BBL X1.json" + }, + { + "name": "Overture Air PLA @BBL X1 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture Air PLA @BBL X1 0.2 nozzle.json" + }, + { + "name": "Overture Air PLA @BBL X1C", + "sub_path": "filament/Overture/BBL/Overture Air PLA @BBL X1C.json" + }, + { + "name": "Overture Air PLA @BBL X1C 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture Air PLA @BBL X1C 0.2 nozzle.json" + }, { "name": "Overture Air PLA @System", "sub_path": "filament/Overture/Overture Air PLA @System.json" }, + { + "name": "Overture Easy PLA @BBL A1", + "sub_path": "filament/Overture/BBL/Overture Easy PLA @BBL A1.json" + }, + { + "name": "Overture Easy PLA @BBL A1 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture Easy PLA @BBL A1 0.2 nozzle.json" + }, + { + "name": "Overture Easy PLA @BBL A1M", + "sub_path": "filament/Overture/BBL/Overture Easy PLA @BBL A1M.json" + }, + { + "name": "Overture Easy PLA @BBL A1M 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture Easy PLA @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Overture Easy PLA @BBL P1P", + "sub_path": "filament/Overture/BBL/Overture Easy PLA @BBL P1P.json" + }, + { + "name": "Overture Easy PLA @BBL P1P 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture Easy PLA @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Overture Easy PLA @BBL X1", + "sub_path": "filament/Overture/BBL/Overture Easy PLA @BBL X1.json" + }, + { + "name": "Overture Easy PLA @BBL X1 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture Easy PLA @BBL X1 0.2 nozzle.json" + }, + { + "name": "Overture Easy PLA @BBL X1C", + "sub_path": "filament/Overture/BBL/Overture Easy PLA @BBL X1C.json" + }, + { + "name": "Overture Easy PLA @BBL X1C 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture Easy PLA @BBL X1C 0.2 nozzle.json" + }, { "name": "Overture Easy PLA @System", "sub_path": "filament/Overture/Overture Easy PLA @System.json" @@ -1820,86 +3236,294 @@ "name": "Overture PLA @System", "sub_path": "filament/Overture/Overture PLA @System.json" }, + { + "name": "Overture PLA Pro @BBL base", + "sub_path": "filament/Overture/BBL/Overture PLA Pro @BBL base.json" + }, { "name": "Overture PLA Pro @System", "sub_path": "filament/Overture/Overture PLA Pro @System.json" }, + { + "name": "Overture Rock PLA @BBL A1", + "sub_path": "filament/Overture/BBL/Overture Rock PLA @BBL A1.json" + }, + { + "name": "Overture Rock PLA @BBL A1 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture Rock PLA @BBL A1 0.2 nozzle.json" + }, + { + "name": "Overture Rock PLA @BBL A1M", + "sub_path": "filament/Overture/BBL/Overture Rock PLA @BBL A1M.json" + }, + { + "name": "Overture Rock PLA @BBL A1M 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture Rock PLA @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Overture Rock PLA @BBL P1P", + "sub_path": "filament/Overture/BBL/Overture Rock PLA @BBL P1P.json" + }, + { + "name": "Overture Rock PLA @BBL P1P 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture Rock PLA @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Overture Rock PLA @BBL X1", + "sub_path": "filament/Overture/BBL/Overture Rock PLA @BBL X1.json" + }, + { + "name": "Overture Rock PLA @BBL X1 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture Rock PLA @BBL X1 0.2 nozzle.json" + }, + { + "name": "Overture Rock PLA @BBL X1C", + "sub_path": "filament/Overture/BBL/Overture Rock PLA @BBL X1C.json" + }, + { + "name": "Overture Rock PLA @BBL X1C 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture Rock PLA @BBL X1C 0.2 nozzle.json" + }, { "name": "Overture Rock PLA @System", "sub_path": "filament/Overture/Overture Rock PLA @System.json" }, + { + "name": "Overture Silk PLA @BBL A1", + "sub_path": "filament/Overture/BBL/Overture Silk PLA @BBL A1.json" + }, + { + "name": "Overture Silk PLA @BBL A1 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture Silk PLA @BBL A1 0.2 nozzle.json" + }, + { + "name": "Overture Silk PLA @BBL A1M", + "sub_path": "filament/Overture/BBL/Overture Silk PLA @BBL A1M.json" + }, + { + "name": "Overture Silk PLA @BBL A1M 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture Silk PLA @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Overture Silk PLA @BBL P1P", + "sub_path": "filament/Overture/BBL/Overture Silk PLA @BBL P1P.json" + }, + { + "name": "Overture Silk PLA @BBL P1P 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture Silk PLA @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Overture Silk PLA @BBL X1", + "sub_path": "filament/Overture/BBL/Overture Silk PLA @BBL X1.json" + }, + { + "name": "Overture Silk PLA @BBL X1 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture Silk PLA @BBL X1 0.2 nozzle.json" + }, + { + "name": "Overture Silk PLA @BBL X1C", + "sub_path": "filament/Overture/BBL/Overture Silk PLA @BBL X1C.json" + }, + { + "name": "Overture Silk PLA @BBL X1C 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture Silk PLA @BBL X1C 0.2 nozzle.json" + }, { "name": "Overture Silk PLA @System", "sub_path": "filament/Overture/Overture Silk PLA @System.json" }, + { + "name": "Overture Super PLA+ @BBL A1", + "sub_path": "filament/Overture/BBL/Overture Super PLA+ @BBL A1.json" + }, + { + "name": "Overture Super PLA+ @BBL A1 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture Super PLA+ @BBL A1 0.2 nozzle.json" + }, + { + "name": "Overture Super PLA+ @BBL A1M", + "sub_path": "filament/Overture/BBL/Overture Super PLA+ @BBL A1M.json" + }, + { + "name": "Overture Super PLA+ @BBL A1M 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture Super PLA+ @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Overture Super PLA+ @BBL P1P", + "sub_path": "filament/Overture/BBL/Overture Super PLA+ @BBL P1P.json" + }, + { + "name": "Overture Super PLA+ @BBL P1P 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture Super PLA+ @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Overture Super PLA+ @BBL X1", + "sub_path": "filament/Overture/BBL/Overture Super PLA+ @BBL X1.json" + }, + { + "name": "Overture Super PLA+ @BBL X1 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture Super PLA+ @BBL X1 0.2 nozzle.json" + }, + { + "name": "Overture Super PLA+ @BBL X1C", + "sub_path": "filament/Overture/BBL/Overture Super PLA+ @BBL X1C.json" + }, + { + "name": "Overture Super PLA+ @BBL X1C 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture Super PLA+ @BBL X1C 0.2 nozzle.json" + }, { "name": "Overture Super PLA+ @System", "sub_path": "filament/Overture/Overture Super PLA+ @System.json" }, + { + "name": "Panchroma CoPE @BBL base", + "sub_path": "filament/Polymaker/BBL/Panchroma CoPE @BBL base.json" + }, { "name": "Panchroma CoPE @System", "sub_path": "filament/Polymaker/Panchroma CoPE @System.json" }, + { + "name": "Panchroma PLA @BBL base", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA @BBL base.json" + }, { "name": "Panchroma PLA @System", "sub_path": "filament/Polymaker/Panchroma PLA @System.json" }, + { + "name": "Panchroma PLA Celestial @BBL base", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Celestial @BBL base.json" + }, { "name": "Panchroma PLA Celestial @System", "sub_path": "filament/Polymaker/Panchroma PLA Celestial @System.json" }, + { + "name": "Panchroma PLA Galaxy @BBL base", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL base.json" + }, { "name": "Panchroma PLA Galaxy @System", "sub_path": "filament/Polymaker/Panchroma PLA Galaxy @System.json" }, + { + "name": "Panchroma PLA Glow @BBL base", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Glow @BBL base.json" + }, { "name": "Panchroma PLA Glow @System", "sub_path": "filament/Polymaker/Panchroma PLA Glow @System.json" }, + { + "name": "Panchroma PLA Luminous @BBL base", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Luminous @BBL base.json" + }, { "name": "Panchroma PLA Luminous @System", "sub_path": "filament/Polymaker/Panchroma PLA Luminous @System.json" }, + { + "name": "Panchroma PLA Marble @BBL base", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Marble @BBL base.json" + }, { "name": "Panchroma PLA Marble @System", "sub_path": "filament/Polymaker/Panchroma PLA Marble @System.json" }, + { + "name": "Panchroma PLA Matte @BBL base", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Matte @BBL base.json" + }, { "name": "Panchroma PLA Matte @System", "sub_path": "filament/Polymaker/Panchroma PLA Matte @System.json" }, + { + "name": "Panchroma PLA Metallic @BBL base", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Metallic @BBL base.json" + }, { "name": "Panchroma PLA Metallic @System", "sub_path": "filament/Polymaker/Panchroma PLA Metallic @System.json" }, + { + "name": "Panchroma PLA Neon @BBL base", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Neon @BBL base.json" + }, { "name": "Panchroma PLA Neon @System", "sub_path": "filament/Polymaker/Panchroma PLA Neon @System.json" }, + { + "name": "Panchroma PLA Satin @BBL base", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Satin @BBL base.json" + }, { "name": "Panchroma PLA Satin @System", "sub_path": "filament/Polymaker/Panchroma PLA Satin @System.json" }, + { + "name": "Panchroma PLA Silk @BBL base", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Silk @BBL base.json" + }, { "name": "Panchroma PLA Silk @System", "sub_path": "filament/Polymaker/Panchroma PLA Silk @System.json" }, + { + "name": "Panchroma PLA Starlight @BBL base", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Starlight @BBL base.json" + }, { "name": "Panchroma PLA Starlight @System", "sub_path": "filament/Polymaker/Panchroma PLA Starlight @System.json" }, + { + "name": "Panchroma PLA Temp Shift @BBL base", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL base.json" + }, { "name": "Panchroma PLA Temp Shift @System", "sub_path": "filament/Polymaker/Panchroma PLA Temp Shift @System.json" }, + { + "name": "Panchroma PLA Translucent @BBL base", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Translucent @BBL base.json" + }, { "name": "Panchroma PLA Translucent @System", "sub_path": "filament/Polymaker/Panchroma PLA Translucent @System.json" }, + { + "name": "Panchroma PLA UV Shift @BBL base", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL base.json" + }, { "name": "Panchroma PLA UV Shift @System", "sub_path": "filament/Polymaker/Panchroma PLA UV Shift @System.json" }, + { + "name": "PlastAR PLA @System", + "sub_path": "filament/Printalot/PlastAR PLA @System.json" + }, + { + "name": "PolyLite CosPLA @BBL A1", + "sub_path": "filament/Polymaker/BBL/PolyLite CosPLA @BBL A1.json" + }, + { + "name": "PolyLite CosPLA @BBL A1M", + "sub_path": "filament/Polymaker/BBL/PolyLite CosPLA @BBL A1M.json" + }, + { + "name": "PolyLite CosPLA @BBL P1P", + "sub_path": "filament/Polymaker/BBL/PolyLite CosPLA @BBL P1P.json" + }, + { + "name": "PolyLite CosPLA @BBL X1", + "sub_path": "filament/Polymaker/BBL/PolyLite CosPLA @BBL X1.json" + }, { "name": "PolyLite Dual PLA @base", "sub_path": "filament/Polymaker/PolyLite Dual PLA @base.json" @@ -1908,10 +3532,110 @@ "name": "PolyLite PLA @System", "sub_path": "filament/Polymaker/PolyLite PLA @System.json" }, + { + "name": "PolyLite PLA Galaxy @BBL A1", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Galaxy @BBL A1.json" + }, + { + "name": "PolyLite PLA Galaxy @BBL A1M", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Galaxy @BBL A1M.json" + }, + { + "name": "PolyLite PLA Galaxy @BBL P1P", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Galaxy @BBL P1P.json" + }, + { + "name": "PolyLite PLA Galaxy @BBL X1", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Galaxy @BBL X1.json" + }, + { + "name": "PolyLite PLA Glow @BBL A1", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Glow @BBL A1.json" + }, + { + "name": "PolyLite PLA Glow @BBL A1M", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Glow @BBL A1M.json" + }, + { + "name": "PolyLite PLA Glow @BBL P1P", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Glow @BBL P1P.json" + }, + { + "name": "PolyLite PLA Glow @BBL X1", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Glow @BBL X1.json" + }, + { + "name": "PolyLite PLA Luminous @BBL A1", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Luminous @BBL A1.json" + }, + { + "name": "PolyLite PLA Luminous @BBL A1M", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Luminous @BBL A1M.json" + }, + { + "name": "PolyLite PLA Luminous @BBL P1P", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Luminous @BBL P1P.json" + }, + { + "name": "PolyLite PLA Luminous @BBL X1", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Luminous @BBL X1.json" + }, + { + "name": "PolyLite PLA Neon @BBL A1", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Neon @BBL A1.json" + }, + { + "name": "PolyLite PLA Neon @BBL A1M", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Neon @BBL A1M.json" + }, + { + "name": "PolyLite PLA Neon @BBL P1P", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Neon @BBL P1P.json" + }, + { + "name": "PolyLite PLA Neon @BBL X1", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Neon @BBL X1.json" + }, + { + "name": "PolyLite PLA Pro @BBL base", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Pro @BBL base.json" + }, { "name": "PolyLite PLA Pro @System", "sub_path": "filament/Polymaker/PolyLite PLA Pro @System.json" }, + { + "name": "PolyLite PLA Starlight @BBL A1", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Starlight @BBL A1.json" + }, + { + "name": "PolyLite PLA Starlight @BBL A1M", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Starlight @BBL A1M.json" + }, + { + "name": "PolyLite PLA Starlight @BBL P1P", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Starlight @BBL P1P.json" + }, + { + "name": "PolyLite PLA Starlight @BBL X1", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Starlight @BBL X1.json" + }, + { + "name": "PolyLite PLA Translucent @BBL A1", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Translucent @BBL A1.json" + }, + { + "name": "PolyLite PLA Translucent @BBL A1M", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Translucent @BBL A1M.json" + }, + { + "name": "PolyLite PLA Translucent @BBL P1P", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Translucent @BBL P1P.json" + }, + { + "name": "PolyLite PLA Translucent @BBL X1", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Translucent @BBL X1.json" + }, { "name": "PolyTerra Dual PLA @System", "sub_path": "filament/Polymaker/PolyTerra Dual PLA @System.json" @@ -1920,14 +3644,58 @@ "name": "PolyTerra PLA @System", "sub_path": "filament/Polymaker/PolyTerra PLA @System.json" }, + { + "name": "PolyTerra PLA Marble @BBL A1", + "sub_path": "filament/Polymaker/BBL/PolyTerra PLA Marble @BBL A1.json" + }, + { + "name": "PolyTerra PLA Marble @BBL A1M", + "sub_path": "filament/Polymaker/BBL/PolyTerra PLA Marble @BBL A1M.json" + }, + { + "name": "PolyTerra PLA Marble @BBL P1P", + "sub_path": "filament/Polymaker/BBL/PolyTerra PLA Marble @BBL P1P.json" + }, + { + "name": "PolyTerra PLA Marble @BBL X1", + "sub_path": "filament/Polymaker/BBL/PolyTerra PLA Marble @BBL X1.json" + }, + { + "name": "PolyTerra PLA+ @BBL A1", + "sub_path": "filament/Polymaker/BBL/PolyTerra PLA+ @BBL A1.json" + }, + { + "name": "PolyTerra PLA+ @BBL A1M", + "sub_path": "filament/Polymaker/BBL/PolyTerra PLA+ @BBL A1M.json" + }, + { + "name": "PolyTerra PLA+ @BBL P1P", + "sub_path": "filament/Polymaker/BBL/PolyTerra PLA+ @BBL P1P.json" + }, + { + "name": "PolyTerra PLA+ @BBL X1", + "sub_path": "filament/Polymaker/BBL/PolyTerra PLA+ @BBL X1.json" + }, + { + "name": "Polymaker HT-PLA @BBL base", + "sub_path": "filament/Polymaker/BBL/Polymaker HT-PLA @BBL base.json" + }, { "name": "Polymaker HT-PLA @System", "sub_path": "filament/Polymaker/Polymaker HT-PLA @System.json" }, + { + "name": "Polymaker HT-PLA-GF @BBL base", + "sub_path": "filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL base.json" + }, { "name": "Polymaker HT-PLA-GF @System", "sub_path": "filament/Polymaker/Polymaker HT-PLA-GF @System.json" }, + { + "name": "Polymaker PLA Pro @System", + "sub_path": "filament/Polymaker/Polymaker PLA Pro @System.json" + }, { "name": "SUNLU PLA Marble @System", "sub_path": "filament/SUNLU/SUNLU Marble PLA @System.json" @@ -2024,6 +3792,106 @@ "name": "FDplast SBS @System", "sub_path": "filament/FDplast/FDplast SBS @System.json" }, + { + "name": "BETA PEBA 90A @BBL A1", + "sub_path": "filament/BETA/BBL/BETA PEBA 90A @BBL A1.json" + }, + { + "name": "BETA PEBA 90A @BBL A1M", + "sub_path": "filament/BETA/BBL/BETA PEBA 90A @BBL A1M.json" + }, + { + "name": "BETA PEBA 90A @BBL H2D", + "sub_path": "filament/BETA/BBL/BETA PEBA 90A @BBL H2D.json" + }, + { + "name": "BETA PEBA 90A @BBL P1P", + "sub_path": "filament/BETA/BBL/BETA PEBA 90A @BBL P1P.json" + }, + { + "name": "BETA PEBA 90A @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA PEBA 90A @BBL X1C.json" + }, + { + "name": "BETA TPU 90A @BBL A1", + "sub_path": "filament/BETA/BBL/BETA TPU 90A @BBL A1.json" + }, + { + "name": "BETA TPU 90A @BBL A1M", + "sub_path": "filament/BETA/BBL/BETA TPU 90A @BBL A1M.json" + }, + { + "name": "BETA TPU 90A @BBL H2D", + "sub_path": "filament/BETA/BBL/BETA TPU 90A @BBL H2D.json" + }, + { + "name": "BETA TPU 90A @BBL P1P", + "sub_path": "filament/BETA/BBL/BETA TPU 90A @BBL P1P.json" + }, + { + "name": "BETA TPU 90A @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA TPU 90A @BBL X1C.json" + }, + { + "name": "BETA TPU 95A @BBL A1", + "sub_path": "filament/BETA/BBL/BETA TPU 95A @BBL A1.json" + }, + { + "name": "BETA TPU 95A @BBL A1M", + "sub_path": "filament/BETA/BBL/BETA TPU 95A @BBL A1M.json" + }, + { + "name": "BETA TPU 95A @BBL H2D", + "sub_path": "filament/BETA/BBL/BETA TPU 95A @BBL H2D.json" + }, + { + "name": "BETA TPU 95A @BBL P1P", + "sub_path": "filament/BETA/BBL/BETA TPU 95A @BBL P1P.json" + }, + { + "name": "BETA TPU 95A @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA TPU 95A @BBL X1C.json" + }, + { + "name": "BETA TPU 98A @BBL A1", + "sub_path": "filament/BETA/BBL/BETA TPU 98A @BBL A1.json" + }, + { + "name": "BETA TPU 98A @BBL A1M", + "sub_path": "filament/BETA/BBL/BETA TPU 98A @BBL A1M.json" + }, + { + "name": "BETA TPU 98A @BBL H2D", + "sub_path": "filament/BETA/BBL/BETA TPU 98A @BBL H2D.json" + }, + { + "name": "BETA TPU 98A @BBL P1P", + "sub_path": "filament/BETA/BBL/BETA TPU 98A @BBL P1P.json" + }, + { + "name": "BETA TPU 98A @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA TPU 98A @BBL X1C.json" + }, + { + "name": "BETA TPU Matte @BBL A1", + "sub_path": "filament/BETA/BBL/BETA TPU Matte @BBL A1.json" + }, + { + "name": "BETA TPU Matte @BBL A1M", + "sub_path": "filament/BETA/BBL/BETA TPU Matte @BBL A1M.json" + }, + { + "name": "BETA TPU Matte @BBL H2D", + "sub_path": "filament/BETA/BBL/BETA TPU Matte @BBL H2D.json" + }, + { + "name": "BETA TPU Matte @BBL P1P", + "sub_path": "filament/BETA/BBL/BETA TPU Matte @BBL P1P.json" + }, + { + "name": "BETA TPU Matte @BBL X1C", + "sub_path": "filament/BETA/BBL/BETA TPU Matte @BBL X1C.json" + }, { "name": "Bambu TPU 95A @System", "sub_path": "filament/Bambu/Bambu TPU 95A @System.json" @@ -2032,18 +3900,122 @@ "name": "Bambu TPU 95A HF @System", "sub_path": "filament/Bambu/Bambu TPU 95A HF @System.json" }, + { + "name": "COEX TPE 30D @BBL A1", + "sub_path": "filament/COEX/BBL/COEX TPE 30D @BBL A1.json" + }, + { + "name": "COEX TPE 30D @BBL A1M", + "sub_path": "filament/COEX/BBL/COEX TPE 30D @BBL A1M.json" + }, + { + "name": "COEX TPE 30D @BBL P1P", + "sub_path": "filament/COEX/BBL/COEX TPE 30D @BBL P1P.json" + }, + { + "name": "COEX TPE 30D @BBL X1", + "sub_path": "filament/COEX/BBL/COEX TPE 30D @BBL X1.json" + }, + { + "name": "COEX TPE 30D @BBL X1C", + "sub_path": "filament/COEX/BBL/COEX TPE 30D @BBL X1C.json" + }, { "name": "COEX TPE 30D @System", "sub_path": "filament/COEX/COEX TPE 30D @System.json" }, + { + "name": "COEX TPE 40D @BBL A1", + "sub_path": "filament/COEX/BBL/COEX TPE 40D @BBL A1.json" + }, + { + "name": "COEX TPE 40D @BBL A1 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX TPE 40D @BBL A1 0.2 nozzle.json" + }, + { + "name": "COEX TPE 40D @BBL A1M", + "sub_path": "filament/COEX/BBL/COEX TPE 40D @BBL A1M.json" + }, + { + "name": "COEX TPE 40D @BBL A1M 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX TPE 40D @BBL A1M 0.2 nozzle.json" + }, + { + "name": "COEX TPE 40D @BBL P1P", + "sub_path": "filament/COEX/BBL/COEX TPE 40D @BBL P1P.json" + }, + { + "name": "COEX TPE 40D @BBL P1P 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX TPE 40D @BBL P1P 0.2 nozzle.json" + }, + { + "name": "COEX TPE 40D @BBL X1", + "sub_path": "filament/COEX/BBL/COEX TPE 40D @BBL X1.json" + }, + { + "name": "COEX TPE 40D @BBL X1 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX TPE 40D @BBL X1 0.2 nozzle.json" + }, + { + "name": "COEX TPE 40D @BBL X1C", + "sub_path": "filament/COEX/BBL/COEX TPE 40D @BBL X1C.json" + }, + { + "name": "COEX TPE 40D @BBL X1C 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX TPE 40D @BBL X1C 0.2 nozzle.json" + }, { "name": "COEX TPE 40D @System", "sub_path": "filament/COEX/COEX TPE 40D @System.json" }, + { + "name": "COEX TPE 60D @BBL A1", + "sub_path": "filament/COEX/BBL/COEX TPE 60D @BBL A1.json" + }, + { + "name": "COEX TPE 60D @BBL A1 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX TPE 60D @BBL A1 0.2 nozzle.json" + }, + { + "name": "COEX TPE 60D @BBL A1M", + "sub_path": "filament/COEX/BBL/COEX TPE 60D @BBL A1M.json" + }, + { + "name": "COEX TPE 60D @BBL A1M 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX TPE 60D @BBL A1M 0.2 nozzle.json" + }, + { + "name": "COEX TPE 60D @BBL P1P", + "sub_path": "filament/COEX/BBL/COEX TPE 60D @BBL P1P.json" + }, + { + "name": "COEX TPE 60D @BBL P1P 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX TPE 60D @BBL P1P 0.2 nozzle.json" + }, + { + "name": "COEX TPE 60D @BBL X1", + "sub_path": "filament/COEX/BBL/COEX TPE 60D @BBL X1.json" + }, + { + "name": "COEX TPE 60D @BBL X1 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX TPE 60D @BBL X1 0.2 nozzle.json" + }, + { + "name": "COEX TPE 60D @BBL X1C", + "sub_path": "filament/COEX/BBL/COEX TPE 60D @BBL X1C.json" + }, + { + "name": "COEX TPE 60D @BBL X1C 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX TPE 60D @BBL X1C 0.2 nozzle.json" + }, { "name": "COEX TPE 60D @System", "sub_path": "filament/COEX/COEX TPE 60D @System.json" }, + { + "name": "COEX TPU 60A @BBL X1C", + "sub_path": "filament/COEX/BBL/COEX TPU 60A @BBL X1C.json" + }, { "name": "COEX TPU 60A @System", "sub_path": "filament/COEX/COEX TPU 60A @System.json" @@ -2064,6 +4036,58 @@ "name": "FDplast TPU @System", "sub_path": "filament/FDplast/FDplast TPU @System.json" }, + { + "name": "addnorth TPU EasyFlex", + "sub_path": "filament/addnorth/BBL/addnorth TPU EasyFlex.json" + }, + { + "name": "addnorth TPU Pro Matte 85A", + "sub_path": "filament/addnorth/BBL/addnorth TPU Pro Matte 85A.json" + }, + { + "name": "addnorth TPU Pro Matte 95A", + "sub_path": "filament/addnorth/BBL/addnorth TPU Pro Matte 95A.json" + }, + { + "name": "Overture TPU @BBL A1", + "sub_path": "filament/Overture/BBL/Overture TPU @BBL A1.json" + }, + { + "name": "Overture TPU @BBL A1 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture TPU @BBL A1 0.2 nozzle.json" + }, + { + "name": "Overture TPU @BBL A1M", + "sub_path": "filament/Overture/BBL/Overture TPU @BBL A1M.json" + }, + { + "name": "Overture TPU @BBL A1M 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture TPU @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Overture TPU @BBL P1P", + "sub_path": "filament/Overture/BBL/Overture TPU @BBL P1P.json" + }, + { + "name": "Overture TPU @BBL P1P 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture TPU @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Overture TPU @BBL X1", + "sub_path": "filament/Overture/BBL/Overture TPU @BBL X1.json" + }, + { + "name": "Overture TPU @BBL X1 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture TPU @BBL X1 0.2 nozzle.json" + }, + { + "name": "Overture TPU @BBL X1C", + "sub_path": "filament/Overture/BBL/Overture TPU @BBL X1C.json" + }, + { + "name": "Overture TPU @BBL X1C 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture TPU @BBL X1C 0.2 nozzle.json" + }, { "name": "Overture TPU @System", "sub_path": "filament/Overture/Overture TPU @System.json" @@ -2076,14 +4100,46 @@ "name": "Elegoo PC-FR @System", "sub_path": "filament/Elegoo/Elegoo PC-FR @System.json" }, + { + "name": "COEX PCTG PRIME @BBL A1M 0.4 nozzle", + "sub_path": "filament/COEX/BBL/COEX PCTG PRIME @BBL A1M.json" + }, + { + "name": "COEX PCTG PRIME @BBL A1M 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX PCTG PRIME @BBL A1M 0.2 nozzle.json" + }, + { + "name": "COEX PCTG PRIME @BBL A1M 0.8 nozzle", + "sub_path": "filament/COEX/BBL/COEX PCTG PRIME @BBL A1M 0.8 nozzle.json" + }, + { + "name": "AliZ PETG-CF @P1-X1", + "sub_path": "filament/AliZ/BBL/AliZ PETG-CF @P1-X1.json" + }, { "name": "AliZ PETG-CF @System", "sub_path": "filament/AliZ/AliZ PETG-CF @System.json" }, + { + "name": "AliZ PETG-Metal @P1-X1", + "sub_path": "filament/AliZ/BBL/AliZ PETG-Metal @P1-X1.json" + }, { "name": "AliZ PETG-Metal @System", "sub_path": "filament/AliZ/AliZ PETG-Metal @System.json" }, + { + "name": "COEX PETG @BBL A1M 0.4 nozzle", + "sub_path": "filament/COEX/BBL/COEX PETG @BBL A1M.json" + }, + { + "name": "COEX PETG @BBL A1M 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX PETG @BBL A1M 0.2 nozzle.json" + }, + { + "name": "COEX PETG @BBL A1M 0.8 nozzle", + "sub_path": "filament/COEX/BBL/COEX PETG @BBL A1M 0.8 nozzle.json" + }, { "name": "Elegoo PET-CF @System", "sub_path": "filament/Elegoo/Elegoo PET-CF @System.json" @@ -2112,6 +4168,26 @@ "name": "Elegoo Rapid PETG @System", "sub_path": "filament/Elegoo/Elegoo Rapid PETG @System.json" }, + { + "name": "Fiberon PETG-ESD @BBL X1", + "sub_path": "filament/Polymaker/BBL/Fiberon PETG-ESD @BBL X1.json" + }, + { + "name": "addnorth PETG-CF Rigid X", + "sub_path": "filament/addnorth/BBL/addnorth PETG-CF Rigid X.json" + }, + { + "name": "COEX PLA @BBL A1M 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX PLA @BBL A1M 0.2 nozzle.json" + }, + { + "name": "COEX PLA @BBL P1P 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX PLA @BBL P1P 0.2 nozzle.json" + }, + { + "name": "COEX PLA @BBL X1C 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX PLA @BBL X1C 0.2 nozzle.json" + }, { "name": "Elegoo PLA Basic @System", "sub_path": "filament/Elegoo/Elegoo PLA Basic @System.json" @@ -2164,10 +4240,886 @@ "name": "Elegoo Rapid PLA+ @System", "sub_path": "filament/Elegoo/Elegoo Rapid PLA+ @System.json" }, + { + "name": "Numakers PLA+ @BBL A1", + "sub_path": "filament/Numakers/BBL/Numakers PLA+ @BBL A1.json" + }, + { + "name": "Numakers PLA+ @BBL A1 0.2 nozzle", + "sub_path": "filament/Numakers/BBL/Numakers PLA+ @BBL A1 0.2 nozzle.json" + }, + { + "name": "Numakers PLA+ @BBL A1M", + "sub_path": "filament/Numakers/BBL/Numakers PLA+ @BBL A1M.json" + }, + { + "name": "Numakers PLA+ @BBL A1M 0.2 nozzle", + "sub_path": "filament/Numakers/BBL/Numakers PLA+ @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Numakers PLA+ @BBL P1P", + "sub_path": "filament/Numakers/BBL/Numakers PLA+ @BBL P1P.json" + }, + { + "name": "Numakers PLA+ @BBL P1P 0.2 nozzle", + "sub_path": "filament/Numakers/BBL/Numakers PLA+ @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Numakers PLA+ @BBL X1", + "sub_path": "filament/Numakers/BBL/Numakers PLA+ @BBL X1.json" + }, + { + "name": "Numakers PLA+ @BBL X1C", + "sub_path": "filament/Numakers/BBL/Numakers PLA+ @BBL X1C.json" + }, + { + "name": "Numakers PLA+ @BBL X1C 0.2 nozzle", + "sub_path": "filament/Numakers/BBL/Numakers PLA+ @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Overture PLA Pro @BBL A1", + "sub_path": "filament/Overture/BBL/Overture PLA Pro @BBL A1.json" + }, + { + "name": "Overture PLA Pro @BBL A1 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture PLA Pro @BBL A1 0.2 nozzle.json" + }, + { + "name": "Overture PLA Pro @BBL A1M", + "sub_path": "filament/Overture/BBL/Overture PLA Pro @BBL A1M.json" + }, + { + "name": "Overture PLA Pro @BBL A1M 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture PLA Pro @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Overture PLA Pro @BBL P1P", + "sub_path": "filament/Overture/BBL/Overture PLA Pro @BBL P1P.json" + }, + { + "name": "Overture PLA Pro @BBL P1P 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture PLA Pro @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Overture PLA Pro @BBL X1", + "sub_path": "filament/Overture/BBL/Overture PLA Pro @BBL X1.json" + }, + { + "name": "Overture PLA Pro @BBL X1 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture PLA Pro @BBL X1 0.2 nozzle.json" + }, + { + "name": "Overture PLA Pro @BBL X1C", + "sub_path": "filament/Overture/BBL/Overture PLA Pro @BBL X1C.json" + }, + { + "name": "Overture PLA Pro @BBL X1C 0.2 nozzle", + "sub_path": "filament/Overture/BBL/Overture PLA Pro @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma CoPE @BBL A1", + "sub_path": "filament/Polymaker/BBL/Panchroma CoPE @BBL A1.json" + }, + { + "name": "Panchroma CoPE @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma CoPE @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma CoPE @BBL A1M", + "sub_path": "filament/Polymaker/BBL/Panchroma CoPE @BBL A1M.json" + }, + { + "name": "Panchroma CoPE @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma CoPE @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma CoPE @BBL P1P", + "sub_path": "filament/Polymaker/BBL/Panchroma CoPE @BBL P1P.json" + }, + { + "name": "Panchroma CoPE @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma CoPE @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma CoPE @BBL X1", + "sub_path": "filament/Polymaker/BBL/Panchroma CoPE @BBL X1.json" + }, + { + "name": "Panchroma CoPE @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma CoPE @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma CoPE @BBL X1C", + "sub_path": "filament/Polymaker/BBL/Panchroma CoPE @BBL X1C.json" + }, + { + "name": "Panchroma CoPE @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma CoPE @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA @BBL A1", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA @BBL A1.json" + }, + { + "name": "Panchroma PLA @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA @BBL A1M", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA @BBL A1M.json" + }, + { + "name": "Panchroma PLA @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA @BBL P1P", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA @BBL P1P.json" + }, + { + "name": "Panchroma PLA @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA @BBL X1", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA @BBL X1.json" + }, + { + "name": "Panchroma PLA @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA @BBL X1C", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA @BBL X1C.json" + }, + { + "name": "Panchroma PLA @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Celestial @BBL A1", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Celestial @BBL A1.json" + }, + { + "name": "Panchroma PLA Celestial @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Celestial @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Celestial @BBL A1M", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Celestial @BBL A1M.json" + }, + { + "name": "Panchroma PLA Celestial @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Celestial @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Celestial @BBL P1P", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Celestial @BBL P1P.json" + }, + { + "name": "Panchroma PLA Celestial @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Celestial @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Celestial @BBL X1", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Celestial @BBL X1.json" + }, + { + "name": "Panchroma PLA Celestial @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Celestial @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Celestial @BBL X1C", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Celestial @BBL X1C.json" + }, + { + "name": "Panchroma PLA Celestial @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Celestial @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Galaxy @BBL A1", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL A1.json" + }, + { + "name": "Panchroma PLA Galaxy @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Galaxy @BBL A1M", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL A1M.json" + }, + { + "name": "Panchroma PLA Galaxy @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Galaxy @BBL P1P", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL P1P.json" + }, + { + "name": "Panchroma PLA Galaxy @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Galaxy @BBL X1", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL X1.json" + }, + { + "name": "Panchroma PLA Galaxy @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Galaxy @BBL X1C", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL X1C.json" + }, + { + "name": "Panchroma PLA Galaxy @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Glow @BBL A1", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Glow @BBL A1.json" + }, + { + "name": "Panchroma PLA Glow @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Glow @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Glow @BBL A1M", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Glow @BBL A1M.json" + }, + { + "name": "Panchroma PLA Glow @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Glow @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Glow @BBL P1P", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Glow @BBL P1P.json" + }, + { + "name": "Panchroma PLA Glow @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Glow @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Glow @BBL X1", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Glow @BBL X1.json" + }, + { + "name": "Panchroma PLA Glow @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Glow @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Glow @BBL X1C", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Glow @BBL X1C.json" + }, + { + "name": "Panchroma PLA Glow @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Glow @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Luminous @BBL A1", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Luminous @BBL A1.json" + }, + { + "name": "Panchroma PLA Luminous @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Luminous @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Luminous @BBL A1M", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Luminous @BBL A1M.json" + }, + { + "name": "Panchroma PLA Luminous @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Luminous @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Luminous @BBL P1P", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Luminous @BBL P1P.json" + }, + { + "name": "Panchroma PLA Luminous @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Luminous @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Luminous @BBL X1", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Luminous @BBL X1.json" + }, + { + "name": "Panchroma PLA Luminous @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Luminous @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Luminous @BBL X1C", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Luminous @BBL X1C.json" + }, + { + "name": "Panchroma PLA Luminous @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Luminous @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Marble @BBL A1", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Marble @BBL A1.json" + }, + { + "name": "Panchroma PLA Marble @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Marble @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Marble @BBL A1M", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Marble @BBL A1M.json" + }, + { + "name": "Panchroma PLA Marble @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Marble @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Marble @BBL P1P", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Marble @BBL P1P.json" + }, + { + "name": "Panchroma PLA Marble @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Marble @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Marble @BBL X1", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Marble @BBL X1.json" + }, + { + "name": "Panchroma PLA Marble @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Marble @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Marble @BBL X1C", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Marble @BBL X1C.json" + }, + { + "name": "Panchroma PLA Marble @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Marble @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Matte @BBL A1", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Matte @BBL A1.json" + }, + { + "name": "Panchroma PLA Matte @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Matte @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Matte @BBL A1M", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Matte @BBL A1M.json" + }, + { + "name": "Panchroma PLA Matte @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Matte @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Matte @BBL P1P", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Matte @BBL P1P.json" + }, + { + "name": "Panchroma PLA Matte @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Matte @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Matte @BBL X1", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Matte @BBL X1.json" + }, + { + "name": "Panchroma PLA Matte @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Matte @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Matte @BBL X1C", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Matte @BBL X1C.json" + }, + { + "name": "Panchroma PLA Matte @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Matte @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Metallic @BBL A1", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Metallic @BBL A1.json" + }, + { + "name": "Panchroma PLA Metallic @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Metallic @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Metallic @BBL A1M", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Metallic @BBL A1M.json" + }, + { + "name": "Panchroma PLA Metallic @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Metallic @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Metallic @BBL P1P", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Metallic @BBL P1P.json" + }, + { + "name": "Panchroma PLA Metallic @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Metallic @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Metallic @BBL X1", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Metallic @BBL X1.json" + }, + { + "name": "Panchroma PLA Metallic @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Metallic @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Metallic @BBL X1C", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Metallic @BBL X1C.json" + }, + { + "name": "Panchroma PLA Metallic @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Metallic @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Neon @BBL A1", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Neon @BBL A1.json" + }, + { + "name": "Panchroma PLA Neon @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Neon @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Neon @BBL A1M", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Neon @BBL A1M.json" + }, + { + "name": "Panchroma PLA Neon @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Neon @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Neon @BBL P1P", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Neon @BBL P1P.json" + }, + { + "name": "Panchroma PLA Neon @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Neon @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Neon @BBL X1", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Neon @BBL X1.json" + }, + { + "name": "Panchroma PLA Neon @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Neon @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Neon @BBL X1C", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Neon @BBL X1C.json" + }, + { + "name": "Panchroma PLA Neon @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Neon @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Satin @BBL A1", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Satin @BBL A1.json" + }, + { + "name": "Panchroma PLA Satin @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Satin @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Satin @BBL A1M", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Satin @BBL A1M.json" + }, + { + "name": "Panchroma PLA Satin @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Satin @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Satin @BBL P1P", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Satin @BBL P1P.json" + }, + { + "name": "Panchroma PLA Satin @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Satin @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Satin @BBL X1", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Satin @BBL X1.json" + }, + { + "name": "Panchroma PLA Satin @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Satin @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Satin @BBL X1C", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Satin @BBL X1C.json" + }, + { + "name": "Panchroma PLA Satin @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Satin @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Silk @BBL A1", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Silk @BBL A1.json" + }, + { + "name": "Panchroma PLA Silk @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Silk @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Silk @BBL A1M", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Silk @BBL A1M.json" + }, + { + "name": "Panchroma PLA Silk @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Silk @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Silk @BBL P1P", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Silk @BBL P1P.json" + }, + { + "name": "Panchroma PLA Silk @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Silk @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Silk @BBL X1", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Silk @BBL X1.json" + }, + { + "name": "Panchroma PLA Silk @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Silk @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Silk @BBL X1C", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Silk @BBL X1C.json" + }, + { + "name": "Panchroma PLA Silk @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Silk @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Starlight @BBL A1", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Starlight @BBL A1.json" + }, + { + "name": "Panchroma PLA Starlight @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Starlight @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Starlight @BBL A1M", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Starlight @BBL A1M.json" + }, + { + "name": "Panchroma PLA Starlight @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Starlight @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Starlight @BBL P1P", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Starlight @BBL P1P.json" + }, + { + "name": "Panchroma PLA Starlight @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Starlight @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Starlight @BBL X1", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Starlight @BBL X1.json" + }, + { + "name": "Panchroma PLA Starlight @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Starlight @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Starlight @BBL X1C", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Starlight @BBL X1C.json" + }, + { + "name": "Panchroma PLA Starlight @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Starlight @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Temp Shift @BBL A1", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL A1.json" + }, + { + "name": "Panchroma PLA Temp Shift @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Temp Shift @BBL A1M", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL A1M.json" + }, + { + "name": "Panchroma PLA Temp Shift @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Temp Shift @BBL P1P", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL P1P.json" + }, + { + "name": "Panchroma PLA Temp Shift @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Temp Shift @BBL X1", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL X1.json" + }, + { + "name": "Panchroma PLA Temp Shift @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Temp Shift @BBL X1C", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL X1C.json" + }, + { + "name": "Panchroma PLA Temp Shift @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Translucent @BBL A1", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Translucent @BBL A1.json" + }, + { + "name": "Panchroma PLA Translucent @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Translucent @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Translucent @BBL A1M", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Translucent @BBL A1M.json" + }, + { + "name": "Panchroma PLA Translucent @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Translucent @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Translucent @BBL P1P", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Translucent @BBL P1P.json" + }, + { + "name": "Panchroma PLA Translucent @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Translucent @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Translucent @BBL X1", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Translucent @BBL X1.json" + }, + { + "name": "Panchroma PLA Translucent @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Translucent @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA Translucent @BBL X1C", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Translucent @BBL X1C.json" + }, + { + "name": "Panchroma PLA Translucent @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA Translucent @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA UV Shift @BBL A1", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL A1.json" + }, + { + "name": "Panchroma PLA UV Shift @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL A1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA UV Shift @BBL A1M", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL A1M.json" + }, + { + "name": "Panchroma PLA UV Shift @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA UV Shift @BBL P1P", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL P1P.json" + }, + { + "name": "Panchroma PLA UV Shift @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA UV Shift @BBL X1", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL X1.json" + }, + { + "name": "Panchroma PLA UV Shift @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL X1 0.2 nozzle.json" + }, + { + "name": "Panchroma PLA UV Shift @BBL X1C", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL X1C.json" + }, + { + "name": "Panchroma PLA UV Shift @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL X1C 0.2 nozzle.json" + }, { "name": "PolyLite Dual PLA @System", "sub_path": "filament/Polymaker/PolyLite Dual PLA @System.json" }, + { + "name": "PolyLite PLA Pro @BBL A1", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Pro @BBL A1.json" + }, + { + "name": "PolyLite PLA Pro @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Pro @BBL A1 0.2 nozzle.json" + }, + { + "name": "PolyLite PLA Pro @BBL A1M", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Pro @BBL A1M.json" + }, + { + "name": "PolyLite PLA Pro @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Pro @BBL A1M 0.2 nozzle.json" + }, + { + "name": "PolyLite PLA Pro @BBL P1P", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Pro @BBL P1P.json" + }, + { + "name": "PolyLite PLA Pro @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Pro @BBL P1P 0.2 nozzle.json" + }, + { + "name": "PolyLite PLA Pro @BBL X1", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Pro @BBL X1.json" + }, + { + "name": "PolyLite PLA Pro @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Pro @BBL X1 0.2 nozzle.json" + }, + { + "name": "PolyLite PLA Pro @BBL X1C", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Pro @BBL X1C.json" + }, + { + "name": "PolyLite PLA Pro @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/PolyLite PLA Pro @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Polymaker HT-PLA @BBL A1", + "sub_path": "filament/Polymaker/BBL/Polymaker HT-PLA @BBL A1.json" + }, + { + "name": "Polymaker HT-PLA @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Polymaker HT-PLA @BBL A1 0.2 nozzle.json" + }, + { + "name": "Polymaker HT-PLA @BBL A1M", + "sub_path": "filament/Polymaker/BBL/Polymaker HT-PLA @BBL A1M.json" + }, + { + "name": "Polymaker HT-PLA @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Polymaker HT-PLA @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Polymaker HT-PLA @BBL P1P", + "sub_path": "filament/Polymaker/BBL/Polymaker HT-PLA @BBL P1P.json" + }, + { + "name": "Polymaker HT-PLA @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Polymaker HT-PLA @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Polymaker HT-PLA @BBL X1", + "sub_path": "filament/Polymaker/BBL/Polymaker HT-PLA @BBL X1.json" + }, + { + "name": "Polymaker HT-PLA @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Polymaker HT-PLA @BBL X1 0.2 nozzle.json" + }, + { + "name": "Polymaker HT-PLA @BBL X1C", + "sub_path": "filament/Polymaker/BBL/Polymaker HT-PLA @BBL X1C.json" + }, + { + "name": "Polymaker HT-PLA @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Polymaker HT-PLA @BBL X1C 0.2 nozzle.json" + }, + { + "name": "Polymaker HT-PLA-GF @BBL A1", + "sub_path": "filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL A1.json" + }, + { + "name": "Polymaker HT-PLA-GF @BBL A1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL A1 0.2 nozzle.json" + }, + { + "name": "Polymaker HT-PLA-GF @BBL A1M", + "sub_path": "filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL A1M.json" + }, + { + "name": "Polymaker HT-PLA-GF @BBL A1M 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL A1M 0.2 nozzle.json" + }, + { + "name": "Polymaker HT-PLA-GF @BBL P1P", + "sub_path": "filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL P1P.json" + }, + { + "name": "Polymaker HT-PLA-GF @BBL P1P 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL P1P 0.2 nozzle.json" + }, + { + "name": "Polymaker HT-PLA-GF @BBL X1", + "sub_path": "filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL X1.json" + }, + { + "name": "Polymaker HT-PLA-GF @BBL X1 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL X1 0.2 nozzle.json" + }, + { + "name": "Polymaker HT-PLA-GF @BBL X1C", + "sub_path": "filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL X1C.json" + }, + { + "name": "Polymaker HT-PLA-GF @BBL X1C 0.2 nozzle", + "sub_path": "filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL X1C 0.2 nozzle.json" + }, + { + "name": "COEX PLA+Silk @BBL A1", + "sub_path": "filament/COEX/BBL/COEX PLA+Silk @BBL A1.json" + }, + { + "name": "COEX PLA+Silk @BBL A1 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX PLA+Silk @BBL A1 0.2 nozzle.json" + }, + { + "name": "COEX PLA+Silk @BBL A1M", + "sub_path": "filament/COEX/BBL/COEX PLA+Silk @BBL A1M.json" + }, + { + "name": "COEX PLA+Silk @BBL A1M 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX PLA+Silk @BBL A1M 0.2 nozzle.json" + }, + { + "name": "COEX PLA+Silk @BBL P1P", + "sub_path": "filament/COEX/BBL/COEX PLA+Silk @BBL P1P.json" + }, + { + "name": "COEX PLA+Silk @BBL P1P 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX PLA+Silk @BBL P1P 0.2 nozzle.json" + }, + { + "name": "COEX PLA+Silk @BBL X1", + "sub_path": "filament/COEX/BBL/COEX PLA+Silk @BBL X1.json" + }, + { + "name": "COEX PLA+Silk @BBL X1 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX PLA+Silk @BBL X1 0.2 nozzle.json" + }, + { + "name": "COEX PLA+Silk @BBL X1C", + "sub_path": "filament/COEX/BBL/COEX PLA+Silk @BBL X1C.json" + }, + { + "name": "COEX PLA+Silk @BBL X1C 0.2 nozzle", + "sub_path": "filament/COEX/BBL/COEX PLA+Silk @BBL X1C 0.2 nozzle.json" + }, { "name": "COEX PLA+Silk @System", "sub_path": "filament/COEX/COEX PLA+Silk @System.json" diff --git a/resources/profiles/BBL/filament/AliZ/AliZ PA-CF @P1-X1.json b/resources/profiles/OrcaFilamentLibrary/filament/AliZ/BBL/AliZ PA-CF @P1-X1.json similarity index 91% rename from resources/profiles/BBL/filament/AliZ/AliZ PA-CF @P1-X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/AliZ/BBL/AliZ PA-CF @P1-X1.json index c94baa16f8..bc75a0717f 100644 --- a/resources/profiles/BBL/filament/AliZ/AliZ PA-CF @P1-X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/AliZ/BBL/AliZ PA-CF @P1-X1.json @@ -3,7 +3,7 @@ "name": "AliZ PA-CF @P1-X1", "inherits": "AliZ PA-CF @base", "from": "system", - "setting_id": "AliZ003_00", + "setting_id": "cN0uesF0mZf3KSkj", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/BBL/filament/AliZ/AliZ PETG @P1-X1.json b/resources/profiles/OrcaFilamentLibrary/filament/AliZ/BBL/AliZ PETG @P1-X1.json similarity index 91% rename from resources/profiles/BBL/filament/AliZ/AliZ PETG @P1-X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/AliZ/BBL/AliZ PETG @P1-X1.json index 9549920f5a..9976c2e168 100644 --- a/resources/profiles/BBL/filament/AliZ/AliZ PETG @P1-X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/AliZ/BBL/AliZ PETG @P1-X1.json @@ -3,7 +3,7 @@ "name": "AliZ PETG @P1-X1", "inherits": "AliZ PETG @base", "from": "system", - "setting_id": "AliZ001_00", + "setting_id": "cZp23cC4ong9q6dn", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/BBL/filament/AliZ/AliZ PETG-CF @P1-X1.json b/resources/profiles/OrcaFilamentLibrary/filament/AliZ/BBL/AliZ PETG-CF @P1-X1.json similarity index 91% rename from resources/profiles/BBL/filament/AliZ/AliZ PETG-CF @P1-X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/AliZ/BBL/AliZ PETG-CF @P1-X1.json index be611e7ee7..f7af938dfa 100644 --- a/resources/profiles/BBL/filament/AliZ/AliZ PETG-CF @P1-X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/AliZ/BBL/AliZ PETG-CF @P1-X1.json @@ -3,7 +3,7 @@ "name": "AliZ PETG-CF @P1-X1", "inherits": "AliZ PETG-CF @base", "from": "system", - "setting_id": "AZ01-1_00", + "setting_id": "HWW5mejsB0SfEfWw", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/BBL/filament/AliZ/AliZ PETG-Metal @P1-X1.json b/resources/profiles/OrcaFilamentLibrary/filament/AliZ/BBL/AliZ PETG-Metal @P1-X1.json similarity index 92% rename from resources/profiles/BBL/filament/AliZ/AliZ PETG-Metal @P1-X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/AliZ/BBL/AliZ PETG-Metal @P1-X1.json index b25bfa6521..e985f6123b 100644 --- a/resources/profiles/BBL/filament/AliZ/AliZ PETG-Metal @P1-X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/AliZ/BBL/AliZ PETG-Metal @P1-X1.json @@ -3,7 +3,7 @@ "name": "AliZ PETG-Metal @P1-X1", "inherits": "AliZ PETG-Metal @base", "from": "system", - "setting_id": "AZ01-2_00", + "setting_id": "JqD0blE4fxaNfXqB", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/BBL/filament/AliZ/AliZ PLA @P1-X1.json b/resources/profiles/OrcaFilamentLibrary/filament/AliZ/BBL/AliZ PLA @P1-X1.json similarity index 91% rename from resources/profiles/BBL/filament/AliZ/AliZ PLA @P1-X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/AliZ/BBL/AliZ PLA @P1-X1.json index c60138f745..a49d64e421 100644 --- a/resources/profiles/BBL/filament/AliZ/AliZ PLA @P1-X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/AliZ/BBL/AliZ PLA @P1-X1.json @@ -3,7 +3,7 @@ "name": "AliZ PLA @P1-X1", "inherits": "AliZ PLA @base", "from": "system", - "setting_id": "AliZ002_00", + "setting_id": "fRELapY8YiP4qrBW", "instantiation": "true", "enable_pressure_advance": [ "1" diff --git a/resources/profiles/BBL/filament/BETA/BETA ABS @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA ABS @BBL A1.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA ABS @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA ABS @BBL A1.json index 97348b871d..efe7ba4bd6 100644 --- a/resources/profiles/BBL/filament/BETA/BETA ABS @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA ABS @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA ABS @BBL A1", "inherits": "BETA ABS @base", "from": "system", - "setting_id": "BABB00_07", + "setting_id": "dUGRrmxU89pRaJ2Z", "instantiation": "true", "fan_max_speed": [ "20" diff --git a/resources/profiles/BBL/filament/BETA/BETA ABS @BBL H2D.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA ABS @BBL H2D.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA ABS @BBL H2D.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA ABS @BBL H2D.json index d4c4fda0ba..b02dd7539c 100644 --- a/resources/profiles/BBL/filament/BETA/BETA ABS @BBL H2D.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA ABS @BBL H2D.json @@ -3,7 +3,7 @@ "name": "BETA ABS @BBL H2D", "inherits": "BETA ABS @base", "from": "system", - "setting_id": "BABB00_11", + "setting_id": "oxZKTEMd8TpyoH39", "instantiation": "true", "chamber_temperatures": [ "65" diff --git a/resources/profiles/BBL/filament/BETA/BETA ABS @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA ABS @BBL P1P.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA ABS @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA ABS @BBL P1P.json index c9c9bbfe4b..8210765185 100644 --- a/resources/profiles/BBL/filament/BETA/BETA ABS @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA ABS @BBL P1P.json @@ -3,7 +3,7 @@ "name": "BETA ABS @BBL P1P", "inherits": "BETA ABS @base", "from": "system", - "setting_id": "BABB00_03", + "setting_id": "MPYyfCKMsJZy8GaY", "instantiation": "true", "fan_max_speed": [ "20" diff --git a/resources/profiles/BBL/filament/BETA/BETA ABS @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA ABS @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA ABS @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA ABS @BBL X1C.json index b6682d512a..196053eb0a 100644 --- a/resources/profiles/BBL/filament/BETA/BETA ABS @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA ABS @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA ABS @BBL X1C", "inherits": "BETA ABS @base", "from": "system", - "setting_id": "BABB00", + "setting_id": "vMA7EhgNDT4MwMRr", "instantiation": "true", "fan_max_speed": [ "60" diff --git a/resources/profiles/BBL/filament/BETA/BETA ASA @BBL A1 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA ASA @BBL A1 0.4 nozzle.json similarity index 90% rename from resources/profiles/BBL/filament/BETA/BETA ASA @BBL A1 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA ASA @BBL A1 0.4 nozzle.json index 3aaff7f087..670fa696fb 100644 --- a/resources/profiles/BBL/filament/BETA/BETA ASA @BBL A1 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA ASA @BBL A1 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA ASA @BBL A1 0.4 nozzle", "inherits": "BETA ASA @base", "from": "system", - "setting_id": "BASB00_09", + "setting_id": "LevRG7t9mTlEseaB", "instantiation": "true", "chamber_temperatures": [ "60" diff --git a/resources/profiles/BBL/filament/BETA/BETA ASA @BBL H2D 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA ASA @BBL H2D 0.4 nozzle.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA ASA @BBL H2D 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA ASA @BBL H2D 0.4 nozzle.json index 66569a778a..3f27231fd0 100644 --- a/resources/profiles/BBL/filament/BETA/BETA ASA @BBL H2D 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA ASA @BBL H2D 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA ASA @BBL H2D 0.4 nozzle", "inherits": "BETA ASA @base", "from": "system", - "setting_id": "BASB00_13", + "setting_id": "3NBkWTXmqi8eRUhi", "instantiation": "true", "chamber_temperatures": [ "65" diff --git a/resources/profiles/BBL/filament/BETA/BETA ASA @BBL X1C 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA ASA @BBL X1C 0.4 nozzle.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA ASA @BBL X1C 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA ASA @BBL X1C 0.4 nozzle.json index 3420b95e62..3d65ee4436 100644 --- a/resources/profiles/BBL/filament/BETA/BETA ASA @BBL X1C 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA ASA @BBL X1C 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA ASA @BBL X1C 0.4 nozzle", "inherits": "BETA ASA @base", "from": "system", - "setting_id": "BASB00_02", + "setting_id": "0nWTEZkH7NKXgCib", "instantiation": "true", "chamber_temperatures": [ "60" diff --git a/resources/profiles/BBL/filament/BETA/BETA HIPS @BBL H2D.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA HIPS @BBL H2D.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA HIPS @BBL H2D.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA HIPS @BBL H2D.json index 7975343472..7bb555ede0 100644 --- a/resources/profiles/BBL/filament/BETA/BETA HIPS @BBL H2D.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA HIPS @BBL H2D.json @@ -3,7 +3,7 @@ "name": "BETA HIPS @BBL H2D", "inherits": "BETA HIPS @base", "from": "system", - "setting_id": "BHIB00_06", + "setting_id": "9nN2uWxlYH1c507A", "instantiation": "true", "filament_deretraction_speed": [ "nil", diff --git a/resources/profiles/BBL/filament/BETA/BETA HIPS @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA HIPS @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA HIPS @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA HIPS @BBL X1C.json index 7f8204ab99..1b92494eac 100644 --- a/resources/profiles/BBL/filament/BETA/BETA HIPS @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA HIPS @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA HIPS @BBL X1C", "inherits": "BETA HIPS @base", "from": "system", - "setting_id": "BHIB00_00", + "setting_id": "mTcT8sCciWyX5enc", "instantiation": "true", "filament_max_volumetric_speed": [ "8", diff --git a/resources/profiles/BBL/filament/BETA/BETA PAHT-CF @BBL H2D.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PAHT-CF @BBL H2D.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PAHT-CF @BBL H2D.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PAHT-CF @BBL H2D.json index 283b174880..dc5df41921 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PAHT-CF @BBL H2D.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PAHT-CF @BBL H2D.json @@ -3,7 +3,7 @@ "name": "BETA PAHT-CF @BBL H2D", "inherits": "BETA PAHT-CF @base", "from": "system", - "setting_id": "BPAB00_01", + "setting_id": "YbYCVQd5IR0sQR8S", "instantiation": "true", "chamber_temperatures": [ "60" diff --git a/resources/profiles/BBL/filament/BETA/BETA PAHT-CF @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PAHT-CF @BBL P1P.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PAHT-CF @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PAHT-CF @BBL P1P.json index 020684ae9d..6dc9175a2d 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PAHT-CF @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PAHT-CF @BBL P1P.json @@ -3,7 +3,7 @@ "name": "BETA PAHT-CF @BBL P1P", "inherits": "BETA PAHT-CF @base", "from": "system", - "setting_id": "BPAB00_10", + "setting_id": "5O5fzmFrT3O1k1H0", "instantiation": "true", "filament_flow_ratio": [ "0.96", diff --git a/resources/profiles/BBL/filament/BETA/BETA PAHT-CF @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PAHT-CF @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PAHT-CF @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PAHT-CF @BBL X1C.json index 2d07f60dd7..6c456aa3eb 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PAHT-CF @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PAHT-CF @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PAHT-CF @BBL X1C", "inherits": "BETA PAHT-CF @base", "from": "system", - "setting_id": "BPAB00", + "setting_id": "gB5HLYTDCooFy2W5", "instantiation": "true", "chamber_temperatures": [ "60" diff --git a/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PEBA 90A @BBL A1.json similarity index 93% rename from resources/profiles/BBL/filament/BETA/BETA PEBA 90A @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PEBA 90A @BBL A1.json index 5d2672ea39..bef1266f14 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PEBA 90A @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PEBA 90A @BBL A1", "inherits": "BETA PEBA 90A @base", "from": "system", - "setting_id": "BPBB00_04", + "setting_id": "A57Sbar56Ah1NiU7", "instantiation": "true", "filament_density": [ "1.22" diff --git a/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PEBA 90A @BBL A1M.json similarity index 94% rename from resources/profiles/BBL/filament/BETA/BETA PEBA 90A @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PEBA 90A @BBL A1M.json index 65a899ec25..feb281f605 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PEBA 90A @BBL A1M.json @@ -3,7 +3,7 @@ "name": "BETA PEBA 90A @BBL A1M", "inherits": "BETA PEBA 90A @base", "from": "system", - "setting_id": "BPBB00_05", + "setting_id": "OoLkWS147R0AasZc", "instantiation": "true", "filament_density": [ "1.22" diff --git a/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @BBL H2D.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PEBA 90A @BBL H2D.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PEBA 90A @BBL H2D.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PEBA 90A @BBL H2D.json index 15e570c0ef..a5b0a4e46b 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @BBL H2D.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PEBA 90A @BBL H2D.json @@ -3,7 +3,7 @@ "name": "BETA PEBA 90A @BBL H2D", "inherits": "BETA PEBA 90A @base", "from": "system", - "setting_id": "BPBB00_02", + "setting_id": "91b8WTzvOky9wAVK", "instantiation": "true", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PEBA 90A @BBL P1P.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PEBA 90A @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PEBA 90A @BBL P1P.json index d84427a067..f5cc6b7f98 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PEBA 90A @BBL P1P.json @@ -3,7 +3,7 @@ "name": "BETA PEBA 90A @BBL P1P", "inherits": "BETA PEBA 90A @base", "from": "system", - "setting_id": "BPBB00_01", + "setting_id": "ydudEBLRmj1WSXqB", "instantiation": "true", "filament_max_volumetric_speed": [ "2.8", diff --git a/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PEBA 90A @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PEBA 90A @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PEBA 90A @BBL X1C.json index 9787ec8671..74c0bdd20d 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PEBA 90A @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PEBA 90A @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PEBA 90A @BBL X1C", "inherits": "BETA PEBA 90A @base", "from": "system", - "setting_id": "BPBB00_00", + "setting_id": "F1hTal3M92tBjv2N", "instantiation": "true", "filament_max_volumetric_speed": [ "2.8", diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG @BBL A1.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PETG @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG @BBL A1.json index e66cac62b6..9d6fc9329d 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PETG @BBL A1", "inherits": "BETA PETG @base", "from": "system", - "setting_id": "BPGB00_06", + "setting_id": "EpYzxZwVHvLaseku", "instantiation": "true", "fan_max_speed": [ "50" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG @BBL A1M 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG @BBL A1M 0.4 nozzle.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PETG @BBL A1M 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG @BBL A1M 0.4 nozzle.json index 0831aa7d3e..7cac0a9bef 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG @BBL A1M 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG @BBL A1M 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG @BBL A1M 0.4 nozzle", "inherits": "BETA PETG @base", "from": "system", - "setting_id": "BPGB00_03", + "setting_id": "5V0hyhzFoDU8Tfwm", "instantiation": "true", "fan_max_speed": [ "50" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG @BBL H2D 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG @BBL H2D 0.4 nozzle.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PETG @BBL H2D 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG @BBL H2D 0.4 nozzle.json index 5f581768f2..c508f9041c 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG @BBL H2D 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG @BBL H2D 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG @BBL H2D 0.4 nozzle", "inherits": "BETA PETG @base", "from": "system", - "setting_id": "BPGB00_09", + "setting_id": "KnKvUsD4rSpQU413", "instantiation": "true", "fan_max_speed": [ "30" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PETG @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG @BBL X1C.json index 5a92aaf386..5547610fcf 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PETG @BBL X1C", "inherits": "BETA PETG @base", "from": "system", - "setting_id": "BPGB00_01", + "setting_id": "uM6wHdt0N5ftZRge", "instantiation": "true", "fan_min_speed": [ "20" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Fluorescence @BBL A1.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Fluorescence @BBL A1.json index 4afed91de9..67e25a2c01 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Fluorescence @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PETG Fluorescence @BBL A1", "inherits": "BETA PETG Fluorescence @base", "from": "system", - "setting_id": "BPGB02_06", + "setting_id": "ZtyTtAWsZnLGsM0O", "instantiation": "true", "fan_max_speed": [ "50" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @BBL A1M 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Fluorescence @BBL A1M 0.4 nozzle.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @BBL A1M 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Fluorescence @BBL A1M 0.4 nozzle.json index 3dea382bb2..a12cc74634 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @BBL A1M 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Fluorescence @BBL A1M 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG Fluorescence @BBL A1M 0.4 nozzle", "inherits": "BETA PETG Fluorescence @base", "from": "system", - "setting_id": "BPGB02_03", + "setting_id": "VUSunTT0OJa7iOSd", "instantiation": "true", "fan_max_speed": [ "50" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @BBL H2D 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Fluorescence @BBL H2D 0.4 nozzle.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @BBL H2D 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Fluorescence @BBL H2D 0.4 nozzle.json index 62dfb7753f..19f8879c41 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @BBL H2D 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Fluorescence @BBL H2D 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG Fluorescence @BBL H2D 0.4 nozzle", "inherits": "BETA PETG Fluorescence @base", "from": "system", - "setting_id": "BPGB02_09", + "setting_id": "JHg4y0pxAOtoJSuw", "instantiation": "true", "fan_max_speed": [ "30" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Fluorescence @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Fluorescence @BBL X1C.json index 88562c9da2..353498bf5c 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Fluorescence @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PETG Fluorescence @BBL X1C", "inherits": "BETA PETG Fluorescence @base", "from": "system", - "setting_id": "BPGB02_01", + "setting_id": "pCetfFvyLLw3vS2j", "instantiation": "true", "fan_min_speed": [ "20" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Glitter @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Glitter @BBL A1.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PETG Glitter @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Glitter @BBL A1.json index d3a13707b4..6a97df7f55 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Glitter @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Glitter @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PETG Glitter @BBL A1", "inherits": "BETA PETG Glitter @base", "from": "system", - "setting_id": "BPGB03_06", + "setting_id": "cz5dC7OrXDlX1Ctj", "instantiation": "true", "fan_max_speed": [ "50" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Glitter @BBL A1M 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Glitter @BBL A1M 0.4 nozzle.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PETG Glitter @BBL A1M 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Glitter @BBL A1M 0.4 nozzle.json index 2b12feac1e..dc051ee414 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Glitter @BBL A1M 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Glitter @BBL A1M 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG Glitter @BBL A1M 0.4 nozzle", "inherits": "BETA PETG Glitter @base", "from": "system", - "setting_id": "BPGB03_03", + "setting_id": "PozWnOfZ2l7HqTpx", "instantiation": "true", "fan_max_speed": [ "50" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Glitter @BBL H2D 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Glitter @BBL H2D 0.4 nozzle.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PETG Glitter @BBL H2D 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Glitter @BBL H2D 0.4 nozzle.json index 988f09054d..7d4b3bb5d5 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Glitter @BBL H2D 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Glitter @BBL H2D 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG Glitter @BBL H2D 0.4 nozzle", "inherits": "BETA PETG Glitter @base", "from": "system", - "setting_id": "BPGB03_09", + "setting_id": "ijW4zvNAQ3DIK984", "instantiation": "true", "fan_max_speed": [ "30" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Glitter @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Glitter @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PETG Glitter @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Glitter @BBL X1C.json index 8eb9ef276f..18c99695f4 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Glitter @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Glitter @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PETG Glitter @BBL X1C", "inherits": "BETA PETG Glitter @base", "from": "system", - "setting_id": "BPGB03_01", + "setting_id": "UI220qldPoLY8VZN", "instantiation": "true", "fan_min_speed": [ "20" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Glow @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Glow @BBL A1.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PETG Glow @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Glow @BBL A1.json index 039a6b5a77..8c4d9a584a 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Glow @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Glow @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PETG Glow @BBL A1", "inherits": "BETA PETG Glow @base", "from": "system", - "setting_id": "BPGB04_06", + "setting_id": "LudMQeiSJOLw0Aoy", "instantiation": "true", "fan_max_speed": [ "50" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Glow @BBL A1M 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Glow @BBL A1M 0.4 nozzle.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PETG Glow @BBL A1M 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Glow @BBL A1M 0.4 nozzle.json index 30a1290c7f..f8d7d240f3 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Glow @BBL A1M 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Glow @BBL A1M 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG Glow @BBL A1M 0.4 nozzle", "inherits": "BETA PETG Glow @base", "from": "system", - "setting_id": "BPGB04_03", + "setting_id": "cl1Rl9hgrahhhSd3", "instantiation": "true", "fan_max_speed": [ "50" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Glow @BBL H2D 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Glow @BBL H2D 0.4 nozzle.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PETG Glow @BBL H2D 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Glow @BBL H2D 0.4 nozzle.json index d460a13719..9196aff31b 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Glow @BBL H2D 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Glow @BBL H2D 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG Glow @BBL H2D 0.4 nozzle", "inherits": "BETA PETG Glow @base", "from": "system", - "setting_id": "BPGB04_09", + "setting_id": "3s9w3mH6M4OdbrUV", "instantiation": "true", "fan_max_speed": [ "30" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Glow @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Glow @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PETG Glow @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Glow @BBL X1C.json index e599deed02..42a4521212 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Glow @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Glow @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PETG Glow @BBL X1C", "inherits": "BETA PETG Glow @base", "from": "system", - "setting_id": "BPGB04_01", + "setting_id": "wv5FRKdnsHaIFA7L", "instantiation": "true", "fan_min_speed": [ "20" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Gradient @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Gradient @BBL A1.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PETG Gradient @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Gradient @BBL A1.json index 8c732afcf6..0a753194b6 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Gradient @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Gradient @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PETG Gradient @BBL A1", "inherits": "BETA PETG Gradient @base", "from": "system", - "setting_id": "BPGB05_06", + "setting_id": "L3hZggzEZUgUv0Qv", "instantiation": "true", "fan_max_speed": [ "50" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Gradient @BBL A1M 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Gradient @BBL A1M 0.4 nozzle.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PETG Gradient @BBL A1M 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Gradient @BBL A1M 0.4 nozzle.json index c7dd29444b..7d5f7fba8b 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Gradient @BBL A1M 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Gradient @BBL A1M 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG Gradient @BBL A1M 0.4 nozzle", "inherits": "BETA PETG Gradient @base", "from": "system", - "setting_id": "BPGB05_03", + "setting_id": "zsITnsNFRG7IE6sR", "instantiation": "true", "fan_max_speed": [ "50" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Gradient @BBL H2D 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Gradient @BBL H2D 0.4 nozzle.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PETG Gradient @BBL H2D 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Gradient @BBL H2D 0.4 nozzle.json index 078a954fd6..b468069cb7 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Gradient @BBL H2D 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Gradient @BBL H2D 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG Gradient @BBL H2D 0.4 nozzle", "inherits": "BETA PETG Gradient @base", "from": "system", - "setting_id": "BPGB05_09", + "setting_id": "GqmCuPg6baUxeoYS", "instantiation": "true", "fan_max_speed": [ "30" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Gradient @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Gradient @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PETG Gradient @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Gradient @BBL X1C.json index 0bca3fd849..48c3f30535 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Gradient @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Gradient @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PETG Gradient @BBL X1C", "inherits": "BETA PETG Gradient @base", "from": "system", - "setting_id": "BPGB05_01", + "setting_id": "oYJjUiaCI4UBZ0ur", "instantiation": "true", "fan_min_speed": [ "20" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG HF @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG HF @BBL A1.json similarity index 94% rename from resources/profiles/BBL/filament/BETA/BETA PETG HF @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG HF @BBL A1.json index 4fa56ff56c..fc7d4417e8 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG HF @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG HF @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PETG HF @BBL A1", "inherits": "BETA PETG HF @base", "from": "system", - "setting_id": "BPGB06_03", + "setting_id": "T2Ea25pM2u9BM7Oa", "instantiation": "true", "fan_cooling_layer_time": [ "15" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG HF @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG HF @BBL A1M.json similarity index 94% rename from resources/profiles/BBL/filament/BETA/BETA PETG HF @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG HF @BBL A1M.json index 4594b057e3..c162f9b829 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG HF @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG HF @BBL A1M.json @@ -3,7 +3,7 @@ "name": "BETA PETG HF @BBL A1M", "inherits": "BETA PETG HF @base", "from": "system", - "setting_id": "BPGB06_06", + "setting_id": "nO5R86dkDle1m5Pq", "instantiation": "true", "fan_cooling_layer_time": [ "15" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG HF @BBL H2D 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG HF @BBL H2D 0.4 nozzle.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PETG HF @BBL H2D 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG HF @BBL H2D 0.4 nozzle.json index 5af6977e37..f8bc99dd97 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG HF @BBL H2D 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG HF @BBL H2D 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG HF @BBL H2D 0.4 nozzle", "inherits": "BETA PETG HF @base", "from": "system", - "setting_id": "BPGB06_09", + "setting_id": "YOBguayM9PiwkpfT", "instantiation": "true", "counter_coef_2": [ "0.007" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG HF @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG HF @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PETG HF @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG HF @BBL X1C.json index e880bef58f..d67f8d619e 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG HF @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG HF @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PETG HF @BBL X1C", "inherits": "BETA PETG HF @base", "from": "system", - "setting_id": "BPGB06_00", + "setting_id": "EG3h0IHVO1yyVNMs", "instantiation": "true", "fan_cooling_layer_time": [ "20" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Heat Color Change @BBL A1.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Heat Color Change @BBL A1.json index 178a75b1cc..9ce4a5d5f4 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Heat Color Change @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PETG Heat Color Change @BBL A1", "inherits": "BETA PETG Heat Color Change @base", "from": "system", - "setting_id": "BPGB01_06", + "setting_id": "ZhHASdXFywqbRuBf", "instantiation": "true", "fan_max_speed": [ "50" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @BBL A1M 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Heat Color Change @BBL A1M 0.4 nozzle.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @BBL A1M 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Heat Color Change @BBL A1M 0.4 nozzle.json index 62371b18de..aa50a522ba 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @BBL A1M 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Heat Color Change @BBL A1M 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG Heat Color Change @BBL A1M 0.4 nozzle", "inherits": "BETA PETG Heat Color Change @base", "from": "system", - "setting_id": "BPGB01_03", + "setting_id": "YiFgzCJDAOW9YSjZ", "instantiation": "true", "fan_max_speed": [ "50" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @BBL H2D 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Heat Color Change @BBL H2D 0.4 nozzle.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @BBL H2D 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Heat Color Change @BBL H2D 0.4 nozzle.json index e94aec5705..5f6706766a 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @BBL H2D 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Heat Color Change @BBL H2D 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG Heat Color Change @BBL H2D 0.4 nozzle", "inherits": "BETA PETG Heat Color Change @base", "from": "system", - "setting_id": "BPGB01_09", + "setting_id": "DpWgpTiKdm70Xt1i", "instantiation": "true", "fan_max_speed": [ "30" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Heat Color Change @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Heat Color Change @BBL X1C.json index 9b3cec67e5..b0e0ee39ca 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Heat Color Change @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PETG Heat Color Change @BBL X1C", "inherits": "BETA PETG Heat Color Change @base", "from": "system", - "setting_id": "BPGB01_01", + "setting_id": "3lJe6ftSHQDkQZ1S", "instantiation": "true", "fan_min_speed": [ "20" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Marble @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Marble @BBL A1.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PETG Marble @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Marble @BBL A1.json index 829f200312..1c8a6e7cf5 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Marble @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Marble @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PETG Marble @BBL A1", "inherits": "BETA PETG Marble @base", "from": "system", - "setting_id": "BPGB07_06", + "setting_id": "tSCDuE4dE44PyIwb", "instantiation": "true", "fan_max_speed": [ "50" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Marble @BBL A1M 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Marble @BBL A1M 0.4 nozzle.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PETG Marble @BBL A1M 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Marble @BBL A1M 0.4 nozzle.json index b0cb67eb0e..0adda57b8f 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Marble @BBL A1M 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Marble @BBL A1M 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG Marble @BBL A1M 0.4 nozzle", "inherits": "BETA PETG Marble @base", "from": "system", - "setting_id": "BPGB07_03", + "setting_id": "n6dguOo5ZleD6Ec4", "instantiation": "true", "fan_max_speed": [ "50" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Marble @BBL H2D 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Marble @BBL H2D 0.4 nozzle.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PETG Marble @BBL H2D 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Marble @BBL H2D 0.4 nozzle.json index 2f510ad7ab..decfcb73a1 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Marble @BBL H2D 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Marble @BBL H2D 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG Marble @BBL H2D 0.4 nozzle", "inherits": "BETA PETG Marble @base", "from": "system", - "setting_id": "BPGB07_09", + "setting_id": "RxCTxdvym4iNOB5j", "instantiation": "true", "fan_max_speed": [ "30" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Marble @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Marble @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PETG Marble @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Marble @BBL X1C.json index 3b38034011..49ac9206f0 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Marble @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Marble @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PETG Marble @BBL X1C", "inherits": "BETA PETG Marble @base", "from": "system", - "setting_id": "BPGB07_01", + "setting_id": "3BgsPAgilo1MgtOV", "instantiation": "true", "fan_min_speed": [ "20" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Matte @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Matte @BBL A1.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PETG Matte @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Matte @BBL A1.json index a8062a0de5..bbac04c0b9 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Matte @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Matte @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PETG Matte @BBL A1", "inherits": "BETA PETG Matte @base", "from": "system", - "setting_id": "BPGB08_06", + "setting_id": "zYkrzQk11C98R31F", "instantiation": "true", "fan_max_speed": [ "50" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Matte @BBL A1M 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Matte @BBL A1M 0.4 nozzle.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PETG Matte @BBL A1M 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Matte @BBL A1M 0.4 nozzle.json index 2ed2cd9930..3408e81946 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Matte @BBL A1M 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Matte @BBL A1M 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG Matte @BBL A1M 0.4 nozzle", "inherits": "BETA PETG Matte @base", "from": "system", - "setting_id": "BPGB08_03", + "setting_id": "rzX5oP4037Ex5Chh", "instantiation": "true", "fan_max_speed": [ "50" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Matte @BBL H2D 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Matte @BBL H2D 0.4 nozzle.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PETG Matte @BBL H2D 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Matte @BBL H2D 0.4 nozzle.json index edfdacc993..3287a32971 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Matte @BBL H2D 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Matte @BBL H2D 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG Matte @BBL H2D 0.4 nozzle", "inherits": "BETA PETG Matte @base", "from": "system", - "setting_id": "BPGB08_09", + "setting_id": "sqz8Vluq7GMd3siv", "instantiation": "true", "fan_max_speed": [ "30" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Matte @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Matte @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PETG Matte @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Matte @BBL X1C.json index 763594b41d..d8f5548ba0 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Matte @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Matte @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PETG Matte @BBL X1C", "inherits": "BETA PETG Matte @base", "from": "system", - "setting_id": "BPGB08_01", + "setting_id": "NXgqYCqHeVCgFF3I", "instantiation": "true", "fan_min_speed": [ "20" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Metallic @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Metallic @BBL A1.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PETG Metallic @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Metallic @BBL A1.json index 715ebc1ad1..e378cf3de1 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Metallic @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Metallic @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PETG Metallic @BBL A1", "inherits": "BETA PETG Metallic @base", "from": "system", - "setting_id": "BPGB09_06", + "setting_id": "1baUIJ3P8n6DcyRc", "instantiation": "true", "fan_max_speed": [ "50" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Metallic @BBL A1M 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Metallic @BBL A1M 0.4 nozzle.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PETG Metallic @BBL A1M 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Metallic @BBL A1M 0.4 nozzle.json index 85b11b2e80..6e1f1c1d30 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Metallic @BBL A1M 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Metallic @BBL A1M 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG Metallic @BBL A1M 0.4 nozzle", "inherits": "BETA PETG Metallic @base", "from": "system", - "setting_id": "BPGB09_03", + "setting_id": "LMsVDqsChBksLNqL", "instantiation": "true", "fan_max_speed": [ "50" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Metallic @BBL H2D 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Metallic @BBL H2D 0.4 nozzle.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PETG Metallic @BBL H2D 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Metallic @BBL H2D 0.4 nozzle.json index c00e63bf3d..c04e4513b5 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Metallic @BBL H2D 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Metallic @BBL H2D 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG Metallic @BBL H2D 0.4 nozzle", "inherits": "BETA PETG Metallic @base", "from": "system", - "setting_id": "BPGB09_09", + "setting_id": "giq8BW6qcwz91e4C", "instantiation": "true", "fan_max_speed": [ "30" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Metallic @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Metallic @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PETG Metallic @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Metallic @BBL X1C.json index 71f0be98d3..eaa3a9dae2 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Metallic @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Metallic @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PETG Metallic @BBL X1C", "inherits": "BETA PETG Metallic @base", "from": "system", - "setting_id": "BPGB09_01", + "setting_id": "tZzoc2LdgWkpEiox", "instantiation": "true", "fan_min_speed": [ "20" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Transparent @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Transparent @BBL A1.json similarity index 92% rename from resources/profiles/BBL/filament/BETA/BETA PETG Transparent @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Transparent @BBL A1.json index 53202d68d2..e00ecd5b04 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Transparent @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Transparent @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PETG Transparent @BBL A1", "inherits": "BETA PETG Transparent @base", "from": "system", - "setting_id": "BPGB10_05", + "setting_id": "86loYV5S4bgO2FOx", "instantiation": "true", "filament_long_retractions_when_cut": [ "1" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Transparent @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Transparent @BBL A1M.json similarity index 92% rename from resources/profiles/BBL/filament/BETA/BETA PETG Transparent @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Transparent @BBL A1M.json index 0419cdd3d4..a8c9ca893d 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Transparent @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Transparent @BBL A1M.json @@ -3,7 +3,7 @@ "name": "BETA PETG Transparent @BBL A1M", "inherits": "BETA PETG Transparent @base", "from": "system", - "setting_id": "BPGB10_02", + "setting_id": "c2xTYO07RC2G2xsv", "instantiation": "true", "filament_long_retractions_when_cut": [ "1" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Transparent @BBL H2D 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Transparent @BBL H2D 0.4 nozzle.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PETG Transparent @BBL H2D 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Transparent @BBL H2D 0.4 nozzle.json index e0e2c984aa..8e95c0e543 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Transparent @BBL H2D 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Transparent @BBL H2D 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG Transparent @BBL H2D 0.4 nozzle", "inherits": "BETA PETG Transparent @base", "from": "system", - "setting_id": "BPGB10_06", + "setting_id": "GkC5T0RX0meiLVKg", "instantiation": "true", "filament_deretraction_speed": [ "nil", diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Transparent @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Transparent @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PETG Transparent @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Transparent @BBL X1C.json index 102dbce7bf..9d2e347f64 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Transparent @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG Transparent @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PETG Transparent @BBL X1C", "inherits": "BETA PETG Transparent @base", "from": "system", - "setting_id": "BPGB10_00", + "setting_id": "doyjzbrEn9akgjvG", "instantiation": "true", "filament_long_retractions_when_cut": [ "1", diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG UV Color Change @BBL A1.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG UV Color Change @BBL A1.json index fd0e5b8e0d..9f34c89591 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG UV Color Change @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PETG UV Color Change @BBL A1", "inherits": "BETA PETG UV Color Change @base", "from": "system", - "setting_id": "BPGB11_06", + "setting_id": "CeepF0rRLZ5fzBwm", "instantiation": "true", "fan_max_speed": [ "50" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @BBL A1M 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG UV Color Change @BBL A1M 0.4 nozzle.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @BBL A1M 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG UV Color Change @BBL A1M 0.4 nozzle.json index 9b8d64318c..8a9f8d28d6 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @BBL A1M 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG UV Color Change @BBL A1M 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG UV Color Change @BBL A1M 0.4 nozzle", "inherits": "BETA PETG UV Color Change @base", "from": "system", - "setting_id": "BPGB11_03", + "setting_id": "Atb1esrVdoWBK97e", "instantiation": "true", "fan_max_speed": [ "50" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @BBL H2D 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG UV Color Change @BBL H2D 0.4 nozzle.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @BBL H2D 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG UV Color Change @BBL H2D 0.4 nozzle.json index 2ff953dc88..03f0000a35 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @BBL H2D 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG UV Color Change @BBL H2D 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG UV Color Change @BBL H2D 0.4 nozzle", "inherits": "BETA PETG UV Color Change @base", "from": "system", - "setting_id": "BPGB11_09", + "setting_id": "Ic0NUfwLmR0NSh5q", "instantiation": "true", "fan_max_speed": [ "30" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG UV Color Change @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG UV Color Change @BBL X1C.json index cd5be66bf3..32eaa333cf 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG UV Color Change @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PETG UV Color Change @BBL X1C", "inherits": "BETA PETG UV Color Change @base", "from": "system", - "setting_id": "BPGB11_01", + "setting_id": "BUKCpukEUmocfz3v", "instantiation": "true", "fan_min_speed": [ "20" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG-CF @BBL A1 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG-CF @BBL A1 0.4 nozzle.json similarity index 93% rename from resources/profiles/BBL/filament/BETA/BETA PETG-CF @BBL A1 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG-CF @BBL A1 0.4 nozzle.json index 4e15c8fc86..c0ed516884 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG-CF @BBL A1 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG-CF @BBL A1 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG-CF @BBL A1 0.4 nozzle", "inherits": "BETA PETG-CF @base", "from": "system", - "setting_id": "BPGB12_05", + "setting_id": "2ysJdw1MuW8VLmny", "instantiation": "true", "fan_cooling_layer_time": [ "30" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG-CF @BBL A1M 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG-CF @BBL A1M 0.4 nozzle.json similarity index 88% rename from resources/profiles/BBL/filament/BETA/BETA PETG-CF @BBL A1M 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG-CF @BBL A1M 0.4 nozzle.json index d19e61f946..9dee306a03 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG-CF @BBL A1M 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG-CF @BBL A1M 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG-CF @BBL A1M 0.4 nozzle", "inherits": "BETA PETG-CF @base", "from": "system", - "setting_id": "BPGB12_04", + "setting_id": "eZsa6noZZUahQeBp", "instantiation": "true", "filament_max_volumetric_speed": [ "9" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG-CF @BBL H2D 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG-CF @BBL H2D 0.4 nozzle.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PETG-CF @BBL H2D 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG-CF @BBL H2D 0.4 nozzle.json index fd47d4f843..22af1e06ff 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG-CF @BBL H2D 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG-CF @BBL H2D 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG-CF @BBL H2D 0.4 nozzle", "inherits": "BETA PETG-CF @base", "from": "system", - "setting_id": "BPGB12_08", + "setting_id": "YRUDQs5jE1d1BGTY", "instantiation": "true", "counter_coef_2": [ "0.00565" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG-CF @BBL P1P 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG-CF @BBL P1P 0.4 nozzle.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PETG-CF @BBL P1P 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG-CF @BBL P1P 0.4 nozzle.json index 845086dfe1..f1a7334810 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG-CF @BBL P1P 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG-CF @BBL P1P 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG-CF @BBL P1P 0.4 nozzle", "inherits": "BETA PETG-CF @base", "from": "system", - "setting_id": "BPGB12_03", + "setting_id": "i1OjgC3I96a1Trb8", "instantiation": "true", "fan_cooling_layer_time": [ "30" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG-CF @BBL X1C 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG-CF @BBL X1C 0.4 nozzle.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PETG-CF @BBL X1C 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG-CF @BBL X1C 0.4 nozzle.json index 4c8bf18ae3..273260a31f 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG-CF @BBL X1C 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG-CF @BBL X1C 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG-CF @BBL X1C 0.4 nozzle", "inherits": "BETA PETG-CF @base", "from": "system", - "setting_id": "BPGB12_02", + "setting_id": "0p4213iz0b9fbeKO", "instantiation": "true", "fan_cooling_layer_time": [ "30" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG-GF @BBL A1 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG-GF @BBL A1 0.4 nozzle.json similarity index 93% rename from resources/profiles/BBL/filament/BETA/BETA PETG-GF @BBL A1 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG-GF @BBL A1 0.4 nozzle.json index 719dd3ddfe..0aac4d7f04 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG-GF @BBL A1 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG-GF @BBL A1 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG-GF @BBL A1 0.4 nozzle", "inherits": "BETA PETG-GF @base", "from": "system", - "setting_id": "BPGB13_05", + "setting_id": "mUZlODC7TvISFthv", "instantiation": "true", "fan_cooling_layer_time": [ "30" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG-GF @BBL A1M 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG-GF @BBL A1M 0.4 nozzle.json similarity index 88% rename from resources/profiles/BBL/filament/BETA/BETA PETG-GF @BBL A1M 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG-GF @BBL A1M 0.4 nozzle.json index f874d81f46..ed98f6337f 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG-GF @BBL A1M 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG-GF @BBL A1M 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG-GF @BBL A1M 0.4 nozzle", "inherits": "BETA PETG-GF @base", "from": "system", - "setting_id": "BPGB13_04", + "setting_id": "9Rh7EvY3QZm07VNe", "instantiation": "true", "filament_max_volumetric_speed": [ "9" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG-GF @BBL H2D 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG-GF @BBL H2D 0.4 nozzle.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PETG-GF @BBL H2D 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG-GF @BBL H2D 0.4 nozzle.json index fd093d8506..277d1915b1 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG-GF @BBL H2D 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG-GF @BBL H2D 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG-GF @BBL H2D 0.4 nozzle", "inherits": "BETA PETG-GF @base", "from": "system", - "setting_id": "BPGB13_08", + "setting_id": "SOA1XFfdBEV4MEJy", "instantiation": "true", "counter_coef_2": [ "0.00565" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG-GF @BBL P1P 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG-GF @BBL P1P 0.4 nozzle.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PETG-GF @BBL P1P 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG-GF @BBL P1P 0.4 nozzle.json index f700b2149e..a94fc48630 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG-GF @BBL P1P 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG-GF @BBL P1P 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG-GF @BBL P1P 0.4 nozzle", "inherits": "BETA PETG-GF @base", "from": "system", - "setting_id": "BPGB13_03", + "setting_id": "tGtdR6vVNrTU26eI", "instantiation": "true", "fan_cooling_layer_time": [ "30" diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG-GF @BBL X1C 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG-GF @BBL X1C 0.4 nozzle.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PETG-GF @BBL X1C 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG-GF @BBL X1C 0.4 nozzle.json index 32b0daf255..db3ecc90d9 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG-GF @BBL X1C 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PETG-GF @BBL X1C 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PETG-GF @BBL X1C 0.4 nozzle", "inherits": "BETA PETG-GF @base", "from": "system", - "setting_id": "BPGB13_02", + "setting_id": "Z6dHVj1BKTJT7305", "instantiation": "true", "fan_cooling_layer_time": [ "30" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Basic @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Basic @BBL A1.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PLA Basic @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Basic @BBL A1.json index 3e0545627d..5dd32459b3 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Basic @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Basic @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PLA Basic @BBL A1", "inherits": "BETA PLA Basic @base", "from": "system", - "setting_id": "BPLB00_04", + "setting_id": "e6tjM1Pa81eCsCVa", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Basic @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Basic @BBL A1M.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PLA Basic @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Basic @BBL A1M.json index 074c8bbad6..78ba2bb9eb 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Basic @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Basic @BBL A1M.json @@ -3,7 +3,7 @@ "name": "BETA PLA Basic @BBL A1M", "inherits": "BETA PLA Basic @base", "from": "system", - "setting_id": "BPLB00_02", + "setting_id": "Uw0Gm74RTGBUcOYK", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Basic @BBL H2D.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Basic @BBL H2D.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Basic @BBL H2D.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Basic @BBL H2D.json index f309ce4697..97e462a487 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Basic @BBL H2D.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Basic @BBL H2D.json @@ -3,7 +3,7 @@ "name": "BETA PLA Basic @BBL H2D", "inherits": "BETA PLA Basic @base", "from": "system", - "setting_id": "BPLB00_12", + "setting_id": "LZBgJ5xFtzrt3v02", "instantiation": "true", "additional_cooling_fan_speed": [ "75" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Basic @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Basic @BBL P1P.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Basic @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Basic @BBL P1P.json index a9b3b41e67..99214e744d 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Basic @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Basic @BBL P1P.json @@ -3,7 +3,7 @@ "name": "BETA PLA Basic @BBL P1P", "inherits": "BETA PLA Basic @base", "from": "system", - "setting_id": "BPLB00_10", + "setting_id": "lh6niwL4m4XkSf8W", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Basic @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Basic @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Basic @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Basic @BBL X1C.json index 2efae39e66..c50f60f49c 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Basic @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Basic @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PLA Basic @BBL X1C", "inherits": "BETA PLA Basic @base", "from": "system", - "setting_id": "BPLB00", + "setting_id": "D5Ac9gZkax8dSVtV", "instantiation": "true", "filament_long_retractions_when_cut": [ "1", diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Chameleon @BBL A1.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Chameleon @BBL A1.json index da7e730707..bc2af1a623 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Chameleon @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PLA Chameleon @BBL A1", "inherits": "BETA PLA Chameleon @base", "from": "system", - "setting_id": "BPLB02_03", + "setting_id": "vEjSWxmmbBWpuaRq", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Chameleon @BBL A1M.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Chameleon @BBL A1M.json index 667a27517c..8d2dd918e9 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Chameleon @BBL A1M.json @@ -3,7 +3,7 @@ "name": "BETA PLA Chameleon @BBL A1M", "inherits": "BETA PLA Chameleon @base", "from": "system", - "setting_id": "BPLB02_02", + "setting_id": "TAwpOCw19HhlNsMH", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @BBL H2D.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Chameleon @BBL H2D.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @BBL H2D.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Chameleon @BBL H2D.json index 61921e055e..b2bae83295 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @BBL H2D.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Chameleon @BBL H2D.json @@ -3,7 +3,7 @@ "name": "BETA PLA Chameleon @BBL H2D", "inherits": "BETA PLA Chameleon @base", "from": "system", - "setting_id": "BPLB02_04", + "setting_id": "vG7kTitKJp5cBs3q", "instantiation": "true", "eng_plate_temp": [ "55" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Chameleon @BBL P1P.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Chameleon @BBL P1P.json index 896b695cad..ea66c51982 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Chameleon @BBL P1P.json @@ -3,7 +3,7 @@ "name": "BETA PLA Chameleon @BBL P1P", "inherits": "BETA PLA Chameleon @base", "from": "system", - "setting_id": "BPLB02_10", + "setting_id": "WGrBGAllXKxuLzjs", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Chameleon @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Chameleon @BBL X1C.json index ecc1332410..e1ec162a69 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Chameleon @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PLA Chameleon @BBL X1C", "inherits": "BETA PLA Chameleon @base", "from": "system", - "setting_id": "BPLB02_00", + "setting_id": "EfLqGX43NXNKKbWt", "instantiation": "true", "filament_long_retractions_when_cut": [ "1", diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Fluorescence @BBL A1.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Fluorescence @BBL A1.json index 07ccf57777..021a32a374 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Fluorescence @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PLA Fluorescence @BBL A1", "inherits": "BETA PLA Fluorescence @base", "from": "system", - "setting_id": "BPLB04_03", + "setting_id": "iyInqcqIjcvTJAKF", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Fluorescence @BBL A1M.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Fluorescence @BBL A1M.json index fe2a32394a..5bbfa583bc 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Fluorescence @BBL A1M.json @@ -3,7 +3,7 @@ "name": "BETA PLA Fluorescence @BBL A1M", "inherits": "BETA PLA Fluorescence @base", "from": "system", - "setting_id": "BPLB04_02", + "setting_id": "A1f81XZTI4THuOrz", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @BBL H2D.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Fluorescence @BBL H2D.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @BBL H2D.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Fluorescence @BBL H2D.json index 4dfe6a3041..50390428cc 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @BBL H2D.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Fluorescence @BBL H2D.json @@ -3,7 +3,7 @@ "name": "BETA PLA Fluorescence @BBL H2D", "inherits": "BETA PLA Fluorescence @base", "from": "system", - "setting_id": "BPLB04_04", + "setting_id": "gcP4tfP34Xz6A1aX", "instantiation": "true", "eng_plate_temp": [ "55" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Fluorescence @BBL P1P.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Fluorescence @BBL P1P.json index fa085c4b5b..a786a7aa36 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Fluorescence @BBL P1P.json @@ -3,7 +3,7 @@ "name": "BETA PLA Fluorescence @BBL P1P", "inherits": "BETA PLA Fluorescence @base", "from": "system", - "setting_id": "BPLB04_10", + "setting_id": "VXtzYPTfTHywigT5", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Fluorescence @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Fluorescence @BBL X1C.json index f7930db006..ef2188514c 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Fluorescence @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PLA Fluorescence @BBL X1C", "inherits": "BETA PLA Fluorescence @base", "from": "system", - "setting_id": "BPLB04_00", + "setting_id": "2nZDf5vDbWMzG91Q", "instantiation": "true", "filament_long_retractions_when_cut": [ "1", diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Glitter @BBL A1.json similarity index 94% rename from resources/profiles/BBL/filament/BETA/BETA PLA Glitter @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Glitter @BBL A1.json index a50ea558f6..271a16779c 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Glitter @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PLA Glitter @BBL A1", "inherits": "BETA PLA Glitter @base", "from": "system", - "setting_id": "BPLB05_03", + "setting_id": "OSPJASUk0Pg4tbVq", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Glitter @BBL A1M.json similarity index 94% rename from resources/profiles/BBL/filament/BETA/BETA PLA Glitter @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Glitter @BBL A1M.json index e9f9995415..f9c7b13966 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Glitter @BBL A1M.json @@ -3,7 +3,7 @@ "name": "BETA PLA Glitter @BBL A1M", "inherits": "BETA PLA Glitter @base", "from": "system", - "setting_id": "BPLB05_02", + "setting_id": "TwCRZOBSByKVOpWu", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @BBL H2D.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Glitter @BBL H2D.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Glitter @BBL H2D.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Glitter @BBL H2D.json index 30a169c731..de6665e0ef 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @BBL H2D.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Glitter @BBL H2D.json @@ -3,7 +3,7 @@ "name": "BETA PLA Glitter @BBL H2D", "inherits": "BETA PLA Glitter @base", "from": "system", - "setting_id": "BPLB05_04", + "setting_id": "V21QsVHdIu9O5x8H", "instantiation": "true", "eng_plate_temp": [ "55" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Glitter @BBL P1P.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Glitter @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Glitter @BBL P1P.json index 56fbd91b1f..c7cb14bea3 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Glitter @BBL P1P.json @@ -3,7 +3,7 @@ "name": "BETA PLA Glitter @BBL P1P", "inherits": "BETA PLA Glitter @base", "from": "system", - "setting_id": "BPLB05_10", + "setting_id": "6j8mVocsMSyMcN7W", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Glitter @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Glitter @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Glitter @BBL X1C.json index 27ef9b6bb1..97335ee8ba 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Glitter @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PLA Glitter @BBL X1C", "inherits": "BETA PLA Glitter @base", "from": "system", - "setting_id": "BPLB05_00", + "setting_id": "9xX3mgUo5cbNvn1G", "instantiation": "true", "filament_flow_ratio": [ "0.98", diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Glow @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Glow @BBL A1.json similarity index 94% rename from resources/profiles/BBL/filament/BETA/BETA PLA Glow @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Glow @BBL A1.json index b3e3f5810f..bf3ee29978 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Glow @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Glow @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PLA Glow @BBL A1", "inherits": "BETA PLA Glow @base", "from": "system", - "setting_id": "BPLB06_11", + "setting_id": "5CBeJCmUFnmeran7", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Glow @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Glow @BBL A1M.json similarity index 94% rename from resources/profiles/BBL/filament/BETA/BETA PLA Glow @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Glow @BBL A1M.json index ce16e93ea2..99725d2707 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Glow @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Glow @BBL A1M.json @@ -3,7 +3,7 @@ "name": "BETA PLA Glow @BBL A1M", "inherits": "BETA PLA Glow @base", "from": "system", - "setting_id": "BPLB06_16", + "setting_id": "E9Dx6JqlKJSObUbH", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Glow @BBL H2D.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Glow @BBL H2D.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Glow @BBL H2D.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Glow @BBL H2D.json index f36dad2a44..ef4fdb473b 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Glow @BBL H2D.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Glow @BBL H2D.json @@ -3,7 +3,7 @@ "name": "BETA PLA Glow @BBL H2D", "inherits": "BETA PLA Glow @base", "from": "system", - "setting_id": "BPLB06_06", + "setting_id": "3V9M3nMyxMHZPw86", "instantiation": "true", "eng_plate_temp": [ "55" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Glow @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Glow @BBL P1P.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Glow @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Glow @BBL P1P.json index 4e1abbead0..f19705f369 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Glow @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Glow @BBL P1P.json @@ -3,7 +3,7 @@ "name": "BETA PLA Glow @BBL P1P", "inherits": "BETA PLA Glow @base", "from": "system", - "setting_id": "BPLB06_02", + "setting_id": "iYLZEeO84vkLMKTI", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Glow @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Glow @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Glow @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Glow @BBL X1C.json index b7ed381bd3..b6d88f2cdc 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Glow @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Glow @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PLA Glow @BBL X1C", "inherits": "BETA PLA Glow @base", "from": "system", - "setting_id": "BPLB06_00", + "setting_id": "t2r0gXudUDKwtqiq", "instantiation": "true", "filament_long_retractions_when_cut": [ "1", diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Gradient @BBL A1.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PLA Gradient @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Gradient @BBL A1.json index 93a1e0c8a7..e178d3ff99 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Gradient @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PLA Gradient @BBL A1", "inherits": "BETA PLA Gradient @base", "from": "system", - "setting_id": "BPLB07_03", + "setting_id": "425v7oGgeTL6iomC", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Gradient @BBL A1M.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PLA Gradient @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Gradient @BBL A1M.json index a29b928941..36a9d142ad 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Gradient @BBL A1M.json @@ -3,7 +3,7 @@ "name": "BETA PLA Gradient @BBL A1M", "inherits": "BETA PLA Gradient @base", "from": "system", - "setting_id": "BPLB07_02", + "setting_id": "X8Y4YSnjlFf9mSIB", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @BBL H2D.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Gradient @BBL H2D.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Gradient @BBL H2D.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Gradient @BBL H2D.json index 3657d33348..23d5f31d21 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @BBL H2D.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Gradient @BBL H2D.json @@ -3,7 +3,7 @@ "name": "BETA PLA Gradient @BBL H2D", "inherits": "BETA PLA Gradient @base", "from": "system", - "setting_id": "BPLB07_04", + "setting_id": "YGTS7nibKyJKDcU4", "instantiation": "true", "eng_plate_temp": [ "55" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Gradient @BBL P1P.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Gradient @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Gradient @BBL P1P.json index 38ca268766..15b6d22f5e 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Gradient @BBL P1P.json @@ -3,7 +3,7 @@ "name": "BETA PLA Gradient @BBL P1P", "inherits": "BETA PLA Gradient @base", "from": "system", - "setting_id": "BPLB07_10", + "setting_id": "qSQlI3DJHr4ILcB2", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Gradient @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Gradient @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Gradient @BBL X1C.json index 28167832c7..ec1845f924 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Gradient @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PLA Gradient @BBL X1C", "inherits": "BETA PLA Gradient @base", "from": "system", - "setting_id": "BPLB07_00", + "setting_id": "d7p2sIDTErREL4Kl", "instantiation": "true", "filament_long_retractions_when_cut": [ "1", diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Heat Color Change @BBL A1.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Heat Color Change @BBL A1.json index f07c12540f..ca08ac0b4e 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Heat Color Change @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PLA Heat Color Change @BBL A1", "inherits": "BETA PLA Heat Color Change @base", "from": "system", - "setting_id": "BPLB03_03", + "setting_id": "5j48tMo1EVC3xQIy", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Heat Color Change @BBL A1M.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Heat Color Change @BBL A1M.json index 057ac94128..2a3ef9a0b4 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Heat Color Change @BBL A1M.json @@ -3,7 +3,7 @@ "name": "BETA PLA Heat Color Change @BBL A1M", "inherits": "BETA PLA Heat Color Change @base", "from": "system", - "setting_id": "BPLB03_02", + "setting_id": "revg1V2Pi8iCfrxi", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @BBL H2D.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Heat Color Change @BBL H2D.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @BBL H2D.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Heat Color Change @BBL H2D.json index 7777bdb4ca..6c9d1605fb 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @BBL H2D.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Heat Color Change @BBL H2D.json @@ -3,7 +3,7 @@ "name": "BETA PLA Heat Color Change @BBL H2D", "inherits": "BETA PLA Heat Color Change @base", "from": "system", - "setting_id": "BPLB03_04", + "setting_id": "4gszgdDD34i0PqNB", "instantiation": "true", "eng_plate_temp": [ "55" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Heat Color Change @BBL P1P.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Heat Color Change @BBL P1P.json index 0b8b264d0f..b789e28638 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Heat Color Change @BBL P1P.json @@ -3,7 +3,7 @@ "name": "BETA PLA Heat Color Change @BBL P1P", "inherits": "BETA PLA Heat Color Change @base", "from": "system", - "setting_id": "BPLB03_10", + "setting_id": "nNjRbHDsEfiCaAlB", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Heat Color Change @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Heat Color Change @BBL X1C.json index 96ae68563e..ed8b6c8589 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Heat Color Change @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PLA Heat Color Change @BBL X1C", "inherits": "BETA PLA Heat Color Change @base", "from": "system", - "setting_id": "BPLB03_00", + "setting_id": "UxrUKGG8X65QaY8e", "instantiation": "true", "filament_long_retractions_when_cut": [ "1", diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA High Speed @BBL A1.json similarity index 94% rename from resources/profiles/BBL/filament/BETA/BETA PLA High Speed @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA High Speed @BBL A1.json index 0f8dc55aec..a3fb1f92e7 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA High Speed @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PLA High Speed @BBL A1", "inherits": "BETA PLA High Speed @base", "from": "system", - "setting_id": "BPLB20_04", + "setting_id": "BGnydxe8BWKLWGUh", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA High Speed @BBL A1M.json similarity index 94% rename from resources/profiles/BBL/filament/BETA/BETA PLA High Speed @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA High Speed @BBL A1M.json index a9a989fa0b..714f84f727 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA High Speed @BBL A1M.json @@ -3,7 +3,7 @@ "name": "BETA PLA High Speed @BBL A1M", "inherits": "BETA PLA High Speed @base", "from": "system", - "setting_id": "BPLB20_06", + "setting_id": "c9A7frKuehrQbxga", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @BBL H2D.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA High Speed @BBL H2D.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA High Speed @BBL H2D.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA High Speed @BBL H2D.json index c353b206f8..01bd6e5701 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @BBL H2D.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA High Speed @BBL H2D.json @@ -3,7 +3,7 @@ "name": "BETA PLA High Speed @BBL H2D", "inherits": "BETA PLA High Speed @base", "from": "system", - "setting_id": "BPLB20_08", + "setting_id": "n9Bq9aOUoHA2d5aj", "instantiation": "true", "eng_plate_temp": [ "55" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA High Speed @BBL P1P.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA High Speed @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA High Speed @BBL P1P.json index 36f42f9c42..b2f9e5ad9d 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA High Speed @BBL P1P.json @@ -3,7 +3,7 @@ "name": "BETA PLA High Speed @BBL P1P", "inherits": "BETA PLA High Speed @base", "from": "system", - "setting_id": "BPLB20_02", + "setting_id": "OSqz4aXmaTf5UeNx", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA High Speed @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA High Speed @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA High Speed @BBL X1C.json index 0c6aa6b8b2..7babfd0ad0 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA High Speed @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA High Speed @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PLA High Speed @BBL X1C", "inherits": "BETA PLA High Speed @base", "from": "system", - "setting_id": "BPLB20_00", + "setting_id": "Ikl9jwlTBbGAgccp", "instantiation": "true", "filament_flow_ratio": [ "0.98", diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA High Temp @BBL A1.json similarity index 94% rename from resources/profiles/BBL/filament/BETA/BETA PLA High Temp @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA High Temp @BBL A1.json index b8ccc3af16..84769a0374 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA High Temp @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PLA High Temp @BBL A1", "inherits": "BETA PLA High Temp @base", "from": "system", - "setting_id": "BPLB18_05", + "setting_id": "hiRu8jlZ2NW4LlPH", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA High Temp @BBL A1M.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PLA High Temp @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA High Temp @BBL A1M.json index c7bca3f5c4..2caae4c09d 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA High Temp @BBL A1M.json @@ -3,7 +3,7 @@ "name": "BETA PLA High Temp @BBL A1M", "inherits": "BETA PLA High Temp @base", "from": "system", - "setting_id": "BPLB18_07", + "setting_id": "Dg4tIm8P04KTRbeo", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @BBL H2D.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA High Temp @BBL H2D.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA High Temp @BBL H2D.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA High Temp @BBL H2D.json index 08653bbf37..4047850988 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @BBL H2D.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA High Temp @BBL H2D.json @@ -3,7 +3,7 @@ "name": "BETA PLA High Temp @BBL H2D", "inherits": "BETA PLA High Temp @base", "from": "system", - "setting_id": "BPLB18_09", + "setting_id": "5F1rml3AGNMD6F1g", "instantiation": "true", "additional_cooling_fan_speed": [ "75" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA High Temp @BBL P1P.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA High Temp @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA High Temp @BBL P1P.json index 25a0522a02..91f72cdfb0 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA High Temp @BBL P1P.json @@ -3,7 +3,7 @@ "name": "BETA PLA High Temp @BBL P1P", "inherits": "BETA PLA High Temp @base", "from": "system", - "setting_id": "BPLB18_03", + "setting_id": "EeBCe9mT3aa8GY6E", "instantiation": "true", "filament_flow_ratio": [ "0.98", diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA High Temp @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA High Temp @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA High Temp @BBL X1C.json index e221c28c18..f0202e0fc1 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA High Temp @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PLA High Temp @BBL X1C", "inherits": "BETA PLA High Temp @base", "from": "system", - "setting_id": "BPLB18_00", + "setting_id": "YuUxUrDHm5pkQJ00", "instantiation": "true", "filament_flow_ratio": [ "0.98", diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Marble @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Marble @BBL A1.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PLA Marble @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Marble @BBL A1.json index 4bff45b61d..fad6908ea2 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Marble @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Marble @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PLA Marble @BBL A1", "inherits": "BETA PLA Marble @base", "from": "system", - "setting_id": "BPLB08_03", + "setting_id": "HUIyHrpR1NeXtq2U", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Marble @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Marble @BBL A1M.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PLA Marble @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Marble @BBL A1M.json index 3ad98ecb34..631d702b60 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Marble @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Marble @BBL A1M.json @@ -3,7 +3,7 @@ "name": "BETA PLA Marble @BBL A1M", "inherits": "BETA PLA Marble @base", "from": "system", - "setting_id": "BPLB08_02", + "setting_id": "tizFbLmroyCZkYwM", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Marble @BBL H2D.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Marble @BBL H2D.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Marble @BBL H2D.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Marble @BBL H2D.json index decacdcc40..1ef7104002 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Marble @BBL H2D.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Marble @BBL H2D.json @@ -3,7 +3,7 @@ "name": "BETA PLA Marble @BBL H2D", "inherits": "BETA PLA Marble @base", "from": "system", - "setting_id": "BPLB08_04", + "setting_id": "HQiUpjhYDmRgfE58", "instantiation": "true", "eng_plate_temp": [ "55" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Marble @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Marble @BBL P1P.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Marble @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Marble @BBL P1P.json index 2e7cf93c79..a198637db6 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Marble @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Marble @BBL P1P.json @@ -3,7 +3,7 @@ "name": "BETA PLA Marble @BBL P1P", "inherits": "BETA PLA Marble @base", "from": "system", - "setting_id": "BPLB08_10", + "setting_id": "vL5v8bp6NzR0rDLx", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Marble @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Marble @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Marble @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Marble @BBL X1C.json index bfc904d686..58a42b7452 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Marble @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Marble @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PLA Marble @BBL X1C", "inherits": "BETA PLA Marble @base", "from": "system", - "setting_id": "BPLB08_00", + "setting_id": "nNLxWZNjsSJ6hgoi", "instantiation": "true", "filament_long_retractions_when_cut": [ "1", diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Matte @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Matte @BBL A1.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PLA Matte @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Matte @BBL A1.json index 5791eaacb1..eafde54097 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Matte @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Matte @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PLA Matte @BBL A1", "inherits": "BETA PLA Matte @base", "from": "system", - "setting_id": "BPLB09_04", + "setting_id": "FcoZYFxLOjcwqHeK", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Matte @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Matte @BBL A1M.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PLA Matte @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Matte @BBL A1M.json index d2dace4b32..d35c947f36 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Matte @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Matte @BBL A1M.json @@ -3,7 +3,7 @@ "name": "BETA PLA Matte @BBL A1M", "inherits": "BETA PLA Matte @base", "from": "system", - "setting_id": "BPLB09_02", + "setting_id": "ZKRYRXFXljR57zqd", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Matte @BBL H2D.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Matte @BBL H2D.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Matte @BBL H2D.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Matte @BBL H2D.json index ef3fa05d53..bc595e11b5 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Matte @BBL H2D.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Matte @BBL H2D.json @@ -3,7 +3,7 @@ "name": "BETA PLA Matte @BBL H2D", "inherits": "BETA PLA Matte @base", "from": "system", - "setting_id": "BPLB09_05", + "setting_id": "Zw3CZVyBon930GCH", "instantiation": "true", "additional_cooling_fan_speed": [ "75" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Matte @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Matte @BBL P1P.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Matte @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Matte @BBL P1P.json index 8076797fb8..6331679d0c 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Matte @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Matte @BBL P1P.json @@ -3,7 +3,7 @@ "name": "BETA PLA Matte @BBL P1P", "inherits": "BETA PLA Matte @base", "from": "system", - "setting_id": "BPLB09_10", + "setting_id": "twKgWxS55toXm9pS", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Matte @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Matte @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Matte @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Matte @BBL X1C.json index dea5b1f08b..9214f71190 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Matte @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Matte @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PLA Matte @BBL X1C", "inherits": "BETA PLA Matte @base", "from": "system", - "setting_id": "BPLB09", + "setting_id": "R9ZZzNBbymoFbwoD", "instantiation": "true", "filament_long_retractions_when_cut": [ "1", diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Metal @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Metal @BBL A1.json similarity index 94% rename from resources/profiles/BBL/filament/BETA/BETA PLA Metal @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Metal @BBL A1.json index 0824f7da2a..6362a7cd3d 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Metal @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Metal @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PLA Metal @BBL A1", "inherits": "BETA PLA Metal @base", "from": "system", - "setting_id": "BPLB10_04", + "setting_id": "fXRyE1fu4AtA5AdK", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Metal @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Metal @BBL A1M.json similarity index 94% rename from resources/profiles/BBL/filament/BETA/BETA PLA Metal @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Metal @BBL A1M.json index 7c845e3bc0..8a60fd062a 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Metal @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Metal @BBL A1M.json @@ -3,7 +3,7 @@ "name": "BETA PLA Metal @BBL A1M", "inherits": "BETA PLA Metal @base", "from": "system", - "setting_id": "BPLB10_00", + "setting_id": "flbisIR5Js1cFyUe", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Metal @BBL H2D.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Metal @BBL H2D.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Metal @BBL H2D.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Metal @BBL H2D.json index 7dd3a3f16d..7ff82b8ae0 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Metal @BBL H2D.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Metal @BBL H2D.json @@ -3,7 +3,7 @@ "name": "BETA PLA Metal @BBL H2D", "inherits": "BETA PLA Metal @base", "from": "system", - "setting_id": "BPLB10_07", + "setting_id": "iuy4UVicjmTl5B0i", "instantiation": "true", "eng_plate_temp": [ "55" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Metal @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Metal @BBL P1P.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Metal @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Metal @BBL P1P.json index 48eede1a01..512647c8ac 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Metal @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Metal @BBL P1P.json @@ -3,7 +3,7 @@ "name": "BETA PLA Metal @BBL P1P", "inherits": "BETA PLA Metal @base", "from": "system", - "setting_id": "BPLB10_10", + "setting_id": "nEkQaDE7Ps8lSN5M", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Metal @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Metal @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Metal @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Metal @BBL X1C.json index 263bf64877..342feb455d 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Metal @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Metal @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PLA Metal @BBL X1C", "inherits": "BETA PLA Metal @base", "from": "system", - "setting_id": "BPLB10", + "setting_id": "RkaFgVuA3VCXCUwR", "instantiation": "true", "filament_max_volumetric_speed": [ "21", diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Metallic @BBL A1.json similarity index 94% rename from resources/profiles/BBL/filament/BETA/BETA PLA Metallic @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Metallic @BBL A1.json index 87c03f5dc7..18c962f034 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Metallic @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PLA Metallic @BBL A1", "inherits": "BETA PLA Metallic @base", "from": "system", - "setting_id": "BPLB11_04", + "setting_id": "Uqkj3TepJG7iMPQG", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Metallic @BBL A1M.json similarity index 94% rename from resources/profiles/BBL/filament/BETA/BETA PLA Metallic @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Metallic @BBL A1M.json index 685c0be389..e0600f6ae0 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Metallic @BBL A1M.json @@ -3,7 +3,7 @@ "name": "BETA PLA Metallic @BBL A1M", "inherits": "BETA PLA Metallic @base", "from": "system", - "setting_id": "BPLB11_00", + "setting_id": "LaqMwUAucC9o1Iwn", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @BBL H2D.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Metallic @BBL H2D.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Metallic @BBL H2D.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Metallic @BBL H2D.json index 23e0eada1d..d9a181f2ba 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @BBL H2D.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Metallic @BBL H2D.json @@ -3,7 +3,7 @@ "name": "BETA PLA Metallic @BBL H2D", "inherits": "BETA PLA Metallic @base", "from": "system", - "setting_id": "BPLB11_07", + "setting_id": "S5UzAJasZ5CyEmfL", "instantiation": "true", "eng_plate_temp": [ "55" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Metallic @BBL P1P.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Metallic @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Metallic @BBL P1P.json index eb1d1f6804..cdb7e0a72d 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Metallic @BBL P1P.json @@ -3,7 +3,7 @@ "name": "BETA PLA Metallic @BBL P1P", "inherits": "BETA PLA Metallic @base", "from": "system", - "setting_id": "BPLB11_10", + "setting_id": "xyNibP5nFO0inDjx", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Metallic @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Metallic @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Metallic @BBL X1C.json index edc372c4c8..0387582b90 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Metallic @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PLA Metallic @BBL X1C", "inherits": "BETA PLA Metallic @base", "from": "system", - "setting_id": "BPLB11", + "setting_id": "vXm2F0GQvACSRrDF", "instantiation": "true", "filament_max_volumetric_speed": [ "21", diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA PRO @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA PRO @BBL A1.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PLA PRO @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA PRO @BBL A1.json index c8b2a6fa6a..5366e04cf5 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA PRO @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA PRO @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PLA PRO @BBL A1", "inherits": "BETA PLA PRO @base", "from": "system", - "setting_id": "BPLB12_04", + "setting_id": "SiBlaw6JN4thc2v7", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA PRO @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA PRO @BBL A1M.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PLA PRO @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA PRO @BBL A1M.json index fe1de91251..215c2b6e4e 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA PRO @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA PRO @BBL A1M.json @@ -3,7 +3,7 @@ "name": "BETA PLA PRO @BBL A1M", "inherits": "BETA PLA PRO @base", "from": "system", - "setting_id": "BPLB12_02", + "setting_id": "3PLh2oirCzwxIYY7", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA PRO @BBL H2D.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA PRO @BBL H2D.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA PRO @BBL H2D.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA PRO @BBL H2D.json index 13aaebc092..605e1e9a37 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA PRO @BBL H2D.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA PRO @BBL H2D.json @@ -3,7 +3,7 @@ "name": "BETA PLA PRO @BBL H2D", "inherits": "BETA PLA PRO @base", "from": "system", - "setting_id": "BPLB12_12", + "setting_id": "Mth7IAdxkWf7pSSj", "instantiation": "true", "additional_cooling_fan_speed": [ "75" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA PRO @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA PRO @BBL P1P.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA PRO @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA PRO @BBL P1P.json index ded38c78d8..35d88a6d9f 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA PRO @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA PRO @BBL P1P.json @@ -3,7 +3,7 @@ "name": "BETA PLA PRO @BBL P1P", "inherits": "BETA PLA PRO @base", "from": "system", - "setting_id": "BPLB12_10", + "setting_id": "TbpMpIJpBn6t93fw", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA PRO @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA PRO @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA PRO @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA PRO @BBL X1C.json index bb7581f809..b35f73cc70 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA PRO @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA PRO @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PLA PRO @BBL X1C", "inherits": "BETA PLA PRO @base", "from": "system", - "setting_id": "BPLB12", + "setting_id": "vGDfXmE1VEysXtAO", "instantiation": "true", "filament_long_retractions_when_cut": [ "1", diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Silk @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Silk @BBL A1.json similarity index 94% rename from resources/profiles/BBL/filament/BETA/BETA PLA Silk @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Silk @BBL A1.json index 0fa19d6760..7431ae5cfb 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Silk @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Silk @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PLA Silk @BBL A1", "inherits": "BETA PLA Silk @base", "from": "system", - "setting_id": "BPLB13_05", + "setting_id": "YX4fP5hZvz8u47CE", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Silk @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Silk @BBL A1M.json similarity index 94% rename from resources/profiles/BBL/filament/BETA/BETA PLA Silk @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Silk @BBL A1M.json index eb9a1c4d17..a04e603208 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Silk @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Silk @BBL A1M.json @@ -3,7 +3,7 @@ "name": "BETA PLA Silk @BBL A1M", "inherits": "BETA PLA Silk @base", "from": "system", - "setting_id": "BPLB13_03", + "setting_id": "ebNsrfIGYb2cWiFZ", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Silk @BBL H2D.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Silk @BBL H2D.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Silk @BBL H2D.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Silk @BBL H2D.json index 513d2a4aa7..943bdfaf11 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Silk @BBL H2D.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Silk @BBL H2D.json @@ -3,7 +3,7 @@ "name": "BETA PLA Silk @BBL H2D", "inherits": "BETA PLA Silk @base", "from": "system", - "setting_id": "BPLB13_16", + "setting_id": "qXuac1ixZ4VdWMyA", "instantiation": "true", "additional_cooling_fan_speed": [ "75" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Silk @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Silk @BBL P1P.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Silk @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Silk @BBL P1P.json index e8cbc2e14b..8967b90534 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Silk @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Silk @BBL P1P.json @@ -3,7 +3,7 @@ "name": "BETA PLA Silk @BBL P1P", "inherits": "BETA PLA Silk @base", "from": "system", - "setting_id": "BPLB13_12", + "setting_id": "AjbwkQMcmhlbU05G", "instantiation": "true", "filament_flow_ratio": [ "0.98", diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Silk @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Silk @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Silk @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Silk @BBL X1C.json index 8a7e3eff50..5a94b4e94b 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Silk @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Silk @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PLA Silk @BBL X1C", "inherits": "BETA PLA Silk @base", "from": "system", - "setting_id": "BPLB13_01", + "setting_id": "WfQvql8IUq5wYZy2", "instantiation": "true", "filament_flow_ratio": [ "0.98", diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Silk+ @BBL A1.json similarity index 94% rename from resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Silk+ @BBL A1.json index fde75ade2b..7dd7287011 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Silk+ @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PLA Silk+ @BBL A1", "inherits": "BETA PLA Silk+ @base", "from": "system", - "setting_id": "BPLB01_05", + "setting_id": "tuARzQoSxOfqBGVB", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Silk+ @BBL A1M.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Silk+ @BBL A1M.json index 2f7caa3f45..343cef28a0 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Silk+ @BBL A1M.json @@ -3,7 +3,7 @@ "name": "BETA PLA Silk+ @BBL A1M", "inherits": "BETA PLA Silk+ @base", "from": "system", - "setting_id": "BPLB01_07", + "setting_id": "FYOjtlcF2X4JJTW2", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @BBL H2D.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Silk+ @BBL H2D.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @BBL H2D.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Silk+ @BBL H2D.json index 244dab338f..35d9da0d5c 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @BBL H2D.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Silk+ @BBL H2D.json @@ -3,7 +3,7 @@ "name": "BETA PLA Silk+ @BBL H2D", "inherits": "BETA PLA Silk+ @base", "from": "system", - "setting_id": "BPLB01_09", + "setting_id": "4aj9YjpmJDQoTIv7", "instantiation": "true", "additional_cooling_fan_speed": [ "75" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Silk+ @BBL P1P.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Silk+ @BBL P1P.json index f809b6d7e9..0655808c45 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Silk+ @BBL P1P.json @@ -3,7 +3,7 @@ "name": "BETA PLA Silk+ @BBL P1P", "inherits": "BETA PLA Silk+ @base", "from": "system", - "setting_id": "BPLB01_03", + "setting_id": "2zazn2f141IdduiF", "instantiation": "true", "filament_flow_ratio": [ "0.98", diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Silk+ @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Silk+ @BBL X1C.json index 065b493b2c..f4061a43c5 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Silk+ @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PLA Silk+ @BBL X1C", "inherits": "BETA PLA Silk+ @base", "from": "system", - "setting_id": "BPLB01_00", + "setting_id": "II7v6FJKAEfsHPsC", "instantiation": "true", "filament_flow_ratio": [ "0.98", diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Transparent @BBL A1.json similarity index 96% rename from resources/profiles/BBL/filament/BETA/BETA PLA Transparent @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Transparent @BBL A1.json index 2a84d1f507..80c20b5305 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Transparent @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PLA Transparent @BBL A1", "inherits": "BETA PLA Transparent @base", "from": "system", - "setting_id": "BPLB14_06", + "setting_id": "V0vkf3I1WVUAqxoF", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Transparent @BBL A1M.json similarity index 96% rename from resources/profiles/BBL/filament/BETA/BETA PLA Transparent @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Transparent @BBL A1M.json index 94753a2b93..d573615c6e 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Transparent @BBL A1M.json @@ -3,7 +3,7 @@ "name": "BETA PLA Transparent @BBL A1M", "inherits": "BETA PLA Transparent @base", "from": "system", - "setting_id": "BPLB14_09", + "setting_id": "Byg1D2JdNLqdxm0F", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @BBL H2D.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Transparent @BBL H2D.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Transparent @BBL H2D.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Transparent @BBL H2D.json index 3d11c50857..6932a2a9b1 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @BBL H2D.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Transparent @BBL H2D.json @@ -3,7 +3,7 @@ "name": "BETA PLA Transparent @BBL H2D", "inherits": "BETA PLA Transparent @base", "from": "system", - "setting_id": "BPLB14_12", + "setting_id": "1l2wIbU3KDjwmUVY", "instantiation": "true", "eng_plate_temp": [ "55" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Transparent @BBL P1P.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Transparent @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Transparent @BBL P1P.json index a180a2a124..3ab7af716f 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Transparent @BBL P1P.json @@ -3,7 +3,7 @@ "name": "BETA PLA Transparent @BBL P1P", "inherits": "BETA PLA Transparent @base", "from": "system", - "setting_id": "BPLB14_03", + "setting_id": "lkk8IBexAioV8IVA", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Transparent @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Transparent @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Transparent @BBL X1C.json index 072bb2ec9c..0c564fe5d0 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Transparent @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PLA Transparent @BBL X1C", "inherits": "BETA PLA Transparent @base", "from": "system", - "setting_id": "BPLB14_00", + "setting_id": "irzqsuMp63Uk5U3F", "instantiation": "true", "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_retract_before_wipe": [ diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA UV Color Change @BBL A1.json similarity index 94% rename from resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA UV Color Change @BBL A1.json index f9016e233b..1cb752641a 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA UV Color Change @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PLA UV Color Change @BBL A1", "inherits": "BETA PLA UV Color Change @base", "from": "system", - "setting_id": "BPLB15_11", + "setting_id": "JrWOMe0rkRqc1Ke4", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA UV Color Change @BBL A1M.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA UV Color Change @BBL A1M.json index da74968584..9f2b89b70e 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA UV Color Change @BBL A1M.json @@ -3,7 +3,7 @@ "name": "BETA PLA UV Color Change @BBL A1M", "inherits": "BETA PLA UV Color Change @base", "from": "system", - "setting_id": "BPLB15_16", + "setting_id": "7V4HEL5PUiStwzpz", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @BBL H2D.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA UV Color Change @BBL H2D.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @BBL H2D.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA UV Color Change @BBL H2D.json index 5d23c31585..2e086ef2c9 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @BBL H2D.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA UV Color Change @BBL H2D.json @@ -3,7 +3,7 @@ "name": "BETA PLA UV Color Change @BBL H2D", "inherits": "BETA PLA UV Color Change @base", "from": "system", - "setting_id": "BPLB15_06", + "setting_id": "oOCiCsRmcy4hRZ45", "instantiation": "true", "eng_plate_temp": [ "55" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA UV Color Change @BBL P1P.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA UV Color Change @BBL P1P.json index 4ec6559082..15309bbca5 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA UV Color Change @BBL P1P.json @@ -3,7 +3,7 @@ "name": "BETA PLA UV Color Change @BBL P1P", "inherits": "BETA PLA UV Color Change @base", "from": "system", - "setting_id": "BPLB15_02", + "setting_id": "lxVwiIRA5WN0N2TU", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA UV Color Change @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA UV Color Change @BBL X1C.json index f990e19fbe..050907b9da 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA UV Color Change @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PLA UV Color Change @BBL X1C", "inherits": "BETA PLA UV Color Change @base", "from": "system", - "setting_id": "BPLB15_00", + "setting_id": "PRWqTkiWEkWOiXFA", "instantiation": "true", "filament_long_retractions_when_cut": [ "1", diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Wood @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Wood @BBL A1.json similarity index 96% rename from resources/profiles/BBL/filament/BETA/BETA PLA Wood @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Wood @BBL A1.json index 59a931d95d..1782275869 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Wood @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Wood @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PLA Wood @BBL A1", "inherits": "BETA PLA Wood @base", "from": "system", - "setting_id": "BPLB19_04", + "setting_id": "NnfeDQPSJ3lnrAw9", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Wood @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Wood @BBL A1M.json similarity index 97% rename from resources/profiles/BBL/filament/BETA/BETA PLA Wood @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Wood @BBL A1M.json index ee662f0c7b..755497f89b 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Wood @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Wood @BBL A1M.json @@ -3,7 +3,7 @@ "name": "BETA PLA Wood @BBL A1M", "inherits": "BETA PLA Wood @base", "from": "system", - "setting_id": "BPLB19_05", + "setting_id": "GXigA5h84gA4KRH3", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Wood @BBL H2D.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Wood @BBL H2D.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Wood @BBL H2D.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Wood @BBL H2D.json index 74c43f6e6b..07f19819fc 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Wood @BBL H2D.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Wood @BBL H2D.json @@ -3,7 +3,7 @@ "name": "BETA PLA Wood @BBL H2D", "inherits": "BETA PLA Wood @base", "from": "system", - "setting_id": "BPLB19_06", + "setting_id": "8KPAmWj4bJ2P4gAn", "instantiation": "true", "eng_plate_temp": [ "55" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Wood @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Wood @BBL P1P.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Wood @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Wood @BBL P1P.json index eb0c56df11..62d5a28a78 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Wood @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Wood @BBL P1P.json @@ -3,7 +3,7 @@ "name": "BETA PLA Wood @BBL P1P", "inherits": "BETA PLA Wood @base", "from": "system", - "setting_id": "BPLB19_03", + "setting_id": "mcsmTaMSaWs2RBvn", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Wood @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Wood @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Wood @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Wood @BBL X1C.json index 9ada7a13f1..e000cf0259 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Wood @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Wood @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PLA Wood @BBL X1C", "inherits": "BETA PLA Wood @base", "from": "system", - "setting_id": "BPLB19_00", + "setting_id": "TI16gHjo52VFaAW1", "instantiation": "true", "filament_flow_ratio": [ "0.98", diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Youth @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Youth @BBL A1.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PLA Youth @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Youth @BBL A1.json index c2fa4faa80..fcfd4f3774 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Youth @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Youth @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PLA Youth @BBL A1", "inherits": "BETA PLA Youth @base", "from": "system", - "setting_id": "BPLB16_04", + "setting_id": "jVWf9kiFpfmxFlw6", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Youth @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Youth @BBL A1M.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PLA Youth @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Youth @BBL A1M.json index 799c3c13db..e8e6da828a 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Youth @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Youth @BBL A1M.json @@ -3,7 +3,7 @@ "name": "BETA PLA Youth @BBL A1M", "inherits": "BETA PLA Youth @base", "from": "system", - "setting_id": "BPLB16_02", + "setting_id": "OfKH1gaVgx1adGeJ", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Youth @BBL H2D.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Youth @BBL H2D.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Youth @BBL H2D.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Youth @BBL H2D.json index 66520b424e..4b1b4b9a50 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Youth @BBL H2D.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Youth @BBL H2D.json @@ -3,7 +3,7 @@ "name": "BETA PLA Youth @BBL H2D", "inherits": "BETA PLA Youth @base", "from": "system", - "setting_id": "BPLB16_05", + "setting_id": "ZtgqauY30xyhRIB3", "instantiation": "true", "additional_cooling_fan_speed": [ "75" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Youth @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Youth @BBL P1P.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Youth @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Youth @BBL P1P.json index 2afbb6da25..a40b68fbc3 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Youth @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Youth @BBL P1P.json @@ -3,7 +3,7 @@ "name": "BETA PLA Youth @BBL P1P", "inherits": "BETA PLA Youth @base", "from": "system", - "setting_id": "BPLB16_10", + "setting_id": "9vXzlNUSu4TNwDJU", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Youth @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Youth @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA Youth @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Youth @BBL X1C.json index e80eb16387..f073c1dab8 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Youth @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA Youth @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PLA Youth @BBL X1C", "inherits": "BETA PLA Youth @base", "from": "system", - "setting_id": "BPLB16", + "setting_id": "CjlZ1vLEO5q9poBI", "instantiation": "true", "filament_long_retractions_when_cut": [ "1", diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA-CF @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA-CF @BBL A1.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PLA-CF @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA-CF @BBL A1.json index 8aab52aaff..9412797e04 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA-CF @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA-CF @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA PLA-CF @BBL A1", "inherits": "BETA PLA-CF @base", "from": "system", - "setting_id": "BPLB17_04", + "setting_id": "BrCWtHyjzY4HmH3d", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA-CF @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA-CF @BBL A1M.json similarity index 95% rename from resources/profiles/BBL/filament/BETA/BETA PLA-CF @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA-CF @BBL A1M.json index 4ccfd18683..344eb03185 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA-CF @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA-CF @BBL A1M.json @@ -3,7 +3,7 @@ "name": "BETA PLA-CF @BBL A1M", "inherits": "BETA PLA-CF @base", "from": "system", - "setting_id": "BPLB17_00", + "setting_id": "IWXiKjynDITAsjK6", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA-CF @BBL H2D 0.4 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA-CF @BBL H2D 0.4 nozzle.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA-CF @BBL H2D 0.4 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA-CF @BBL H2D 0.4 nozzle.json index 320aee32e5..892c56cf9f 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA-CF @BBL H2D 0.4 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA-CF @BBL H2D 0.4 nozzle.json @@ -3,7 +3,7 @@ "name": "BETA PLA-CF @BBL H2D 0.4 nozzle", "inherits": "BETA PLA-CF @base", "from": "system", - "setting_id": "BPLB17_08", + "setting_id": "xwMsvH6rRcJMpVlv", "instantiation": "true", "counter_coef_2": [ "0.012" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA-CF @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA-CF @BBL P1P.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA-CF @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA-CF @BBL P1P.json index 499a024436..d7e1cf9423 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA-CF @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA-CF @BBL P1P.json @@ -3,7 +3,7 @@ "name": "BETA PLA-CF @BBL P1P", "inherits": "BETA PLA-CF @base", "from": "system", - "setting_id": "BPLB17_10", + "setting_id": "zLVxbFEuXKyzoI7M", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA-CF @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA-CF @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA PLA-CF @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA-CF @BBL X1C.json index 0f123a7e5a..ae78bbd234 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA-CF @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA PLA-CF @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA PLA-CF @BBL X1C", "inherits": "BETA PLA-CF @base", "from": "system", - "setting_id": "BPLB17_01", + "setting_id": "OnU9q1dVgATPktPE", "instantiation": "true", "filament_long_retractions_when_cut": [ "1", diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 90A @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 90A @BBL A1.json similarity index 93% rename from resources/profiles/BBL/filament/BETA/BETA TPU 90A @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 90A @BBL A1.json index 35e3010043..82b5dcda5e 100644 --- a/resources/profiles/BBL/filament/BETA/BETA TPU 90A @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 90A @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA TPU 90A @BBL A1", "inherits": "BETA TPU 90A @base", "from": "system", - "setting_id": "BTUB00_04", + "setting_id": "kJCrh3pbuHtgOzPo", "instantiation": "true", "filament_density": [ "1.22" diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 90A @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 90A @BBL A1M.json similarity index 94% rename from resources/profiles/BBL/filament/BETA/BETA TPU 90A @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 90A @BBL A1M.json index e4a5c32532..0ac15e9a90 100644 --- a/resources/profiles/BBL/filament/BETA/BETA TPU 90A @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 90A @BBL A1M.json @@ -3,7 +3,7 @@ "name": "BETA TPU 90A @BBL A1M", "inherits": "BETA TPU 90A @base", "from": "system", - "setting_id": "BTUB00_05", + "setting_id": "r1Upv1GORMLTOi0k", "instantiation": "true", "filament_density": [ "1.22" diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 90A @BBL H2D.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 90A @BBL H2D.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA TPU 90A @BBL H2D.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 90A @BBL H2D.json index d37436075b..8eb8e80392 100644 --- a/resources/profiles/BBL/filament/BETA/BETA TPU 90A @BBL H2D.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 90A @BBL H2D.json @@ -3,7 +3,7 @@ "name": "BETA TPU 90A @BBL H2D", "inherits": "BETA TPU 90A @base", "from": "system", - "setting_id": "BTUB00_02", + "setting_id": "lm5PEdmOJODAz6KJ", "instantiation": "true", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 90A @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 90A @BBL P1P.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA TPU 90A @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 90A @BBL P1P.json index 2b599ce405..65070fff7b 100644 --- a/resources/profiles/BBL/filament/BETA/BETA TPU 90A @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 90A @BBL P1P.json @@ -3,7 +3,7 @@ "name": "BETA TPU 90A @BBL P1P", "inherits": "BETA TPU 90A @base", "from": "system", - "setting_id": "BTUB00_01", + "setting_id": "OourWlFV3alIJBzh", "instantiation": "true", "filament_max_volumetric_speed": [ "2.8", diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 90A @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 90A @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA TPU 90A @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 90A @BBL X1C.json index 00935d8509..b95218473a 100644 --- a/resources/profiles/BBL/filament/BETA/BETA TPU 90A @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 90A @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA TPU 90A @BBL X1C", "inherits": "BETA TPU 90A @base", "from": "system", - "setting_id": "BTUB00_00", + "setting_id": "nLIwjhps5uVtTuo4", "instantiation": "true", "filament_max_volumetric_speed": [ "2.8", diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 95A @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 95A @BBL A1.json similarity index 93% rename from resources/profiles/BBL/filament/BETA/BETA TPU 95A @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 95A @BBL A1.json index 7a7432b1c0..716d6a743b 100644 --- a/resources/profiles/BBL/filament/BETA/BETA TPU 95A @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 95A @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA TPU 95A @BBL A1", "inherits": "BETA TPU 95A @base", "from": "system", - "setting_id": "BTUB02_01", + "setting_id": "OOPUx5d9zREy0XXN", "instantiation": "true", "filament_max_volumetric_speed": [ "3.6" diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 95A @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 95A @BBL A1M.json similarity index 93% rename from resources/profiles/BBL/filament/BETA/BETA TPU 95A @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 95A @BBL A1M.json index a6d90ba06a..12f9bf0f0b 100644 --- a/resources/profiles/BBL/filament/BETA/BETA TPU 95A @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 95A @BBL A1M.json @@ -3,7 +3,7 @@ "name": "BETA TPU 95A @BBL A1M", "inherits": "BETA TPU 95A @base", "from": "system", - "setting_id": "BTUB02_00", + "setting_id": "rNCp3fE6g2C8sd7S", "instantiation": "true", "filament_max_volumetric_speed": [ "3.6" diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 95A @BBL H2D.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 95A @BBL H2D.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA TPU 95A @BBL H2D.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 95A @BBL H2D.json index dcce8d00cb..62cdeadad1 100644 --- a/resources/profiles/BBL/filament/BETA/BETA TPU 95A @BBL H2D.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 95A @BBL H2D.json @@ -3,7 +3,7 @@ "name": "BETA TPU 95A @BBL H2D", "inherits": "BETA TPU 95A @base", "from": "system", - "setting_id": "BTUB02_03", + "setting_id": "k6clcTFJXTGVdmZg", "instantiation": "true", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 95A @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 95A @BBL P1P.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA TPU 95A @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 95A @BBL P1P.json index a2fb288291..d16b0ae94a 100644 --- a/resources/profiles/BBL/filament/BETA/BETA TPU 95A @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 95A @BBL P1P.json @@ -3,7 +3,7 @@ "name": "BETA TPU 95A @BBL P1P", "inherits": "BETA TPU 95A @base", "from": "system", - "setting_id": "BTUB02_10", + "setting_id": "RaXgc8QZiSW0tsnD", "instantiation": "true", "filament_max_volumetric_speed": [ "3.6", diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 95A @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 95A @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA TPU 95A @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 95A @BBL X1C.json index e96641af54..985aca2147 100644 --- a/resources/profiles/BBL/filament/BETA/BETA TPU 95A @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 95A @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA TPU 95A @BBL X1C", "inherits": "BETA TPU 95A @base", "from": "system", - "setting_id": "BTUB02", + "setting_id": "ngJL0G4zca0UcpwY", "instantiation": "true", "filament_max_volumetric_speed": [ "3.6", diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 98A @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 98A @BBL A1.json similarity index 93% rename from resources/profiles/BBL/filament/BETA/BETA TPU 98A @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 98A @BBL A1.json index 2813ecc893..9ff26d32d3 100644 --- a/resources/profiles/BBL/filament/BETA/BETA TPU 98A @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 98A @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA TPU 98A @BBL A1", "inherits": "BETA TPU 98A @base", "from": "system", - "setting_id": "BTUB03_01", + "setting_id": "uSuXXdSY9wCappR9", "instantiation": "true", "filament_max_volumetric_speed": [ "3.6" diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 98A @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 98A @BBL A1M.json similarity index 93% rename from resources/profiles/BBL/filament/BETA/BETA TPU 98A @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 98A @BBL A1M.json index baf4f84328..8506e28d8b 100644 --- a/resources/profiles/BBL/filament/BETA/BETA TPU 98A @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 98A @BBL A1M.json @@ -3,7 +3,7 @@ "name": "BETA TPU 98A @BBL A1M", "inherits": "BETA TPU 98A @base", "from": "system", - "setting_id": "BTUB03_00", + "setting_id": "KZXiOO0bAUvrntok", "instantiation": "true", "filament_max_volumetric_speed": [ "3.6" diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 98A @BBL H2D.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 98A @BBL H2D.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA TPU 98A @BBL H2D.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 98A @BBL H2D.json index bf342fadc9..ab3c0989cb 100644 --- a/resources/profiles/BBL/filament/BETA/BETA TPU 98A @BBL H2D.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 98A @BBL H2D.json @@ -3,7 +3,7 @@ "name": "BETA TPU 98A @BBL H2D", "inherits": "BETA TPU 98A @base", "from": "system", - "setting_id": "BTUB03_03", + "setting_id": "p0qjTRymaVctbU11", "instantiation": "true", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 98A @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 98A @BBL P1P.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA TPU 98A @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 98A @BBL P1P.json index 419eb5b7c6..7ccae380cd 100644 --- a/resources/profiles/BBL/filament/BETA/BETA TPU 98A @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 98A @BBL P1P.json @@ -3,7 +3,7 @@ "name": "BETA TPU 98A @BBL P1P", "inherits": "BETA TPU 98A @base", "from": "system", - "setting_id": "BTUB03_10", + "setting_id": "dHuSF6XjQORHCc8n", "instantiation": "true", "filament_max_volumetric_speed": [ "3.6", diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU 98A @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 98A @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA TPU 98A @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 98A @BBL X1C.json index 8df9a59fe2..c455de9c8d 100644 --- a/resources/profiles/BBL/filament/BETA/BETA TPU 98A @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU 98A @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA TPU 98A @BBL X1C", "inherits": "BETA TPU 98A @base", "from": "system", - "setting_id": "BTUB03", + "setting_id": "jl1vNhZRhicI78UU", "instantiation": "true", "filament_max_volumetric_speed": [ "3.6", diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU Matte @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU Matte @BBL A1.json similarity index 93% rename from resources/profiles/BBL/filament/BETA/BETA TPU Matte @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU Matte @BBL A1.json index 427e618aec..730b3e1419 100644 --- a/resources/profiles/BBL/filament/BETA/BETA TPU Matte @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU Matte @BBL A1.json @@ -3,7 +3,7 @@ "name": "BETA TPU Matte @BBL A1", "inherits": "BETA TPU Matte @base", "from": "system", - "setting_id": "BTUB01_04", + "setting_id": "lnP769IP2TuLf36V", "instantiation": "true", "filament_density": [ "1.22" diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU Matte @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU Matte @BBL A1M.json similarity index 94% rename from resources/profiles/BBL/filament/BETA/BETA TPU Matte @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU Matte @BBL A1M.json index 0ce2e0f9f3..df0f14e67f 100644 --- a/resources/profiles/BBL/filament/BETA/BETA TPU Matte @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU Matte @BBL A1M.json @@ -3,7 +3,7 @@ "name": "BETA TPU Matte @BBL A1M", "inherits": "BETA TPU Matte @base", "from": "system", - "setting_id": "BTUB01_05", + "setting_id": "wjYECCkIeDnUZfqL", "instantiation": "true", "filament_density": [ "1.22" diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU Matte @BBL H2D.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU Matte @BBL H2D.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA TPU Matte @BBL H2D.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU Matte @BBL H2D.json index 10193d7d5a..a1571446ab 100644 --- a/resources/profiles/BBL/filament/BETA/BETA TPU Matte @BBL H2D.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU Matte @BBL H2D.json @@ -3,7 +3,7 @@ "name": "BETA TPU Matte @BBL H2D", "inherits": "BETA TPU Matte @base", "from": "system", - "setting_id": "BTUB01_02", + "setting_id": "PeJPI88l3Ui7jZnj", "instantiation": "true", "additional_cooling_fan_speed": [ "100" diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU Matte @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU Matte @BBL P1P.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA TPU Matte @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU Matte @BBL P1P.json index c5648fb898..a058c9b86d 100644 --- a/resources/profiles/BBL/filament/BETA/BETA TPU Matte @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU Matte @BBL P1P.json @@ -3,7 +3,7 @@ "name": "BETA TPU Matte @BBL P1P", "inherits": "BETA TPU Matte @base", "from": "system", - "setting_id": "BTUB01_01", + "setting_id": "yyZ2UYGXe34MM1VO", "instantiation": "true", "filament_max_volumetric_speed": [ "2.8", diff --git a/resources/profiles/BBL/filament/BETA/BETA TPU Matte @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU Matte @BBL X1C.json similarity index 98% rename from resources/profiles/BBL/filament/BETA/BETA TPU Matte @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU Matte @BBL X1C.json index 046660b063..af019a9c89 100644 --- a/resources/profiles/BBL/filament/BETA/BETA TPU Matte @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BBL/BETA TPU Matte @BBL X1C.json @@ -3,7 +3,7 @@ "name": "BETA TPU Matte @BBL X1C", "inherits": "BETA TPU Matte @base", "from": "system", - "setting_id": "BTUB01_00", + "setting_id": "LmABGlfUSMLmezJw", "instantiation": "true", "filament_max_volumetric_speed": [ "2.8", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA ABS @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA ABS @base.json new file mode 100644 index 0000000000..848f3eacfc --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA ABS @base.json @@ -0,0 +1,93 @@ +{ + "type": "filament", + "name": "BETA ABS @base", + "inherits": "fdm_filament_abs", + "from": "system", + "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": [ + "24.99" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_vendor": [ + "BETA" + ], + "impact_strength_z": [ + "7.4" + ], + "activate_air_filtration": [ + "1" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "eng_plate_temp": [ + "90" + ], + "eng_plate_temp_initial_layer": [ + "90" + ], + "filament_max_volumetric_speed": [ + "28.6" + ], + "hot_plate_temp": [ + "90" + ], + "hot_plate_temp_initial_layer": [ + "90" + ], + "nozzle_temperature": [ + "270" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "temperature_vitrification": [ + "100" + ], + "textured_plate_temp": [ + "90" + ], + "textured_plate_temp_initial_layer": [ + "90" + ], + "filament_start_gcode": [ + "; Filament gcode\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "200" + ], + "filament_dev_ams_drying_time": [ + "12", + "8.0", + "12", + "8.0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "90" + ], + "filament_dev_drying_cooling_temperature": [ + "75" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "80", + "65", + "75" + ], + "filament_dev_drying_softening_temperature": [ + "80" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA ASA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA ASA @base.json similarity index 52% rename from resources/profiles/BBL/filament/BETA/BETA ASA @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA ASA @base.json index a525f16bb1..38e260bf89 100644 --- a/resources/profiles/BBL/filament/BETA/BETA ASA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA ASA @base.json @@ -53,5 +53,53 @@ ], "textured_plate_temp_initial_layer": [ "100" + ], + "activate_air_filtration": [ + "1" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "temperature_vitrification": [ + "100" + ], + "filament_start_gcode": [ + "; Filament gcode\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "200" + ], + "filament_dev_ams_drying_time": [ + "12", + "8.0", + "12", + "8.0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "100" + ], + "filament_dev_drying_cooling_temperature": [ + "85" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "80", + "65", + "80" + ], + "filament_dev_drying_softening_temperature": [ + "85" ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA HIPS @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA HIPS @base.json new file mode 100644 index 0000000000..1a228ea989 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA HIPS @base.json @@ -0,0 +1,56 @@ +{ + "type": "filament", + "name": "BETA HIPS @base", + "inherits": "fdm_filament_hips", + "from": "system", + "filament_id": "OFlmxlDG", + "instantiation": "false", + "filament_is_support": [ + "1" + ], + "filament_vendor": [ + "BETA" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "filament_start_gcode": [ + "; Filament gcode\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "798" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "90" + ], + "filament_dev_drying_cooling_temperature": [ + "75" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "80", + "65", + "75" + ], + "filament_dev_drying_softening_temperature": [ + "80" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PAHT-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PAHT-CF @base.json new file mode 100644 index 0000000000..a0df70918d --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PAHT-CF @base.json @@ -0,0 +1,102 @@ +{ + "type": "filament", + "name": "BETA PAHT-CF @base", + "inherits": "fdm_filament_pa", + "from": "system", + "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": [ + "5" + ], + "fan_max_speed": [ + "30" + ], + "fan_min_speed": [ + "10" + ], + "filament_cost": [ + "94.99" + ], + "filament_density": [ + "1.06" + ], + "filament_flow_ratio": [ + "0.96" + ], + "filament_type": [ + "PA-CF" + ], + "filament_vendor": [ + "BETA" + ], + "full_fan_speed_layer": [ + "2" + ], + "impact_strength_z": [ + "13.3" + ], + "overhang_fan_speed": [ + "40" + ], + "overhang_fan_threshold": [ + "0%" + ], + "temperature_vitrification": [ + "180" + ], + "activate_air_filtration": [ + "1" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "nozzle_temperature": [ + "290" + ], + "nozzle_temperature_initial_layer": [ + "290" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "filament_start_gcode": [ + "; Filament gcode\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "400" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_time": [ + "18" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "165" + ], + "filament_dev_drying_cooling_temperature": [ + "150" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "85", + "65", + "85" + ], + "filament_dev_drying_softening_temperature": [ + "150" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PEBA 90A @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PEBA 90A @base.json new file mode 100644 index 0000000000..62a0db7d3c --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PEBA 90A @base.json @@ -0,0 +1,75 @@ +{ + "type": "filament", + "name": "BETA PEBA 90A @base", + "inherits": "fdm_filament_tpu", + "from": "system", + "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": [ + "59.99" + ], + "filament_max_volumetric_speed": [ + "2.8" + ], + "filament_vendor": [ + "BETA" + ], + "impact_strength_z": [ + "87.3" + ], + "nozzle_temperature": [ + "225" + ], + "nozzle_temperature_initial_layer": [ + "225" + ], + "nozzle_temperature_range_high": [ + "240" + ], + "slow_down_layer_time": [ + "14" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >30)||(bed_temperature_initial_layer[current_extruder] >30)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "600" + ], + "filament_dev_ams_drying_time": [ + "12", + "18", + "12", + "18" + ], + "filament_dev_chamber_drying_time": [ + "16" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "40" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "75", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG @base.json similarity index 72% rename from resources/profiles/BBL/filament/BETA/BETA PETG @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG @base.json index 07a25f9233..9acad81c21 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG @base.json @@ -92,5 +92,48 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "300" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "80" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "75" + ], + "filament_dev_drying_cooling_temperature": [ + "55" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "65", + "55", + "55" + ], + "filament_dev_drying_softening_temperature": [ + "60" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG Fluorescence @base.json similarity index 72% rename from resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG Fluorescence @base.json index b79699b9fc..963100be12 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Fluorescence @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG Fluorescence @base.json @@ -92,5 +92,48 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "300" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "80" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "75" + ], + "filament_dev_drying_cooling_temperature": [ + "55" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "65", + "55", + "55" + ], + "filament_dev_drying_softening_temperature": [ + "60" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Glitter @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG Glitter @base.json similarity index 72% rename from resources/profiles/BBL/filament/BETA/BETA PETG Glitter @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG Glitter @base.json index c6b7b96de5..0137072894 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Glitter @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG Glitter @base.json @@ -92,5 +92,48 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "300" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "80" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "75" + ], + "filament_dev_drying_cooling_temperature": [ + "55" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "65", + "55", + "55" + ], + "filament_dev_drying_softening_temperature": [ + "60" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Glow @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG Glow @base.json similarity index 72% rename from resources/profiles/BBL/filament/BETA/BETA PETG Glow @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG Glow @base.json index 30c8cc2783..2765d13a52 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Glow @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG Glow @base.json @@ -92,5 +92,48 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "300" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "80" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "75" + ], + "filament_dev_drying_cooling_temperature": [ + "55" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "65", + "55", + "55" + ], + "filament_dev_drying_softening_temperature": [ + "60" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Gradient @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG Gradient @base.json similarity index 72% rename from resources/profiles/BBL/filament/BETA/BETA PETG Gradient @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG Gradient @base.json index cff77a0d6c..4e30a572bc 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Gradient @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG Gradient @base.json @@ -92,5 +92,48 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "300" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "80" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "75" + ], + "filament_dev_drying_cooling_temperature": [ + "55" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "65", + "55", + "55" + ], + "filament_dev_drying_softening_temperature": [ + "60" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG HF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG HF @base.json similarity index 69% rename from resources/profiles/BBL/filament/BETA/BETA PETG HF @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG HF @base.json index b7aa43b6b5..233a35897a 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG HF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG HF @base.json @@ -85,5 +85,48 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "300" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "80" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "75" + ], + "filament_dev_drying_cooling_temperature": [ + "55" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "65", + "55", + "55" + ], + "filament_dev_drying_softening_temperature": [ + "60" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG Heat Color Change @base.json similarity index 72% rename from resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG Heat Color Change @base.json index 254cf9e4c1..bae2307535 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Heat Color Change @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG Heat Color Change @base.json @@ -92,5 +92,48 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "300" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "80" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "75" + ], + "filament_dev_drying_cooling_temperature": [ + "55" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "65", + "55", + "55" + ], + "filament_dev_drying_softening_temperature": [ + "60" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Marble @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG Marble @base.json similarity index 72% rename from resources/profiles/BBL/filament/BETA/BETA PETG Marble @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG Marble @base.json index 335a3f59b2..a8c63f5eec 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Marble @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG Marble @base.json @@ -92,5 +92,48 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "300" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "80" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "75" + ], + "filament_dev_drying_cooling_temperature": [ + "55" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "65", + "55", + "55" + ], + "filament_dev_drying_softening_temperature": [ + "60" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Matte @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG Matte @base.json similarity index 72% rename from resources/profiles/BBL/filament/BETA/BETA PETG Matte @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG Matte @base.json index 52a838f323..4b26213bc7 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Matte @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG Matte @base.json @@ -92,5 +92,48 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "300" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "80" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "75" + ], + "filament_dev_drying_cooling_temperature": [ + "55" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "65", + "55", + "55" + ], + "filament_dev_drying_softening_temperature": [ + "60" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Metallic @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG Metallic @base.json similarity index 72% rename from resources/profiles/BBL/filament/BETA/BETA PETG Metallic @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG Metallic @base.json index 9c276bcf4d..fad379b99b 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Metallic @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG Metallic @base.json @@ -92,5 +92,48 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "300" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "80" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "75" + ], + "filament_dev_drying_cooling_temperature": [ + "55" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "65", + "55", + "55" + ], + "filament_dev_drying_softening_temperature": [ + "60" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG Transparent @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG Transparent @base.json similarity index 70% rename from resources/profiles/BBL/filament/BETA/BETA PETG Transparent @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG Transparent @base.json index 781d69af3a..63278e852e 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG Transparent @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG Transparent @base.json @@ -80,5 +80,48 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "300" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "80" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "75" + ], + "filament_dev_drying_cooling_temperature": [ + "55" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "65", + "55", + "55" + ], + "filament_dev_drying_softening_temperature": [ + "60" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG UV Color Change @base.json similarity index 72% rename from resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG UV Color Change @base.json index 42fa3bd62b..524c425437 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG UV Color Change @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG UV Color Change @base.json @@ -92,5 +92,48 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "300" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "80" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "75" + ], + "filament_dev_drying_cooling_temperature": [ + "55" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "65", + "55", + "55" + ], + "filament_dev_drying_softening_temperature": [ + "60" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG-CF @base.json similarity index 68% rename from resources/profiles/BBL/filament/BETA/BETA PETG-CF @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG-CF @base.json index 8e3514f0ad..cde1782bbd 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG-CF @base.json @@ -79,5 +79,48 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "300" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "80" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "75" + ], + "filament_dev_drying_cooling_temperature": [ + "55" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "65", + "55", + "55" + ], + "filament_dev_drying_softening_temperature": [ + "60" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PETG-GF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG-GF @base.json similarity index 68% rename from resources/profiles/BBL/filament/BETA/BETA PETG-GF @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG-GF @base.json index d530f7a1d7..39dc650e7a 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PETG-GF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PETG-GF @base.json @@ -79,5 +79,48 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "300" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "80" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "75" + ], + "filament_dev_drying_cooling_temperature": [ + "55" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "65", + "55", + "55" + ], + "filament_dev_drying_softening_temperature": [ + "60" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Basic @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Basic @base.json similarity index 61% rename from resources/profiles/BBL/filament/BETA/BETA PLA Basic @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Basic @base.json index 429ecceda1..58375bd9c2 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Basic @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Basic @base.json @@ -44,5 +44,51 @@ "compatible_printers": [], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Chameleon @base.json similarity index 54% rename from resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Chameleon @base.json index 5054237514..c26be0fa57 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Chameleon @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Chameleon @base.json @@ -22,5 +22,51 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Fluorescence @base.json similarity index 54% rename from resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Fluorescence @base.json index d9198287aa..0e928aaf25 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Fluorescence @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Fluorescence @base.json @@ -22,5 +22,51 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Glitter @base.json similarity index 54% rename from resources/profiles/BBL/filament/BETA/BETA PLA Glitter @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Glitter @base.json index 545a34dd92..4cfe7043d4 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Glitter @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Glitter @base.json @@ -22,5 +22,51 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Glow @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Glow @base.json similarity index 56% rename from resources/profiles/BBL/filament/BETA/BETA PLA Glow @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Glow @base.json index 6be0a9da33..4381b12aab 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Glow @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Glow @base.json @@ -28,5 +28,51 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Gradient @base.json similarity index 54% rename from resources/profiles/BBL/filament/BETA/BETA PLA Gradient @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Gradient @base.json index 9609ff08d3..b5cad1fec6 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Gradient @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Gradient @base.json @@ -22,5 +22,51 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Heat Color Change @base.json similarity index 54% rename from resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Heat Color Change @base.json index 958b999d91..4d60266708 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Heat Color Change @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Heat Color Change @base.json @@ -22,5 +22,51 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA High Speed @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA High Speed @base.json new file mode 100644 index 0000000000..39ec3bd0d1 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA High Speed @base.json @@ -0,0 +1,69 @@ +{ + "type": "filament", + "name": "BETA PLA High Speed @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "OF3PDEw3", + "instantiation": "false", + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "18" + ], + "slow_down_layer_time": [ + "8" + ], + "filament_vendor": [ + "BETA" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ] +} diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA High Temp @base.json similarity index 62% rename from resources/profiles/BBL/filament/BETA/BETA PLA High Temp @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA High Temp @base.json index d900b28794..539f71ed33 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA High Temp @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA High Temp @base.json @@ -35,5 +35,51 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Marble @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Marble @base.json similarity index 54% rename from resources/profiles/BBL/filament/BETA/BETA PLA Marble @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Marble @base.json index a472446d9a..4c1016d11f 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Marble @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Marble @base.json @@ -22,5 +22,51 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Matte @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Matte @base.json similarity index 58% rename from resources/profiles/BBL/filament/BETA/BETA PLA Matte @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Matte @base.json index 32bd79b43b..74e742ddf9 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Matte @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Matte @base.json @@ -34,5 +34,51 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Metal @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Metal @base.json similarity index 59% rename from resources/profiles/BBL/filament/BETA/BETA PLA Metal @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Metal @base.json index 607e20fa4e..e2c18cb190 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Metal @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Metal @base.json @@ -26,5 +26,51 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Metallic @base.json similarity index 59% rename from resources/profiles/BBL/filament/BETA/BETA PLA Metallic @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Metallic @base.json index c03bc0a8c7..0ca2cdde44 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Metallic @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Metallic @base.json @@ -26,5 +26,51 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA PRO @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA PRO @base.json similarity index 61% rename from resources/profiles/BBL/filament/BETA/BETA PLA PRO @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA PRO @base.json index 6938382062..af4fc215f1 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA PRO @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA PRO @base.json @@ -44,5 +44,51 @@ "compatible_printers": [], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Silk @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Silk @base.json similarity index 63% rename from resources/profiles/BBL/filament/BETA/BETA PLA Silk @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Silk @base.json index a0c61acd51..c343d78794 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Silk @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Silk @base.json @@ -41,5 +41,51 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Silk+ @base.json similarity index 62% rename from resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Silk+ @base.json index 0bedc9186a..45485dfd0b 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Silk+ @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Silk+ @base.json @@ -35,5 +35,51 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Transparent @base.json similarity index 54% rename from resources/profiles/BBL/filament/BETA/BETA PLA Transparent @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Transparent @base.json index be62c10734..12a3538c6e 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Transparent @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Transparent @base.json @@ -22,5 +22,51 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA UV Color Change @base.json similarity index 57% rename from resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA UV Color Change @base.json index d95a0d8411..dbb8a8d0c4 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA UV Color Change @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA UV Color Change @base.json @@ -28,5 +28,51 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Wood @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Wood @base.json similarity index 59% rename from resources/profiles/BBL/filament/BETA/BETA PLA Wood @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Wood @base.json index c5eeae9995..fb2b544375 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Wood @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Wood @base.json @@ -34,5 +34,51 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\nM142 P1 R35 S40\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA Youth @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Youth @base.json similarity index 58% rename from resources/profiles/BBL/filament/BETA/BETA PLA Youth @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Youth @base.json index 5fa118d566..dbc749d229 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA Youth @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA Youth @base.json @@ -34,5 +34,51 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" ] } diff --git a/resources/profiles/BBL/filament/BETA/BETA PLA-CF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA-CF @base.json similarity index 63% rename from resources/profiles/BBL/filament/BETA/BETA PLA-CF @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA-CF @base.json index f0f632adfa..08c441b7ac 100644 --- a/resources/profiles/BBL/filament/BETA/BETA PLA-CF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA PLA-CF @base.json @@ -52,5 +52,51 @@ ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA TPU 90A @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA TPU 90A @base.json new file mode 100644 index 0000000000..106ef8b7f6 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA TPU 90A @base.json @@ -0,0 +1,75 @@ +{ + "type": "filament", + "name": "BETA TPU 90A @base", + "inherits": "fdm_filament_tpu", + "from": "system", + "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": [ + "59.99" + ], + "filament_max_volumetric_speed": [ + "2.8" + ], + "filament_vendor": [ + "BETA" + ], + "impact_strength_z": [ + "87.3" + ], + "nozzle_temperature": [ + "225" + ], + "nozzle_temperature_initial_layer": [ + "225" + ], + "nozzle_temperature_range_high": [ + "240" + ], + "slow_down_layer_time": [ + "14" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >30)||(bed_temperature_initial_layer[current_extruder] >30)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "600" + ], + "filament_dev_ams_drying_time": [ + "12", + "18", + "12", + "18" + ], + "filament_dev_chamber_drying_time": [ + "16" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "40" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "75", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA TPU 95A @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA TPU 95A @base.json new file mode 100644 index 0000000000..912d748d4c --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA TPU 95A @base.json @@ -0,0 +1,72 @@ +{ + "type": "filament", + "name": "BETA TPU 95A @base", + "inherits": "fdm_filament_tpu", + "from": "system", + "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": [ + "41.99" + ], + "filament_density": [ + "1.22" + ], + "filament_vendor": [ + "BETA" + ], + "impact_strength_z": [ + "88.7" + ], + "nozzle_temperature": [ + "230" + ], + "nozzle_temperature_initial_layer": [ + "230" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >30)||(bed_temperature_initial_layer[current_extruder] >30)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "600" + ], + "filament_dev_ams_drying_time": [ + "12", + "18", + "12", + "18" + ], + "filament_dev_chamber_drying_time": [ + "16" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "40" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "75", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA TPU 98A @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA TPU 98A @base.json new file mode 100644 index 0000000000..13192a41f0 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA TPU 98A @base.json @@ -0,0 +1,72 @@ +{ + "type": "filament", + "name": "BETA TPU 98A @base", + "inherits": "fdm_filament_tpu", + "from": "system", + "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": [ + "41.99" + ], + "filament_density": [ + "1.22" + ], + "filament_vendor": [ + "BETA" + ], + "impact_strength_z": [ + "88.7" + ], + "nozzle_temperature": [ + "230" + ], + "nozzle_temperature_initial_layer": [ + "230" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >30)||(bed_temperature_initial_layer[current_extruder] >30)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "600" + ], + "filament_dev_ams_drying_time": [ + "12", + "18", + "12", + "18" + ], + "filament_dev_chamber_drying_time": [ + "16" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "40" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "75", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA TPU Matte @base.json b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA TPU Matte @base.json new file mode 100644 index 0000000000..4b27f0abf7 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/BETA/BETA TPU Matte @base.json @@ -0,0 +1,75 @@ +{ + "type": "filament", + "name": "BETA TPU Matte @base", + "inherits": "fdm_filament_tpu", + "from": "system", + "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": [ + "59.99" + ], + "filament_max_volumetric_speed": [ + "2.8" + ], + "filament_vendor": [ + "BETA" + ], + "impact_strength_z": [ + "87.3" + ], + "nozzle_temperature": [ + "225" + ], + "nozzle_temperature_initial_layer": [ + "225" + ], + "nozzle_temperature_range_high": [ + "240" + ], + "slow_down_layer_time": [ + "14" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >30)||(bed_temperature_initial_layer[current_extruder] >30)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "600" + ], + "filament_dev_ams_drying_time": [ + "12", + "18", + "12", + "18" + ], + "filament_dev_chamber_drying_time": [ + "16" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "40" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "75", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ] +} diff --git a/resources/profiles/BBL/filament/COEX/COEX ABS @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ABS @BBL X1 0.2 nozzle.json similarity index 90% rename from resources/profiles/BBL/filament/COEX/COEX ABS @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ABS @BBL X1 0.2 nozzle.json index 6622dad899..0ca53101a7 100644 --- a/resources/profiles/BBL/filament/COEX/COEX ABS @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ABS @BBL X1 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX ABS @BBL X1 0.2 nozzle", "inherits": "COEX ABS @base", "from": "system", - "setting_id": "CXABSB01_02", + "setting_id": "RG1oJ6nUUar2xjeP", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/COEX/COEX ABS @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ABS @BBL X1.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX ABS @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ABS @BBL X1.json index 7b10388861..441ac96720 100644 --- a/resources/profiles/BBL/filament/COEX/COEX ABS @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ABS @BBL X1.json @@ -3,7 +3,7 @@ "name": "COEX ABS @BBL X1", "inherits": "COEX ABS @base", "from": "system", - "setting_id": "CXABSB01_03", + "setting_id": "EYfQzF9Xb2lvPs9b", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX ABS @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ABS @BBL X1C 0.2 nozzle.json similarity index 92% rename from resources/profiles/BBL/filament/COEX/COEX ABS @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ABS @BBL X1C 0.2 nozzle.json index 095cdc7364..905c4f009f 100644 --- a/resources/profiles/BBL/filament/COEX/COEX ABS @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ABS @BBL X1C 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX ABS @BBL X1C 0.2 nozzle", "inherits": "COEX ABS @base", "from": "system", - "setting_id": "CXABSB01_04", + "setting_id": "WBC8PkLBCiT1VnCz", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX ABS @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ABS @BBL X1C.json similarity index 94% rename from resources/profiles/BBL/filament/COEX/COEX ABS @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ABS @BBL X1C.json index f3b31bf01a..e5c818ddcd 100644 --- a/resources/profiles/BBL/filament/COEX/COEX ABS @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ABS @BBL X1C.json @@ -3,7 +3,7 @@ "name": "COEX ABS @BBL X1C", "inherits": "COEX ABS @base", "from": "system", - "setting_id": "CXABSB01_01", + "setting_id": "AwuhtCWlU5uzCk7j", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX ABS PRIME @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ABS PRIME @BBL X1 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX ABS PRIME @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ABS PRIME @BBL X1 0.2 nozzle.json index 148aac0fe0..4c8947bc26 100644 --- a/resources/profiles/BBL/filament/COEX/COEX ABS PRIME @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ABS PRIME @BBL X1 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX ABS PRIME @BBL X1 0.2 nozzle", "inherits": "COEX ABS PRIME @base", "from": "system", - "setting_id": "CXABPB09_02", + "setting_id": "nWGYzlOGc2WsoIdU", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/COEX/COEX ABS PRIME @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ABS PRIME @BBL X1.json similarity index 92% rename from resources/profiles/BBL/filament/COEX/COEX ABS PRIME @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ABS PRIME @BBL X1.json index f118e9e390..74f3595357 100644 --- a/resources/profiles/BBL/filament/COEX/COEX ABS PRIME @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ABS PRIME @BBL X1.json @@ -3,7 +3,7 @@ "name": "COEX ABS PRIME @BBL X1", "inherits": "COEX ABS PRIME @base", "from": "system", - "setting_id": "CXABPB09_03", + "setting_id": "N5mryBHDklwUbPkx", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX ABS PRIME @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ABS PRIME @BBL X1C 0.2 nozzle.json similarity index 92% rename from resources/profiles/BBL/filament/COEX/COEX ABS PRIME @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ABS PRIME @BBL X1C 0.2 nozzle.json index 6bfcf676fb..46363dcc07 100644 --- a/resources/profiles/BBL/filament/COEX/COEX ABS PRIME @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ABS PRIME @BBL X1C 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX ABS PRIME @BBL X1C 0.2 nozzle", "inherits": "COEX ABS PRIME @base", "from": "system", - "setting_id": "CXABPB09_04", + "setting_id": "xj7D5OzJSN6e8oJW", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX ABS PRIME @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ABS PRIME @BBL X1C.json similarity index 94% rename from resources/profiles/BBL/filament/COEX/COEX ABS PRIME @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ABS PRIME @BBL X1C.json index 45144ae3fe..7a18a3c848 100644 --- a/resources/profiles/BBL/filament/COEX/COEX ABS PRIME @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ABS PRIME @BBL X1C.json @@ -3,7 +3,7 @@ "name": "COEX ABS PRIME @BBL X1C", "inherits": "COEX ABS PRIME @base", "from": "system", - "setting_id": "CXABPB09_01", + "setting_id": "k9NyXpycDZJAnFLF", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX ASA PRIME @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ASA PRIME @BBL X1 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX ASA PRIME @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ASA PRIME @BBL X1 0.2 nozzle.json index e690412a58..b1e0f04377 100644 --- a/resources/profiles/BBL/filament/COEX/COEX ASA PRIME @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ASA PRIME @BBL X1 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX ASA PRIME @BBL X1 0.2 nozzle", "inherits": "COEX ASA PRIME @base", "from": "system", - "setting_id": "CXASAB04_01", + "setting_id": "tuxYV5K2a9arndZ0", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/COEX/COEX ASA PRIME @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ASA PRIME @BBL X1.json similarity index 92% rename from resources/profiles/BBL/filament/COEX/COEX ASA PRIME @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ASA PRIME @BBL X1.json index dcc177b1ed..a8e4357478 100644 --- a/resources/profiles/BBL/filament/COEX/COEX ASA PRIME @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ASA PRIME @BBL X1.json @@ -3,7 +3,7 @@ "name": "COEX ASA PRIME @BBL X1", "inherits": "COEX ASA PRIME @base", "from": "system", - "setting_id": "CXASAB04_02", + "setting_id": "o8hJqPQWAuJXxwxd", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX ASA PRIME @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ASA PRIME @BBL X1C 0.2 nozzle.json similarity index 92% rename from resources/profiles/BBL/filament/COEX/COEX ASA PRIME @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ASA PRIME @BBL X1C 0.2 nozzle.json index 7067bf1b1e..d084c99750 100644 --- a/resources/profiles/BBL/filament/COEX/COEX ASA PRIME @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ASA PRIME @BBL X1C 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX ASA PRIME @BBL X1C 0.2 nozzle", "inherits": "COEX ASA PRIME @base", "from": "system", - "setting_id": "CXASAB04_03", + "setting_id": "tjT134m6lHPjh5YH", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX ASA PRIME @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ASA PRIME @BBL X1C.json similarity index 94% rename from resources/profiles/BBL/filament/COEX/COEX ASA PRIME @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ASA PRIME @BBL X1C.json index 224a6279d6..70e90f269d 100644 --- a/resources/profiles/BBL/filament/COEX/COEX ASA PRIME @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX ASA PRIME @BBL X1C.json @@ -3,7 +3,7 @@ "name": "COEX ASA PRIME @BBL X1C", "inherits": "COEX ASA PRIME @base", "from": "system", - "setting_id": "CXASAB04_04", + "setting_id": "fPFt2sY4junWyKad", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX NYLEX PA6-CF @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX NYLEX PA6-CF @BBL X1C.json similarity index 93% rename from resources/profiles/BBL/filament/COEX/COEX NYLEX PA6-CF @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX NYLEX PA6-CF @BBL X1C.json index d050a1f5a6..f3512373f5 100644 --- a/resources/profiles/BBL/filament/COEX/COEX NYLEX PA6-CF @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX NYLEX PA6-CF @BBL X1C.json @@ -3,7 +3,7 @@ "name": "COEX NYLEX PA6-CF @BBL X1C", "inherits": "COEX NYLEX PA6-CF @base", "from": "system", - "setting_id": "CXPACB23_01", + "setting_id": "fI5xYLWT4SAU5igp", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1S 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX NYLEX UNFILLED @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX NYLEX UNFILLED @BBL X1C.json similarity index 95% rename from resources/profiles/BBL/filament/COEX/COEX NYLEX UNFILLED @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX NYLEX UNFILLED @BBL X1C.json index 082948c7ec..d59aa48ae6 100644 --- a/resources/profiles/BBL/filament/COEX/COEX NYLEX UNFILLED @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX NYLEX UNFILLED @BBL X1C.json @@ -4,7 +4,7 @@ "renamed_from": "COEX NYLEX UNFILLED @BBL X1C", "inherits": "COEX NYLEX UNFILLED @base", "from": "system", - "setting_id": "CXPAUB21_01", + "setting_id": "rN4kjoJDWnro8SAu", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX PCTG PRIME @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PCTG PRIME @BBL A1 0.2 nozzle.json similarity index 89% rename from resources/profiles/BBL/filament/COEX/COEX PCTG PRIME @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PCTG PRIME @BBL A1 0.2 nozzle.json index 2800d37b1c..5f4fcb6089 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PCTG PRIME @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PCTG PRIME @BBL A1 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX PCTG PRIME @BBL A1 0.2 nozzle", "inherits": "COEX PCTG PRIME @base", "from": "system", - "setting_id": "CXPCTX09", + "setting_id": "tuTktXuFMxhD5bdZ", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/BBL/filament/COEX/COEX PCTG PRIME @BBL A1 0.8 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PCTG PRIME @BBL A1 0.8 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX PCTG PRIME @BBL A1 0.8 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PCTG PRIME @BBL A1 0.8 nozzle.json index 441aa2cd9d..0b9bae9252 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PCTG PRIME @BBL A1 0.8 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PCTG PRIME @BBL A1 0.8 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX PCTG PRIME @BBL A1 0.8 nozzle", "inherits": "COEX PCTG PRIME @base", "from": "system", - "setting_id": "CXPCTX08", + "setting_id": "egEOiFlnbvmEKvNk", "instantiation": "true", "fan_max_speed": [ "60" diff --git a/resources/profiles/BBL/filament/COEX/COEX PCTG PRIME @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PCTG PRIME @BBL A1.json similarity index 89% rename from resources/profiles/BBL/filament/COEX/COEX PCTG PRIME @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PCTG PRIME @BBL A1.json index c681c2e87e..102bcf8b74 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PCTG PRIME @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PCTG PRIME @BBL A1.json @@ -3,7 +3,7 @@ "name": "COEX PCTG PRIME @BBL A1", "inherits": "COEX PCTG PRIME @base", "from": "system", - "setting_id": "CXPCTX07", + "setting_id": "IveIh521d1zM1sbg", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/BBL/filament/COEX/COEX PCTG PRIME @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PCTG PRIME @BBL A1M 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX PCTG PRIME @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PCTG PRIME @BBL A1M 0.2 nozzle.json index b7cc4c4aa5..f93c4fbad6 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PCTG PRIME @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PCTG PRIME @BBL A1M 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX PCTG PRIME @BBL A1M 0.2 nozzle", "inherits": "COEX PCTG PRIME @BBL X1C 0.2 nozzle", "from": "system", - "setting_id": "CXPCTX06", + "setting_id": "xDQWVr6jZyb8JU9q", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/BBL/filament/COEX/COEX PCTG PRIME @BBL A1M 0.8 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PCTG PRIME @BBL A1M 0.8 nozzle.json similarity index 92% rename from resources/profiles/BBL/filament/COEX/COEX PCTG PRIME @BBL A1M 0.8 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PCTG PRIME @BBL A1M 0.8 nozzle.json index e84ab8f469..d7860ae235 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PCTG PRIME @BBL A1M 0.8 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PCTG PRIME @BBL A1M 0.8 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX PCTG PRIME @BBL A1M 0.8 nozzle", "inherits": "COEX PCTG PRIME @BBL X1C 0.8 nozzle", "from": "system", - "setting_id": "CXPCTX05", + "setting_id": "Tf3V4GVy9idlbJWz", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/BBL/filament/COEX/COEX PCTG PRIME @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PCTG PRIME @BBL A1M.json similarity index 92% rename from resources/profiles/BBL/filament/COEX/COEX PCTG PRIME @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PCTG PRIME @BBL A1M.json index 34370de8d3..c4f1bd6e88 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PCTG PRIME @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PCTG PRIME @BBL A1M.json @@ -3,7 +3,7 @@ "name": "COEX PCTG PRIME @BBL A1M 0.4 nozzle", "inherits": "COEX PCTG PRIME @BBL X1C", "from": "system", - "setting_id": "CXPCTX04", + "setting_id": "6VkUjoEkwOlOuhXW", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/BBL/filament/COEX/COEX PCTG PRIME @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PCTG PRIME @BBL X1C 0.2 nozzle.json similarity index 93% rename from resources/profiles/BBL/filament/COEX/COEX PCTG PRIME @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PCTG PRIME @BBL X1C 0.2 nozzle.json index 55a4c8af53..a754286541 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PCTG PRIME @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PCTG PRIME @BBL X1C 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX PCTG PRIME @BBL X1C 0.2 nozzle", "inherits": "COEX PCTG PRIME @base", "from": "system", - "setting_id": "CXPCTX03", + "setting_id": "OvCsASrQYGNbptJL", "instantiation": "true", "filament_max_volumetric_speed": [ "6" diff --git a/resources/profiles/BBL/filament/COEX/COEX PCTG PRIME @BBL X1C 0.8 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PCTG PRIME @BBL X1C 0.8 nozzle.json similarity index 95% rename from resources/profiles/BBL/filament/COEX/COEX PCTG PRIME @BBL X1C 0.8 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PCTG PRIME @BBL X1C 0.8 nozzle.json index 90fd488cd8..e861ff5845 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PCTG PRIME @BBL X1C 0.8 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PCTG PRIME @BBL X1C 0.8 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX PCTG PRIME @BBL X1C 0.8 nozzle", "inherits": "COEX PCTG PRIME @base", "from": "system", - "setting_id": "CXPCTX02", + "setting_id": "m7SNC69mm4Mq16z2", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/BBL/filament/COEX/COEX PCTG PRIME @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PCTG PRIME @BBL X1C.json similarity index 93% rename from resources/profiles/BBL/filament/COEX/COEX PCTG PRIME @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PCTG PRIME @BBL X1C.json index 2a3f276d56..a55e5a7ffd 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PCTG PRIME @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PCTG PRIME @BBL X1C.json @@ -3,7 +3,7 @@ "name": "COEX PCTG PRIME @BBL X1C", "inherits": "COEX PCTG PRIME @base", "from": "system", - "setting_id": "CXPCTX01", + "setting_id": "MGJHFaQHCW5nyY7g", "instantiation": "true", "filament_max_volumetric_speed": [ "14" diff --git a/resources/profiles/BBL/filament/COEX/COEX PETG @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PETG @BBL A1 0.2 nozzle.json similarity index 89% rename from resources/profiles/BBL/filament/COEX/COEX PETG @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PETG @BBL A1 0.2 nozzle.json index e284f3cb97..756913dc00 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PETG @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PETG @BBL A1 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX PETG @BBL A1 0.2 nozzle", "inherits": "COEX PETG @base", "from": "system", - "setting_id": "CXPETX09", + "setting_id": "eW0lME1PpSiCQ50o", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/BBL/filament/COEX/COEX PETG @BBL A1 0.8 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PETG @BBL A1 0.8 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX PETG @BBL A1 0.8 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PETG @BBL A1 0.8 nozzle.json index 1053447fff..1022e84e8e 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PETG @BBL A1 0.8 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PETG @BBL A1 0.8 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX PETG @BBL A1 0.8 nozzle", "inherits": "COEX PETG @base", "from": "system", - "setting_id": "CXPETX08", + "setting_id": "b1N9FDhZ9LDZCXbr", "instantiation": "true", "fan_max_speed": [ "60" diff --git a/resources/profiles/BBL/filament/COEX/COEX PETG @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PETG @BBL A1.json similarity index 88% rename from resources/profiles/BBL/filament/COEX/COEX PETG @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PETG @BBL A1.json index ded2bf0454..3ff688a34f 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PETG @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PETG @BBL A1.json @@ -3,7 +3,7 @@ "name": "COEX PETG @BBL A1", "inherits": "COEX PETG @base", "from": "system", - "setting_id": "CXPETX07", + "setting_id": "QdBlIRA64gjVhmdY", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/BBL/filament/COEX/COEX PETG @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PETG @BBL A1M 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX PETG @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PETG @BBL A1M 0.2 nozzle.json index c403e2d70e..a3c1395672 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PETG @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PETG @BBL A1M 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX PETG @BBL A1M 0.2 nozzle", "inherits": "COEX PETG @BBL X1C 0.2 nozzle", "from": "system", - "setting_id": "CXPETX06", + "setting_id": "wzg15HcFnr57D3WG", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/BBL/filament/COEX/COEX PETG @BBL A1M 0.8 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PETG @BBL A1M 0.8 nozzle.json similarity index 92% rename from resources/profiles/BBL/filament/COEX/COEX PETG @BBL A1M 0.8 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PETG @BBL A1M 0.8 nozzle.json index 300c25172f..adf18f203d 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PETG @BBL A1M 0.8 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PETG @BBL A1M 0.8 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX PETG @BBL A1M 0.8 nozzle", "inherits": "COEX PETG @BBL X1C 0.8 nozzle", "from": "system", - "setting_id": "CXPETX05", + "setting_id": "QybtmiPJpTywWVRY", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/BBL/filament/COEX/COEX PETG @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PETG @BBL A1M.json similarity index 92% rename from resources/profiles/BBL/filament/COEX/COEX PETG @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PETG @BBL A1M.json index 1b36cc42a3..f1f2305f34 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PETG @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PETG @BBL A1M.json @@ -3,7 +3,7 @@ "name": "COEX PETG @BBL A1M 0.4 nozzle", "inherits": "COEX PETG @BBL X1C", "from": "system", - "setting_id": "CXPETX04", + "setting_id": "OVVZwYafB1y5Mo0H", "instantiation": "true", "filament_flow_ratio": [ "0.94" diff --git a/resources/profiles/BBL/filament/COEX/COEX PETG @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PETG @BBL X1C 0.2 nozzle.json similarity index 93% rename from resources/profiles/BBL/filament/COEX/COEX PETG @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PETG @BBL X1C 0.2 nozzle.json index ad9623ef99..d3a112550f 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PETG @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PETG @BBL X1C 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX PETG @BBL X1C 0.2 nozzle", "inherits": "COEX PETG @base", "from": "system", - "setting_id": "CXPETX03", + "setting_id": "okr5VvLy0gPTcU2m", "instantiation": "true", "filament_max_volumetric_speed": [ "6" diff --git a/resources/profiles/BBL/filament/COEX/COEX PETG @BBL X1C 0.8 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PETG @BBL X1C 0.8 nozzle.json similarity index 95% rename from resources/profiles/BBL/filament/COEX/COEX PETG @BBL X1C 0.8 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PETG @BBL X1C 0.8 nozzle.json index ebc5c1f82c..36e1ed91c6 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PETG @BBL X1C 0.8 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PETG @BBL X1C 0.8 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX PETG @BBL X1C 0.8 nozzle", "inherits": "COEX PETG @base", "from": "system", - "setting_id": "CXPETX02", + "setting_id": "scNT4RccECXf88MU", "instantiation": "true", "fan_max_speed": [ "40" diff --git a/resources/profiles/BBL/filament/COEX/COEX PETG @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PETG @BBL X1C.json similarity index 93% rename from resources/profiles/BBL/filament/COEX/COEX PETG @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PETG @BBL X1C.json index b06f93d281..0163ecd21e 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PETG @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PETG @BBL X1C.json @@ -3,7 +3,7 @@ "name": "COEX PETG @BBL X1C", "inherits": "COEX PETG @base", "from": "system", - "setting_id": "CXPETX01", + "setting_id": "sDI541ggJ5DoXcdP", "instantiation": "true", "filament_max_volumetric_speed": [ "14" diff --git a/resources/profiles/BBL/filament/COEX/COEX PLA @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA @BBL A1 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX PLA @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA @BBL A1 0.2 nozzle.json index 95408fd0bd..7faacef1bf 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PLA @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA @BBL A1 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX PLA @BBL A1 0.2 nozzle", "inherits": "COEX PLA @base", "from": "system", - "setting_id": "CXPLAX09", + "setting_id": "VDPt22q9NQHPLwep", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/COEX/COEX PLA @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA @BBL A1.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX PLA @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA @BBL A1.json index 395ea8350b..8a266b1a1f 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PLA @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA @BBL A1.json @@ -3,7 +3,7 @@ "name": "COEX PLA @BBL A1", "inherits": "COEX PLA @base", "from": "system", - "setting_id": "CXPLAX08", + "setting_id": "jFDQnqGZVHlRjjlK", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/COEX/COEX PLA @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA @BBL A1M 0.2 nozzle.json similarity index 87% rename from resources/profiles/BBL/filament/COEX/COEX PLA @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA @BBL A1M 0.2 nozzle.json index 6fd31fe8e2..755cba92e0 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PLA @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA @BBL A1M 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX PLA @BBL A1M 0.2 nozzle", "inherits": "COEX PLA @BBL A1M", "from": "system", - "setting_id": "CXPLAX07", + "setting_id": "dbJukwYNClAE3Y4W", "instantiation": "true", "filament_max_volumetric_speed": [ "6" diff --git a/resources/profiles/BBL/filament/COEX/COEX PLA @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA @BBL A1M.json similarity index 94% rename from resources/profiles/BBL/filament/COEX/COEX PLA @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA @BBL A1M.json index 8853919a29..d888cbb20b 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PLA @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA @BBL A1M.json @@ -3,7 +3,7 @@ "name": "COEX PLA @BBL A1M", "inherits": "COEX PLA @base", "from": "system", - "setting_id": "CXPLAX06", + "setting_id": "QkZVOGGnNC3U0A7m", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/COEX/COEX PLA @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA @BBL P1P 0.2 nozzle.json similarity index 87% rename from resources/profiles/BBL/filament/COEX/COEX PLA @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA @BBL P1P 0.2 nozzle.json index 3b9362f347..5853e66179 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PLA @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA @BBL P1P 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX PLA @BBL P1P 0.2 nozzle", "inherits": "COEX PLA @BBL P1P", "from": "system", - "setting_id": "CXPLAX05", + "setting_id": "87nvDFQRevtSiubX", "instantiation": "true", "filament_max_volumetric_speed": [ "6" diff --git a/resources/profiles/BBL/filament/COEX/COEX PLA @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA @BBL P1P.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX PLA @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA @BBL P1P.json index c39c501104..7407f01112 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PLA @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA @BBL P1P.json @@ -3,7 +3,7 @@ "name": "COEX PLA @BBL P1P", "inherits": "COEX PLA @base", "from": "system", - "setting_id": "CXPLAX04", + "setting_id": "Ja95cvzeSeqSAKsq", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/COEX/COEX PLA @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA @BBL X1.json similarity index 88% rename from resources/profiles/BBL/filament/COEX/COEX PLA @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA @BBL X1.json index 2590b208c5..ded86a4938 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PLA @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA @BBL X1.json @@ -3,7 +3,7 @@ "name": "COEX PLA @BBL X1", "inherits": "COEX PLA @base", "from": "system", - "setting_id": "CXPLAX03", + "setting_id": "5D7sxBEXD7eta7V3", "instantiation": "true", "slow_down_layer_time": [ "10" diff --git a/resources/profiles/BBL/filament/COEX/COEX PLA @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA @BBL X1C 0.2 nozzle.json similarity index 90% rename from resources/profiles/BBL/filament/COEX/COEX PLA @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA @BBL X1C 0.2 nozzle.json index eb0684a05d..7b36a15acd 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PLA @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA @BBL X1C 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX PLA @BBL X1C 0.2 nozzle", "inherits": "COEX PLA @BBL X1C", "from": "system", - "setting_id": "CXPLAX02", + "setting_id": "BvByjahhcY0Moihz", "instantiation": "true", "filament_max_volumetric_speed": [ "1.6" diff --git a/resources/profiles/BBL/filament/COEX/COEX PLA @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA @BBL X1C.json similarity index 92% rename from resources/profiles/BBL/filament/COEX/COEX PLA @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA @BBL X1C.json index e4fb5fcc4f..c6d08bdf3d 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PLA @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA @BBL X1C.json @@ -3,7 +3,7 @@ "name": "COEX PLA @BBL X1C", "inherits": "COEX PLA @base", "from": "system", - "setting_id": "CXPLAX01", + "setting_id": "e4zp2O3cFAcbqoFi", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX PLA PRIME @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA PRIME @BBL A1 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX PLA PRIME @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA PRIME @BBL A1 0.2 nozzle.json index 6028dcdd90..565f01f48c 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PLA PRIME @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA PRIME @BBL A1 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX PLA PRIME @BBL A1 0.2 nozzle", "inherits": "COEX PLA PRIME @base", "from": "system", - "setting_id": "CXPLPX10", + "setting_id": "Vys3UqyWFT69wMH6", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/COEX/COEX PLA PRIME @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA PRIME @BBL A1.json similarity index 92% rename from resources/profiles/BBL/filament/COEX/COEX PLA PRIME @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA PRIME @BBL A1.json index 8d18bccfd4..5c482f19fb 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PLA PRIME @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA PRIME @BBL A1.json @@ -3,7 +3,7 @@ "name": "COEX PLA PRIME @BBL A1", "inherits": "COEX PLA PRIME @base", "from": "system", - "setting_id": "CXPLPX09", + "setting_id": "g1yJbSmJv4RDWLUa", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX PLA PRIME @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA PRIME @BBL A1M 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX PLA PRIME @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA PRIME @BBL A1M 0.2 nozzle.json index 940966a5b3..5383c52bf0 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PLA PRIME @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA PRIME @BBL A1M 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX PLA PRIME @BBL A1M 0.2 nozzle", "inherits": "COEX PLA PRIME @base", "from": "system", - "setting_id": "CXPLPX08", + "setting_id": "5mzTIa5FF81O5BDZ", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/COEX/COEX PLA PRIME @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA PRIME @BBL A1M.json similarity index 92% rename from resources/profiles/BBL/filament/COEX/COEX PLA PRIME @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA PRIME @BBL A1M.json index e80f790fd9..81c5d63c2c 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PLA PRIME @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA PRIME @BBL A1M.json @@ -3,7 +3,7 @@ "name": "COEX PLA PRIME @BBL A1M", "inherits": "COEX PLA PRIME @base", "from": "system", - "setting_id": "CXPLPX07", + "setting_id": "dhsmZHXKzMNn0FtL", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX PLA PRIME @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA PRIME @BBL P1P 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX PLA PRIME @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA PRIME @BBL P1P 0.2 nozzle.json index c027b287cd..87270136c6 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PLA PRIME @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA PRIME @BBL P1P 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX PLA PRIME @BBL P1P 0.2 nozzle", "inherits": "COEX PLA PRIME @base", "from": "system", - "setting_id": "CXPLPX06", + "setting_id": "z9CUoW9SUMr840v9", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/COEX/COEX PLA PRIME @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA PRIME @BBL P1P.json similarity index 92% rename from resources/profiles/BBL/filament/COEX/COEX PLA PRIME @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA PRIME @BBL P1P.json index d0dd387bb1..5efa9671f2 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PLA PRIME @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA PRIME @BBL P1P.json @@ -3,7 +3,7 @@ "name": "COEX PLA PRIME @BBL P1P", "inherits": "COEX PLA PRIME @base", "from": "system", - "setting_id": "CXPLPX05", + "setting_id": "Y0N972snI2iVBaMY", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX PLA PRIME @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA PRIME @BBL X1 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX PLA PRIME @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA PRIME @BBL X1 0.2 nozzle.json index 62831e8052..ba76a4fd64 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PLA PRIME @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA PRIME @BBL X1 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX PLA PRIME @BBL X1 0.2 nozzle", "inherits": "COEX PLA PRIME @base", "from": "system", - "setting_id": "CXPLPX04", + "setting_id": "msqmewkUzhFUnXCt", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/COEX/COEX PLA PRIME @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA PRIME @BBL X1.json similarity index 92% rename from resources/profiles/BBL/filament/COEX/COEX PLA PRIME @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA PRIME @BBL X1.json index 028ff4b670..e396cea21e 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PLA PRIME @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA PRIME @BBL X1.json @@ -3,7 +3,7 @@ "name": "COEX PLA PRIME @BBL X1", "inherits": "COEX PLA PRIME @base", "from": "system", - "setting_id": "CXPLPX03", + "setting_id": "KFI0vPD4fV1IXcM7", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX PLA PRIME @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA PRIME @BBL X1C 0.2 nozzle.json similarity index 92% rename from resources/profiles/BBL/filament/COEX/COEX PLA PRIME @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA PRIME @BBL X1C 0.2 nozzle.json index 7974b443de..5055ec3346 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PLA PRIME @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA PRIME @BBL X1C 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX PLA PRIME @BBL X1C 0.2 nozzle", "inherits": "COEX PLA PRIME @base", "from": "system", - "setting_id": "CXPLPX02", + "setting_id": "IiYPW1KPNf3ZJJrJ", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX PLA PRIME @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA PRIME @BBL X1C.json similarity index 94% rename from resources/profiles/BBL/filament/COEX/COEX PLA PRIME @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA PRIME @BBL X1C.json index 331caa6f06..baf0e668ca 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PLA PRIME @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA PRIME @BBL X1C.json @@ -3,7 +3,7 @@ "name": "COEX PLA PRIME @BBL X1C", "inherits": "COEX PLA PRIME @base", "from": "system", - "setting_id": "CXPLPX01", + "setting_id": "VOBMEynoZVDn7WPc", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX PLA+Silk @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA+Silk @BBL A1 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX PLA+Silk @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA+Silk @BBL A1 0.2 nozzle.json index 21da9b46b6..1f5af9e8e5 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PLA+Silk @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA+Silk @BBL A1 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX PLA+Silk @BBL A1 0.2 nozzle", "inherits": "COEX PLA+Silk @base", "from": "system", - "setting_id": "CXPLSX10", + "setting_id": "2UyZUycIPMP0PUup", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/COEX/COEX PLA+Silk @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA+Silk @BBL A1.json similarity index 92% rename from resources/profiles/BBL/filament/COEX/COEX PLA+Silk @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA+Silk @BBL A1.json index e609d02f66..b762ca9617 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PLA+Silk @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA+Silk @BBL A1.json @@ -3,7 +3,7 @@ "name": "COEX PLA+Silk @BBL A1", "inherits": "COEX PLA+Silk @base", "from": "system", - "setting_id": "CXPLSX09", + "setting_id": "XxZ5veyuN2CgIJ5x", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX PLA+Silk @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA+Silk @BBL A1M 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX PLA+Silk @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA+Silk @BBL A1M 0.2 nozzle.json index 95f8fb9e59..348d2a305e 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PLA+Silk @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA+Silk @BBL A1M 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX PLA+Silk @BBL A1M 0.2 nozzle", "inherits": "COEX PLA+Silk @base", "from": "system", - "setting_id": "CXPLSX08", + "setting_id": "6Vc8BkXxDP7T8Coo", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/COEX/COEX PLA+Silk @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA+Silk @BBL A1M.json similarity index 92% rename from resources/profiles/BBL/filament/COEX/COEX PLA+Silk @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA+Silk @BBL A1M.json index f2ce3cdce0..8589ba64b2 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PLA+Silk @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA+Silk @BBL A1M.json @@ -3,7 +3,7 @@ "name": "COEX PLA+Silk @BBL A1M", "inherits": "COEX PLA+Silk @base", "from": "system", - "setting_id": "CXPLSX07", + "setting_id": "eu0boRMOVOgQrl3Y", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX PLA+Silk @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA+Silk @BBL P1P 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX PLA+Silk @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA+Silk @BBL P1P 0.2 nozzle.json index 902323e79e..e948f0bb05 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PLA+Silk @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA+Silk @BBL P1P 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX PLA+Silk @BBL P1P 0.2 nozzle", "inherits": "COEX PLA+Silk @base", "from": "system", - "setting_id": "CXPLSX06", + "setting_id": "OUxQCADBha44cBsA", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/COEX/COEX PLA+Silk @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA+Silk @BBL P1P.json similarity index 92% rename from resources/profiles/BBL/filament/COEX/COEX PLA+Silk @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA+Silk @BBL P1P.json index 0d390cb258..99759f5ddd 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PLA+Silk @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA+Silk @BBL P1P.json @@ -3,7 +3,7 @@ "name": "COEX PLA+Silk @BBL P1P", "inherits": "COEX PLA+Silk @base", "from": "system", - "setting_id": "CXPLSX05", + "setting_id": "hk0y7xqoLTA3tNUo", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX PLA+Silk @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA+Silk @BBL X1 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX PLA+Silk @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA+Silk @BBL X1 0.2 nozzle.json index a2fd486eca..7f61bf7be2 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PLA+Silk @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA+Silk @BBL X1 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX PLA+Silk @BBL X1 0.2 nozzle", "inherits": "COEX PLA+Silk @base", "from": "system", - "setting_id": "CXPLSX04", + "setting_id": "ns9Gncke9yUgUmex", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/COEX/COEX PLA+Silk @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA+Silk @BBL X1.json similarity index 92% rename from resources/profiles/BBL/filament/COEX/COEX PLA+Silk @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA+Silk @BBL X1.json index 7048da3321..23d856488d 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PLA+Silk @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA+Silk @BBL X1.json @@ -3,7 +3,7 @@ "name": "COEX PLA+Silk @BBL X1", "inherits": "COEX PLA+Silk @base", "from": "system", - "setting_id": "CXPLSX03", + "setting_id": "0QI62GCE2YGCb7rI", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX PLA+Silk @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA+Silk @BBL X1C 0.2 nozzle.json similarity index 92% rename from resources/profiles/BBL/filament/COEX/COEX PLA+Silk @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA+Silk @BBL X1C 0.2 nozzle.json index 43e1c0f75a..1fe80d582d 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PLA+Silk @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA+Silk @BBL X1C 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX PLA+Silk @BBL X1C 0.2 nozzle", "inherits": "COEX PLA+Silk @base", "from": "system", - "setting_id": "CXPLSX02", + "setting_id": "H5u3IWbfcVMSmXoY", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX PLA+Silk @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA+Silk @BBL X1C.json similarity index 94% rename from resources/profiles/BBL/filament/COEX/COEX PLA+Silk @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA+Silk @BBL X1C.json index 581970defd..85cc1e8c76 100644 --- a/resources/profiles/BBL/filament/COEX/COEX PLA+Silk @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX PLA+Silk @BBL X1C.json @@ -3,7 +3,7 @@ "name": "COEX PLA+Silk @BBL X1C", "inherits": "COEX PLA+Silk @base", "from": "system", - "setting_id": "CXPLSX01", + "setting_id": "8nvO7iSj7Kr21VYS", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX TPE 30D @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 30D @BBL A1.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX TPE 30D @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 30D @BBL A1.json index eaa218b86f..57792d2139 100644 --- a/resources/profiles/BBL/filament/COEX/COEX TPE 30D @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 30D @BBL A1.json @@ -3,7 +3,7 @@ "name": "COEX TPE 30D @BBL A1", "inherits": "COEX TPE 30D @base", "from": "system", - "setting_id": "CX30DX09", + "setting_id": "oSB30vX697zFBQus", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX TPE 30D @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 30D @BBL A1M.json similarity index 92% rename from resources/profiles/BBL/filament/COEX/COEX TPE 30D @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 30D @BBL A1M.json index cebfe28dea..d00a90d06a 100644 --- a/resources/profiles/BBL/filament/COEX/COEX TPE 30D @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 30D @BBL A1M.json @@ -3,7 +3,7 @@ "name": "COEX TPE 30D @BBL A1M", "inherits": "COEX TPE 30D @base", "from": "system", - "setting_id": "CX30DX07", + "setting_id": "DAkMitwruFDPSbRg", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX TPE 30D @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 30D @BBL P1P.json similarity index 92% rename from resources/profiles/BBL/filament/COEX/COEX TPE 30D @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 30D @BBL P1P.json index 321ff2b715..f7ee71643f 100644 --- a/resources/profiles/BBL/filament/COEX/COEX TPE 30D @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 30D @BBL P1P.json @@ -3,7 +3,7 @@ "name": "COEX TPE 30D @BBL P1P", "inherits": "COEX TPE 30D @base", "from": "system", - "setting_id": "CX30DX05", + "setting_id": "fM4NLTU5iPByCRuc", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX TPE 30D @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 30D @BBL X1.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX TPE 30D @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 30D @BBL X1.json index f9a4e3efb8..75db97ea70 100644 --- a/resources/profiles/BBL/filament/COEX/COEX TPE 30D @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 30D @BBL X1.json @@ -3,7 +3,7 @@ "name": "COEX TPE 30D @BBL X1", "inherits": "COEX TPE 30D @base", "from": "system", - "setting_id": "CX30DX03", + "setting_id": "sAU5cu8EPBihEP3m", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX TPE 30D @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 30D @BBL X1C.json similarity index 94% rename from resources/profiles/BBL/filament/COEX/COEX TPE 30D @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 30D @BBL X1C.json index 562df95753..d2dc636f7d 100644 --- a/resources/profiles/BBL/filament/COEX/COEX TPE 30D @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 30D @BBL X1C.json @@ -3,7 +3,7 @@ "name": "COEX TPE 30D @BBL X1C", "inherits": "COEX TPE 30D @base", "from": "system", - "setting_id": "CX30DX01", + "setting_id": "YD3gdeJlVLobA19c", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX TPE 40D @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 40D @BBL A1 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX TPE 40D @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 40D @BBL A1 0.2 nozzle.json index c2a4b814df..17f180ac4c 100644 --- a/resources/profiles/BBL/filament/COEX/COEX TPE 40D @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 40D @BBL A1 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX TPE 40D @BBL A1 0.2 nozzle", "inherits": "COEX TPE 40D @base", "from": "system", - "setting_id": "CX40DX10", + "setting_id": "5kmtoD76pdg0QjC6", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/COEX/COEX TPE 40D @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 40D @BBL A1.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX TPE 40D @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 40D @BBL A1.json index 63bb69cfe1..63351b26f1 100644 --- a/resources/profiles/BBL/filament/COEX/COEX TPE 40D @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 40D @BBL A1.json @@ -3,7 +3,7 @@ "name": "COEX TPE 40D @BBL A1", "inherits": "COEX TPE 40D @base", "from": "system", - "setting_id": "CX40DX09", + "setting_id": "vIBFZpAkGHevYJ4e", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX TPE 40D @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 40D @BBL A1M 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX TPE 40D @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 40D @BBL A1M 0.2 nozzle.json index 5a822a1dba..36224d8ed4 100644 --- a/resources/profiles/BBL/filament/COEX/COEX TPE 40D @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 40D @BBL A1M 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX TPE 40D @BBL A1M 0.2 nozzle", "inherits": "COEX TPE 40D @base", "from": "system", - "setting_id": "CX40DX08", + "setting_id": "kcfjEjxaRqsxGAQW", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/COEX/COEX TPE 40D @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 40D @BBL A1M.json similarity index 92% rename from resources/profiles/BBL/filament/COEX/COEX TPE 40D @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 40D @BBL A1M.json index 1948af44c4..cadb053df3 100644 --- a/resources/profiles/BBL/filament/COEX/COEX TPE 40D @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 40D @BBL A1M.json @@ -3,7 +3,7 @@ "name": "COEX TPE 40D @BBL A1M", "inherits": "COEX TPE 40D @base", "from": "system", - "setting_id": "CX40DX07", + "setting_id": "IzNE1SAjAwkoqxIE", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX TPE 40D @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 40D @BBL P1P 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX TPE 40D @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 40D @BBL P1P 0.2 nozzle.json index 9d67b69e19..36defa8e23 100644 --- a/resources/profiles/BBL/filament/COEX/COEX TPE 40D @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 40D @BBL P1P 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX TPE 40D @BBL P1P 0.2 nozzle", "inherits": "COEX TPE 40D @base", "from": "system", - "setting_id": "CX40DX06", + "setting_id": "oOlkk48h49OuvTZn", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/COEX/COEX TPE 40D @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 40D @BBL P1P.json similarity index 92% rename from resources/profiles/BBL/filament/COEX/COEX TPE 40D @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 40D @BBL P1P.json index 81a519bfc8..31a5a2fe95 100644 --- a/resources/profiles/BBL/filament/COEX/COEX TPE 40D @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 40D @BBL P1P.json @@ -3,7 +3,7 @@ "name": "COEX TPE 40D @BBL P1P", "inherits": "COEX TPE 40D @base", "from": "system", - "setting_id": "CX40DX05", + "setting_id": "218zr889pSXjWLAP", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX TPE 40D @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 40D @BBL X1 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX TPE 40D @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 40D @BBL X1 0.2 nozzle.json index 6bcf9675e6..c9ee50ed81 100644 --- a/resources/profiles/BBL/filament/COEX/COEX TPE 40D @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 40D @BBL X1 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX TPE 40D @BBL X1 0.2 nozzle", "inherits": "COEX TPE 40D @base", "from": "system", - "setting_id": "CX40DX04", + "setting_id": "jbVhungUNiUfz8XR", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/COEX/COEX TPE 40D @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 40D @BBL X1.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX TPE 40D @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 40D @BBL X1.json index 158229e332..4b78b22348 100644 --- a/resources/profiles/BBL/filament/COEX/COEX TPE 40D @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 40D @BBL X1.json @@ -3,7 +3,7 @@ "name": "COEX TPE 40D @BBL X1", "inherits": "COEX TPE 40D @base", "from": "system", - "setting_id": "CX40DX03", + "setting_id": "iivGVcN67LySNauF", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX TPE 40D @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 40D @BBL X1C 0.2 nozzle.json similarity index 92% rename from resources/profiles/BBL/filament/COEX/COEX TPE 40D @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 40D @BBL X1C 0.2 nozzle.json index 4e1d4b8264..2ba81969e2 100644 --- a/resources/profiles/BBL/filament/COEX/COEX TPE 40D @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 40D @BBL X1C 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX TPE 40D @BBL X1C 0.2 nozzle", "inherits": "COEX TPE 40D @base", "from": "system", - "setting_id": "CX40DX02", + "setting_id": "khZfUC4r9MBSv1DR", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX TPE 40D @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 40D @BBL X1C.json similarity index 94% rename from resources/profiles/BBL/filament/COEX/COEX TPE 40D @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 40D @BBL X1C.json index 5ab4e9ea18..e24c6481b1 100644 --- a/resources/profiles/BBL/filament/COEX/COEX TPE 40D @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 40D @BBL X1C.json @@ -3,7 +3,7 @@ "name": "COEX TPE 40D @BBL X1C", "inherits": "COEX TPE 40D @base", "from": "system", - "setting_id": "CX40DX01", + "setting_id": "L9Dosu0C19pn86o4", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX TPE 60D @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 60D @BBL A1 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX TPE 60D @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 60D @BBL A1 0.2 nozzle.json index 8812114a16..65ae57aefc 100644 --- a/resources/profiles/BBL/filament/COEX/COEX TPE 60D @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 60D @BBL A1 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX TPE 60D @BBL A1 0.2 nozzle", "inherits": "COEX TPE 60D @base", "from": "system", - "setting_id": "CX60DX10", + "setting_id": "fZGjPDEF9pAAPT3b", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/COEX/COEX TPE 60D @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 60D @BBL A1.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX TPE 60D @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 60D @BBL A1.json index e3653c8a13..9d94bd2a90 100644 --- a/resources/profiles/BBL/filament/COEX/COEX TPE 60D @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 60D @BBL A1.json @@ -3,7 +3,7 @@ "name": "COEX TPE 60D @BBL A1", "inherits": "COEX TPE 60D @base", "from": "system", - "setting_id": "CX60DX09", + "setting_id": "HQvwpstkDqMUiUv4", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX TPE 60D @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 60D @BBL A1M 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX TPE 60D @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 60D @BBL A1M 0.2 nozzle.json index 90c1fec615..bd27b9eb5e 100644 --- a/resources/profiles/BBL/filament/COEX/COEX TPE 60D @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 60D @BBL A1M 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX TPE 60D @BBL A1M 0.2 nozzle", "inherits": "COEX TPE 60D @base", "from": "system", - "setting_id": "CX60DX08", + "setting_id": "PXeGlTps8xPbMGyl", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/COEX/COEX TPE 60D @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 60D @BBL A1M.json similarity index 92% rename from resources/profiles/BBL/filament/COEX/COEX TPE 60D @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 60D @BBL A1M.json index ca90c77cad..9b63d7fcaa 100644 --- a/resources/profiles/BBL/filament/COEX/COEX TPE 60D @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 60D @BBL A1M.json @@ -3,7 +3,7 @@ "name": "COEX TPE 60D @BBL A1M", "inherits": "COEX TPE 60D @base", "from": "system", - "setting_id": "CX60DX07", + "setting_id": "YjSBLf6gS4qED472", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX TPE 60D @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 60D @BBL P1P 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX TPE 60D @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 60D @BBL P1P 0.2 nozzle.json index 8f6c0a8d69..35540825cf 100644 --- a/resources/profiles/BBL/filament/COEX/COEX TPE 60D @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 60D @BBL P1P 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX TPE 60D @BBL P1P 0.2 nozzle", "inherits": "COEX TPE 60D @base", "from": "system", - "setting_id": "CX60DX06", + "setting_id": "KCOov85CN9IGBY9i", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/COEX/COEX TPE 60D @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 60D @BBL P1P.json similarity index 92% rename from resources/profiles/BBL/filament/COEX/COEX TPE 60D @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 60D @BBL P1P.json index 745f10e97a..e89acac314 100644 --- a/resources/profiles/BBL/filament/COEX/COEX TPE 60D @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 60D @BBL P1P.json @@ -3,7 +3,7 @@ "name": "COEX TPE 60D @BBL P1P", "inherits": "COEX TPE 60D @base", "from": "system", - "setting_id": "CX60DX05", + "setting_id": "Sy5TZ37aHkRJLp0Q", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX TPE 60D @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 60D @BBL X1 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX TPE 60D @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 60D @BBL X1 0.2 nozzle.json index 94f9002881..6d1f6a5ea6 100644 --- a/resources/profiles/BBL/filament/COEX/COEX TPE 60D @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 60D @BBL X1 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX TPE 60D @BBL X1 0.2 nozzle", "inherits": "COEX TPE 60D @base", "from": "system", - "setting_id": "CX60DX04", + "setting_id": "YoM9DLlAdYgEk4PZ", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/COEX/COEX TPE 60D @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 60D @BBL X1.json similarity index 91% rename from resources/profiles/BBL/filament/COEX/COEX TPE 60D @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 60D @BBL X1.json index eb7afe6bfa..f39c9d3de4 100644 --- a/resources/profiles/BBL/filament/COEX/COEX TPE 60D @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 60D @BBL X1.json @@ -3,7 +3,7 @@ "name": "COEX TPE 60D @BBL X1", "inherits": "COEX TPE 60D @base", "from": "system", - "setting_id": "CX60DX03", + "setting_id": "9eXbTxjk34q8jj3y", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX TPE 60D @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 60D @BBL X1C 0.2 nozzle.json similarity index 92% rename from resources/profiles/BBL/filament/COEX/COEX TPE 60D @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 60D @BBL X1C 0.2 nozzle.json index 604792b29c..1882d80114 100644 --- a/resources/profiles/BBL/filament/COEX/COEX TPE 60D @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 60D @BBL X1C 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "COEX TPE 60D @BBL X1C 0.2 nozzle", "inherits": "COEX TPE 60D @base", "from": "system", - "setting_id": "CX60DX02", + "setting_id": "WUhtYzsVYMxdcNIO", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX TPE 60D @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 60D @BBL X1C.json similarity index 94% rename from resources/profiles/BBL/filament/COEX/COEX TPE 60D @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 60D @BBL X1C.json index 99b2b9a765..6589562d7a 100644 --- a/resources/profiles/BBL/filament/COEX/COEX TPE 60D @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPE 60D @BBL X1C.json @@ -3,7 +3,7 @@ "name": "COEX TPE 60D @BBL X1C", "inherits": "COEX TPE 60D @base", "from": "system", - "setting_id": "CX60DX01", + "setting_id": "YjRgNYgjXV16sqZC", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/COEX/COEX TPU 60A @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPU 60A @BBL X1C.json similarity index 94% rename from resources/profiles/BBL/filament/COEX/COEX TPU 60A @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPU 60A @BBL X1C.json index 19fa44de17..d5d63ffbcf 100644 --- a/resources/profiles/BBL/filament/COEX/COEX TPU 60A @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/COEX/BBL/COEX TPU 60A @BBL X1C.json @@ -3,7 +3,7 @@ "name": "COEX TPU 60A @BBL X1C", "inherits": "COEX TPU 60A @base", "from": "system", - "setting_id": "CX60AX01", + "setting_id": "Kgwghfh0bJD5r1cK", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/FusRock/FusRock ABS-GF @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/FusRock/BBL/FusRock ABS-GF @BBL A1.json similarity index 93% rename from resources/profiles/BBL/filament/FusRock/FusRock ABS-GF @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/FusRock/BBL/FusRock ABS-GF @BBL A1.json index 2fac503182..c283b9aafb 100644 --- a/resources/profiles/BBL/filament/FusRock/FusRock ABS-GF @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FusRock/BBL/FusRock ABS-GF @BBL A1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "FusRock ABS-GF @BBL A1", - "inherits": "FusRock ABS-GF @base", + "inherits": "FusRock ABS-GF @BBL base", "from": "system", - "setting_id": "GFSR00_01", + "setting_id": "AWilJGD4uphvinK0", "instantiation": "true", "filament_notes": "//EN\n1.Be sure to read it carefully before using (https://wiki.fusrock.com).\n2.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）.\\n3.Thank you for choosing FusRock. \n//CN\n1.使用前请务必仔细阅读（https://wiki.fusrock.com）。\n2.打印该耗材时，可能会出现喷嘴堵塞、拉丝、翘边以及层间附着力不足等问题。为了获得更好的打印效果，请参考此维基页面：高温 / 工程材料打印技巧（https://wiki.fusrock.com）。\n3.感谢您选择FusRock。", "filament_long_retractions_when_cut": [ diff --git a/resources/profiles/BBL/filament/FusRock/FusRock ABS-GF @BBL H2D.json b/resources/profiles/OrcaFilamentLibrary/filament/FusRock/BBL/FusRock ABS-GF @BBL H2D.json similarity index 95% rename from resources/profiles/BBL/filament/FusRock/FusRock ABS-GF @BBL H2D.json rename to resources/profiles/OrcaFilamentLibrary/filament/FusRock/BBL/FusRock ABS-GF @BBL H2D.json index be3bdb2c40..e3bf5dfd28 100644 --- a/resources/profiles/BBL/filament/FusRock/FusRock ABS-GF @BBL H2D.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FusRock/BBL/FusRock ABS-GF @BBL H2D.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "FusRock ABS-GF @BBL H2D", - "inherits": "FusRock ABS-GF @base", + "inherits": "FusRock ABS-GF @BBL base", "from": "system", - "setting_id": "GFSR00_03", + "setting_id": "N3PSDaJIkJdhGssG", "instantiation": "true", "chamber_temperatures": [ "60" diff --git a/resources/profiles/BBL/filament/FusRock/FusRock ABS-GF @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/FusRock/BBL/FusRock ABS-GF @BBL P1P.json similarity index 81% rename from resources/profiles/BBL/filament/FusRock/FusRock ABS-GF @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/FusRock/BBL/FusRock ABS-GF @BBL P1P.json index a15ebcb69c..2480c3c7be 100644 --- a/resources/profiles/BBL/filament/FusRock/FusRock ABS-GF @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FusRock/BBL/FusRock ABS-GF @BBL P1P.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "FusRock ABS-GF @BBL P1P", - "inherits": "FusRock ABS-GF @base", + "inherits": "FusRock ABS-GF @BBL base", "from": "system", - "setting_id": "GFSR00_04", + "setting_id": "mhwJGDVOG3AYawSy", "instantiation": "true", "filament_long_retractions_when_cut": [ "1" diff --git a/resources/profiles/BBL/filament/FusRock/FusRock ABS-GF @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/FusRock/BBL/FusRock ABS-GF @BBL X1C.json similarity index 89% rename from resources/profiles/BBL/filament/FusRock/FusRock ABS-GF @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/FusRock/BBL/FusRock ABS-GF @BBL X1C.json index 40d26ba410..0dc4a90e65 100644 --- a/resources/profiles/BBL/filament/FusRock/FusRock ABS-GF @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/FusRock/BBL/FusRock ABS-GF @BBL X1C.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "FusRock ABS-GF @BBL X1C", - "inherits": "FusRock ABS-GF @base", + "inherits": "FusRock ABS-GF @BBL base", "from": "system", - "setting_id": "GFSR00_05", + "setting_id": "Gb22zRgoijThX2e8", "instantiation": "true", "filament_long_retractions_when_cut": [ "1" diff --git a/resources/profiles/OrcaFilamentLibrary/filament/FusRock/BBL/FusRock ABS-GF @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/FusRock/BBL/FusRock ABS-GF @BBL base.json new file mode 100644 index 0000000000..fda844dce3 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/FusRock/BBL/FusRock ABS-GF @BBL base.json @@ -0,0 +1,19 @@ +{ + "type": "filament", + "name": "FusRock ABS-GF @BBL base", + "inherits": "FusRock ABS-GF @base", + "from": "system", + "instantiation": "false", + "close_additional_fan_first_x_layers": [ + "3" + ], + "filament_start_gcode": [ + "; Filament gcode\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "retraction_distances_when_ec": [ + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/BBL/filament/Numakers/Numakers PLA+ @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Numakers/BBL/Numakers PLA+ @BBL A1 0.2 nozzle.json similarity index 88% rename from resources/profiles/BBL/filament/Numakers/Numakers PLA+ @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Numakers/BBL/Numakers PLA+ @BBL A1 0.2 nozzle.json index 7dbd2a0536..4e7717f3bc 100644 --- a/resources/profiles/BBL/filament/Numakers/Numakers PLA+ @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Numakers/BBL/Numakers PLA+ @BBL A1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Numakers PLA+ @BBL A1 0.2 nozzle", - "inherits": "Numakers PLA+ @base", + "inherits": "Numakers PLA+ @BBL base", "from": "system", - "setting_id": "GFNMKS04_00", + "setting_id": "Ii1WcXMeEaYffOlt", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/Numakers/Numakers PLA+ @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Numakers/BBL/Numakers PLA+ @BBL A1.json similarity index 88% rename from resources/profiles/BBL/filament/Numakers/Numakers PLA+ @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Numakers/BBL/Numakers PLA+ @BBL A1.json index eeda187bdb..c5d9d9c5bb 100644 --- a/resources/profiles/BBL/filament/Numakers/Numakers PLA+ @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Numakers/BBL/Numakers PLA+ @BBL A1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Numakers PLA+ @BBL A1", - "inherits": "Numakers PLA+ @base", + "inherits": "Numakers PLA+ @BBL base", "from": "system", - "setting_id": "GFNMKS04", + "setting_id": "qR2dbJvfmbQBJDzR", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/Numakers/Numakers PLA+ @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Numakers/BBL/Numakers PLA+ @BBL A1M 0.2 nozzle.json similarity index 89% rename from resources/profiles/BBL/filament/Numakers/Numakers PLA+ @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Numakers/BBL/Numakers PLA+ @BBL A1M 0.2 nozzle.json index 072a706142..5a9fcb5ad7 100644 --- a/resources/profiles/BBL/filament/Numakers/Numakers PLA+ @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Numakers/BBL/Numakers PLA+ @BBL A1M 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Numakers PLA+ @BBL A1M 0.2 nozzle", - "inherits": "Numakers PLA+ @base", + "inherits": "Numakers PLA+ @BBL base", "from": "system", - "setting_id": "GFNMKS05_00", + "setting_id": "zvDRrswBnEy5zN80", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/Numakers/Numakers PLA+ @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Numakers/BBL/Numakers PLA+ @BBL A1M.json similarity index 88% rename from resources/profiles/BBL/filament/Numakers/Numakers PLA+ @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Numakers/BBL/Numakers PLA+ @BBL A1M.json index 3e67330378..8b9acfc457 100644 --- a/resources/profiles/BBL/filament/Numakers/Numakers PLA+ @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Numakers/BBL/Numakers PLA+ @BBL A1M.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Numakers PLA+ @BBL A1M", - "inherits": "Numakers PLA+ @base", + "inherits": "Numakers PLA+ @BBL base", "from": "system", - "setting_id": "GFNMKS05", + "setting_id": "mvL3CcSQzWhHmcug", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/Numakers/Numakers PLA+ @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Numakers/BBL/Numakers PLA+ @BBL P1P 0.2 nozzle.json similarity index 95% rename from resources/profiles/BBL/filament/Numakers/Numakers PLA+ @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Numakers/BBL/Numakers PLA+ @BBL P1P 0.2 nozzle.json index d5582669b0..f2c1c78883 100644 --- a/resources/profiles/BBL/filament/Numakers/Numakers PLA+ @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Numakers/BBL/Numakers PLA+ @BBL P1P 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Numakers PLA+ @BBL P1P 0.2 nozzle", - "inherits": "Numakers PLA+ @base", + "inherits": "Numakers PLA+ @BBL base", "from": "system", - "setting_id": "GFNMKS03_00", + "setting_id": "bm0Cd4BbrflodAnD", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/Numakers/Numakers PLA+ @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Numakers/BBL/Numakers PLA+ @BBL P1P.json similarity index 95% rename from resources/profiles/BBL/filament/Numakers/Numakers PLA+ @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Numakers/BBL/Numakers PLA+ @BBL P1P.json index 42cddbeed8..a9e5da69b6 100644 --- a/resources/profiles/BBL/filament/Numakers/Numakers PLA+ @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Numakers/BBL/Numakers PLA+ @BBL P1P.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Numakers PLA+ @BBL P1P", - "inherits": "Numakers PLA+ @base", + "inherits": "Numakers PLA+ @BBL base", "from": "system", - "setting_id": "GFNMKS03", + "setting_id": "E0GTBXYDb5d2jRH4", "instantiation": "true", "fan_cooling_layer_time": [ "80" diff --git a/resources/profiles/BBL/filament/Numakers/Numakers PLA+ @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Numakers/BBL/Numakers PLA+ @BBL X1.json similarity index 95% rename from resources/profiles/BBL/filament/Numakers/Numakers PLA+ @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Numakers/BBL/Numakers PLA+ @BBL X1.json index de788faca1..30c1bb19cf 100644 --- a/resources/profiles/BBL/filament/Numakers/Numakers PLA+ @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Numakers/BBL/Numakers PLA+ @BBL X1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Numakers PLA+ @BBL X1", - "inherits": "Numakers PLA+ @base", + "inherits": "Numakers PLA+ @BBL base", "from": "system", - "setting_id": "GFNMKS02", + "setting_id": "sY9tzmFIrFQKJyFw", "instantiation": "true", "filament_deretraction_speed": [ "nil", diff --git a/resources/profiles/BBL/filament/Numakers/Numakers PLA+ @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Numakers/BBL/Numakers PLA+ @BBL X1C 0.2 nozzle.json similarity index 96% rename from resources/profiles/BBL/filament/Numakers/Numakers PLA+ @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Numakers/BBL/Numakers PLA+ @BBL X1C 0.2 nozzle.json index 01d6929053..0b00b5fd71 100644 --- a/resources/profiles/BBL/filament/Numakers/Numakers PLA+ @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Numakers/BBL/Numakers PLA+ @BBL X1C 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Numakers PLA+ @BBL X1C 0.2 nozzle", - "inherits": "Numakers PLA+ @base", + "inherits": "Numakers PLA+ @BBL base", "from": "system", - "setting_id": "GFNMKS00_00", + "setting_id": "5pXee8UkJCi9ptVA", "instantiation": "true", "filament_max_volumetric_speed": [ "2", diff --git a/resources/profiles/BBL/filament/Numakers/Numakers PLA+ @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/Numakers/BBL/Numakers PLA+ @BBL X1C.json similarity index 96% rename from resources/profiles/BBL/filament/Numakers/Numakers PLA+ @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/Numakers/BBL/Numakers PLA+ @BBL X1C.json index d368e739b9..6aa8b0b279 100644 --- a/resources/profiles/BBL/filament/Numakers/Numakers PLA+ @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Numakers/BBL/Numakers PLA+ @BBL X1C.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Numakers PLA+ @BBL X1C", - "inherits": "Numakers PLA+ @base", + "inherits": "Numakers PLA+ @BBL base", "from": "system", - "setting_id": "GFNMKS00", + "setting_id": "CPPonepBAXeRtRIN", "instantiation": "true", "filament_deretraction_speed": [ "nil", diff --git a/resources/profiles/BBL/filament/Numakers/Numakers PLA+ @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Numakers/BBL/Numakers PLA+ @BBL base.json similarity index 51% rename from resources/profiles/BBL/filament/Numakers/Numakers PLA+ @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/Numakers/BBL/Numakers PLA+ @BBL base.json index b77157064b..0c42dd97d9 100644 --- a/resources/profiles/BBL/filament/Numakers/Numakers PLA+ @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Numakers/BBL/Numakers PLA+ @BBL base.json @@ -1,65 +1,65 @@ { "type": "filament", - "name": "Numakers PLA+ @base", - "inherits": "fdm_filament_pla", + "name": "Numakers PLA+ @BBL base", + "inherits": "Numakers PLA+ @base", "from": "system", - "filament_id": "OFqGRZyH", "instantiation": "false", - "filament_cost": [ - "20.99" + "close_additional_fan_first_x_layers": [ + "3" ], - "filament_density": [ - "1.24" - ], - "filament_flow_ratio": [ - "0.99" - ], - "filament_long_retractions_when_cut": [ - "1" - ], - "filament_retraction_distances_when_cut": [ - "18" - ], - "filament_max_volumetric_speed": [ - "18" - ], - "filament_vendor": [ - "Numakers" - ], - "nozzle_temperature": [ - "225" - ], - "nozzle_temperature_initial_layer": [ - "225" - ], - "nozzle_temperature_range_high": [ - "255" - ], - "nozzle_temperature_range_low": [ - "200" - ], - "filament_scarf_seam_type": [ - "none" - ], - "filament_scarf_height": [ - "10%" - ], - "filament_scarf_gap": [ - "0%" - ], - "filament_scarf_length": [ - "10" + "filament_adhesiveness_category": [ + "100" ], "filament_change_length": [ "5" ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_max_volumetric_speed": [ + "18" + ], "filament_prime_volume": [ "30" ], - "temperature_vitrification": [ - "55" - ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" ] } diff --git a/resources/profiles/BBL/filament/Overture/Overture ASA @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture ASA @BBL X1 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/Overture/Overture ASA @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture ASA @BBL X1 0.2 nozzle.json index 92a040235f..998c4c2958 100644 --- a/resources/profiles/BBL/filament/Overture/Overture ASA @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture ASA @BBL X1 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture ASA @BBL X1 0.2 nozzle", "inherits": "Overture ASA @base", "from": "system", - "setting_id": "GFOT009_07", + "setting_id": "jh7mvQEqtBbMHbbR", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Overture/Overture ASA @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture ASA @BBL X1.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture ASA @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture ASA @BBL X1.json index 7a376a21dd..06d940632c 100644 --- a/resources/profiles/BBL/filament/Overture/Overture ASA @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture ASA @BBL X1.json @@ -3,7 +3,7 @@ "name": "Overture ASA @BBL X1", "inherits": "Overture ASA @base", "from": "system", - "setting_id": "GFOT009_06", + "setting_id": "cRfT6znwV5A6Shfo", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture ASA @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture ASA @BBL X1C 0.2 nozzle.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture ASA @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture ASA @BBL X1C 0.2 nozzle.json index 7fcb646a6f..04ceab67a6 100644 --- a/resources/profiles/BBL/filament/Overture/Overture ASA @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture ASA @BBL X1C 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture ASA @BBL X1C 0.2 nozzle", "inherits": "Overture ASA @base", "from": "system", - "setting_id": "GFOT009_09", + "setting_id": "AtFqTBLGJVqukhdU", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture ASA @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture ASA @BBL X1C.json similarity index 94% rename from resources/profiles/BBL/filament/Overture/Overture ASA @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture ASA @BBL X1C.json index 721caa685f..9f080e5b90 100644 --- a/resources/profiles/BBL/filament/Overture/Overture ASA @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture ASA @BBL X1C.json @@ -3,7 +3,7 @@ "name": "Overture ASA @BBL X1C", "inherits": "Overture ASA @base", "from": "system", - "setting_id": "GFOT009_08", + "setting_id": "xGrk4eFUHPepuKY3", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Air PLA @BBL A1 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Air PLA @BBL A1 0.2 nozzle.json index ae882af557..c63f9b6992 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Air PLA @BBL A1 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture Air PLA @BBL A1 0.2 nozzle", "inherits": "Overture Air PLA @base", "from": "system", - "setting_id": "GFOT006_01", + "setting_id": "hd5p80tAvLBtbLOz", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Air PLA @BBL A1.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Air PLA @BBL A1.json index 7f14c21871..ce543127f7 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Air PLA @BBL A1.json @@ -3,7 +3,7 @@ "name": "Overture Air PLA @BBL A1", "inherits": "Overture Air PLA @base", "from": "system", - "setting_id": "GFOT006_00", + "setting_id": "rC3OqieoVV0VVT49", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Air PLA @BBL A1M 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Air PLA @BBL A1M 0.2 nozzle.json index f0861d37c3..ff348d47d3 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Air PLA @BBL A1M 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture Air PLA @BBL A1M 0.2 nozzle", "inherits": "Overture Air PLA @base", "from": "system", - "setting_id": "GFOT006_03", + "setting_id": "nehgqHdfo3H5PRWD", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Air PLA @BBL A1M.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Air PLA @BBL A1M.json index 51649a3185..30d73664d4 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Air PLA @BBL A1M.json @@ -3,7 +3,7 @@ "name": "Overture Air PLA @BBL A1M", "inherits": "Overture Air PLA @base", "from": "system", - "setting_id": "GFOT006_02", + "setting_id": "gek0LVJsLSpW2ouh", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Air PLA @BBL P1P 0.2 nozzle.json similarity index 90% rename from resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Air PLA @BBL P1P 0.2 nozzle.json index a0d9068fe4..923ab78071 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Air PLA @BBL P1P 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture Air PLA @BBL P1P 0.2 nozzle", "inherits": "Overture Air PLA @base", "from": "system", - "setting_id": "GFOT006_05", + "setting_id": "epbY8jIIyn2noQd9", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Air PLA @BBL P1P.json similarity index 91% rename from resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Air PLA @BBL P1P.json index 6780f2121a..f216f29bbf 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Air PLA @BBL P1P.json @@ -3,7 +3,7 @@ "name": "Overture Air PLA @BBL P1P", "inherits": "Overture Air PLA @base", "from": "system", - "setting_id": "GFOT006_04", + "setting_id": "aaOFmzBat4Zx6HtZ", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Air PLA @BBL X1 0.2 nozzle.json similarity index 90% rename from resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Air PLA @BBL X1 0.2 nozzle.json index ba350275a1..b13bb033d6 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Air PLA @BBL X1 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture Air PLA @BBL X1 0.2 nozzle", "inherits": "Overture Air PLA @base", "from": "system", - "setting_id": "GFOT006_07", + "setting_id": "cUFI1juBlncOcQf1", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Air PLA @BBL X1.json similarity index 91% rename from resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Air PLA @BBL X1.json index bd9ecff79b..ca8b4304bc 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Air PLA @BBL X1.json @@ -3,7 +3,7 @@ "name": "Overture Air PLA @BBL X1", "inherits": "Overture Air PLA @base", "from": "system", - "setting_id": "GFOT006_06", + "setting_id": "nYva3KRuxYikRQic", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Air PLA @BBL X1C 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Air PLA @BBL X1C 0.2 nozzle.json index 85b85b9d4a..afa578c2f3 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Air PLA @BBL X1C 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture Air PLA @BBL X1C 0.2 nozzle", "inherits": "Overture Air PLA @base", "from": "system", - "setting_id": "GFOT006_09", + "setting_id": "LQ99qVFxsjYsXJlK", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Air PLA @BBL X1C.json similarity index 94% rename from resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Air PLA @BBL X1C.json index f499cbc99f..66c97952f8 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Air PLA @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Air PLA @BBL X1C.json @@ -3,7 +3,7 @@ "name": "Overture Air PLA @BBL X1C", "inherits": "Overture Air PLA @base", "from": "system", - "setting_id": "GFOT006_08", + "setting_id": "t9G4iW1zQGXDVa1j", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Easy PLA @BBL A1 0.2 nozzle.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Easy PLA @BBL A1 0.2 nozzle.json index ed140c5597..cbd95782ae 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Easy PLA @BBL A1 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture Easy PLA @BBL A1 0.2 nozzle", "inherits": "Overture Easy PLA @base", "from": "system", - "setting_id": "GFOT003_01", + "setting_id": "GyvGTwqYkGYjEFJk", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Easy PLA @BBL A1.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Easy PLA @BBL A1.json index ac2df417ca..84bc7f06f5 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Easy PLA @BBL A1.json @@ -3,7 +3,7 @@ "name": "Overture Easy PLA @BBL A1", "inherits": "Overture Easy PLA @base", "from": "system", - "setting_id": "GFOT003_00", + "setting_id": "eBLeXUH3S3XbITJe", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Easy PLA @BBL A1M 0.2 nozzle.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Easy PLA @BBL A1M 0.2 nozzle.json index 168d69a765..98b5074879 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Easy PLA @BBL A1M 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture Easy PLA @BBL A1M 0.2 nozzle", "inherits": "Overture Easy PLA @base", "from": "system", - "setting_id": "GFOT003_03", + "setting_id": "OVU5pNwnZzjfGYmA", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Easy PLA @BBL A1M.json similarity index 93% rename from resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Easy PLA @BBL A1M.json index 5636c618e2..3ddca5f725 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Easy PLA @BBL A1M.json @@ -3,7 +3,7 @@ "name": "Overture Easy PLA @BBL A1M", "inherits": "Overture Easy PLA @base", "from": "system", - "setting_id": "GFOT003_02", + "setting_id": "4tkz4o4Gy9Rg9pDn", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Easy PLA @BBL P1P 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Easy PLA @BBL P1P 0.2 nozzle.json index 2cfe573d05..1b0f98d600 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Easy PLA @BBL P1P 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture Easy PLA @BBL P1P 0.2 nozzle", "inherits": "Overture Easy PLA @base", "from": "system", - "setting_id": "GFOT003_05", + "setting_id": "7NxD1OVmlxvWkmMF", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Easy PLA @BBL P1P.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Easy PLA @BBL P1P.json index 6f40c9c10a..1c3deabdb2 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Easy PLA @BBL P1P.json @@ -3,7 +3,7 @@ "name": "Overture Easy PLA @BBL P1P", "inherits": "Overture Easy PLA @base", "from": "system", - "setting_id": "GFOT003_04", + "setting_id": "f0DPSVoUn0Q4sWDh", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Easy PLA @BBL X1 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Easy PLA @BBL X1 0.2 nozzle.json index 5b21800908..affea525be 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Easy PLA @BBL X1 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture Easy PLA @BBL X1 0.2 nozzle", "inherits": "Overture Easy PLA @base", "from": "system", - "setting_id": "GFOT003_07", + "setting_id": "YSplJrX00oFk88io", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Easy PLA @BBL X1.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Easy PLA @BBL X1.json index bec755226a..026a114216 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Easy PLA @BBL X1.json @@ -3,7 +3,7 @@ "name": "Overture Easy PLA @BBL X1", "inherits": "Overture Easy PLA @base", "from": "system", - "setting_id": "GFOT003_06", + "setting_id": "lzlcNvejwGBbieeC", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Easy PLA @BBL X1C 0.2 nozzle.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Easy PLA @BBL X1C 0.2 nozzle.json index 75c0f762c1..9582e8f2b1 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Easy PLA @BBL X1C 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture Easy PLA @BBL X1C 0.2 nozzle", "inherits": "Overture Easy PLA @base", "from": "system", - "setting_id": "GFOT003_09", + "setting_id": "RSBIHAgBtOG3hB9J", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Easy PLA @BBL X1C.json similarity index 94% rename from resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Easy PLA @BBL X1C.json index a7e163b13d..90297c1aee 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Easy PLA @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Easy PLA @BBL X1C.json @@ -3,7 +3,7 @@ "name": "Overture Easy PLA @BBL X1C", "inherits": "Overture Easy PLA @base", "from": "system", - "setting_id": "GFOT003_08", + "setting_id": "FNdjKfYe8qGoyL01", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL A1 0.2 nozzle.json similarity index 82% rename from resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL A1 0.2 nozzle.json index 4ef6fd92eb..a0c643d5a8 100644 --- a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL A1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Overture PLA Pro @BBL A1 0.2 nozzle", - "inherits": "Overture PLA Pro @base", + "inherits": "Overture PLA Pro @BBL base", "from": "system", - "setting_id": "GFOT001_01", + "setting_id": "CNG8j1OyXdsHgayH", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL A1.json similarity index 83% rename from resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL A1.json index 0ba3ff4f77..e35ad0464c 100644 --- a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL A1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Overture PLA Pro @BBL A1", - "inherits": "Overture PLA Pro @base", + "inherits": "Overture PLA Pro @BBL base", "from": "system", - "setting_id": "GFOT001_00", + "setting_id": "f1psVRwfXnf2RBYX", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL A1M 0.2 nozzle.json similarity index 82% rename from resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL A1M 0.2 nozzle.json index a96050f3fe..acad992f0e 100644 --- a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL A1M 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Overture PLA Pro @BBL A1M 0.2 nozzle", - "inherits": "Overture PLA Pro @base", + "inherits": "Overture PLA Pro @BBL base", "from": "system", - "setting_id": "GFOT001_03", + "setting_id": "Czjg8dECgTCk9rmy", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL A1M.json similarity index 84% rename from resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL A1M.json index ba717d8b4b..551a2f34f9 100644 --- a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL A1M.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Overture PLA Pro @BBL A1M", - "inherits": "Overture PLA Pro @base", + "inherits": "Overture PLA Pro @BBL base", "from": "system", - "setting_id": "GFOT001_02", + "setting_id": "awqS4tjR4dYkSEkt", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL P1P 0.2 nozzle.json similarity index 80% rename from resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL P1P 0.2 nozzle.json index d1409ad106..f5f7414508 100644 --- a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL P1P 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Overture PLA Pro @BBL P1P 0.2 nozzle", - "inherits": "Overture PLA Pro @base", + "inherits": "Overture PLA Pro @BBL base", "from": "system", - "setting_id": "GFOT001_05", + "setting_id": "cj0T92bD6kKlQCOi", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL P1P.json similarity index 82% rename from resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL P1P.json index a4074f45de..70f64ce4ba 100644 --- a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL P1P.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Overture PLA Pro @BBL P1P", - "inherits": "Overture PLA Pro @base", + "inherits": "Overture PLA Pro @BBL base", "from": "system", - "setting_id": "GFOT001_04", + "setting_id": "dolDErUUhjBKdxrv", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL X1 0.2 nozzle.json similarity index 80% rename from resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL X1 0.2 nozzle.json index 59cf0ab335..338c4f32ae 100644 --- a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL X1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Overture PLA Pro @BBL X1 0.2 nozzle", - "inherits": "Overture PLA Pro @base", + "inherits": "Overture PLA Pro @BBL base", "from": "system", - "setting_id": "GFOT001_07", + "setting_id": "J2HhpnKJq31D1dbL", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL X1.json similarity index 82% rename from resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL X1.json index fc6d7800c7..a6afdb2af4 100644 --- a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL X1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Overture PLA Pro @BBL X1", - "inherits": "Overture PLA Pro @base", + "inherits": "Overture PLA Pro @BBL base", "from": "system", - "setting_id": "GFOT001_06", + "setting_id": "kcqyWA5VYsx7sCbu", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL X1C 0.2 nozzle.json similarity index 83% rename from resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL X1C 0.2 nozzle.json index 82399a8d10..20f757c895 100644 --- a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL X1C 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Overture PLA Pro @BBL X1C 0.2 nozzle", - "inherits": "Overture PLA Pro @base", + "inherits": "Overture PLA Pro @BBL base", "from": "system", - "setting_id": "GFOT001_09", + "setting_id": "pVINOtBlNRnosjC1", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL X1C.json similarity index 88% rename from resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL X1C.json index f9248c24c2..1f2ddcca38 100644 --- a/resources/profiles/BBL/filament/Overture/Overture PLA Pro @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL X1C.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Overture PLA Pro @BBL X1C", - "inherits": "Overture PLA Pro @base", + "inherits": "Overture PLA Pro @BBL base", "from": "system", - "setting_id": "GFOT001_08", + "setting_id": "yJ0rLSZDqfrxPimR", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL base.json new file mode 100644 index 0000000000..095c74ea7b --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture PLA Pro @BBL base.json @@ -0,0 +1,56 @@ +{ + "type": "filament", + "name": "Overture PLA Pro @BBL base", + "inherits": "Overture PLA Pro @base", + "from": "system", + "instantiation": "false", + "close_additional_fan_first_x_layers": [ + "3" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Rock PLA @BBL A1 0.2 nozzle.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Rock PLA @BBL A1 0.2 nozzle.json index dda00766d7..9a9604bb55 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Rock PLA @BBL A1 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture Rock PLA @BBL A1 0.2 nozzle", "inherits": "Overture Rock PLA @base", "from": "system", - "setting_id": "GFOT004_01", + "setting_id": "E0qnin9rxon6Jyq7", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Rock PLA @BBL A1.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Rock PLA @BBL A1.json index f7f71c6f6e..1027e13de5 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Rock PLA @BBL A1.json @@ -3,7 +3,7 @@ "name": "Overture Rock PLA @BBL A1", "inherits": "Overture Rock PLA @base", "from": "system", - "setting_id": "GFOT004_00", + "setting_id": "PQ9XuAMnKD9y3vgp", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Rock PLA @BBL A1M 0.2 nozzle.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Rock PLA @BBL A1M 0.2 nozzle.json index 070f15b76d..bee6747184 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Rock PLA @BBL A1M 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture Rock PLA @BBL A1M 0.2 nozzle", "inherits": "Overture Rock PLA @base", "from": "system", - "setting_id": "GFOT004_03", + "setting_id": "q3FXD5WrKqNhaLGu", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Rock PLA @BBL A1M.json similarity index 93% rename from resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Rock PLA @BBL A1M.json index b8ce5fb710..c56c221876 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Rock PLA @BBL A1M.json @@ -3,7 +3,7 @@ "name": "Overture Rock PLA @BBL A1M", "inherits": "Overture Rock PLA @base", "from": "system", - "setting_id": "GFOT004_02", + "setting_id": "4uJnRSvdNM68meEz", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Rock PLA @BBL P1P 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Rock PLA @BBL P1P 0.2 nozzle.json index a299d81e60..26584a4de9 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Rock PLA @BBL P1P 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture Rock PLA @BBL P1P 0.2 nozzle", "inherits": "Overture Rock PLA @base", "from": "system", - "setting_id": "GFOT004_05", + "setting_id": "E4iqlOBK45gpYklp", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Rock PLA @BBL P1P.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Rock PLA @BBL P1P.json index 07354aac11..4b58af1898 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Rock PLA @BBL P1P.json @@ -3,7 +3,7 @@ "name": "Overture Rock PLA @BBL P1P", "inherits": "Overture Rock PLA @base", "from": "system", - "setting_id": "GFOT004_04", + "setting_id": "UIb9tBtZiKaRNopy", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Rock PLA @BBL X1 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Rock PLA @BBL X1 0.2 nozzle.json index af0d62edf5..6e0e502c08 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Rock PLA @BBL X1 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture Rock PLA @BBL X1 0.2 nozzle", "inherits": "Overture Rock PLA @base", "from": "system", - "setting_id": "GFOT004_07", + "setting_id": "q4astJFFLi6KbOJl", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Rock PLA @BBL X1.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Rock PLA @BBL X1.json index 036771d5d0..0829e13b6a 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Rock PLA @BBL X1.json @@ -3,7 +3,7 @@ "name": "Overture Rock PLA @BBL X1", "inherits": "Overture Rock PLA @base", "from": "system", - "setting_id": "GFOT004_06", + "setting_id": "PhBMG4I8ITdLQ8oV", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Rock PLA @BBL X1C 0.2 nozzle.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Rock PLA @BBL X1C 0.2 nozzle.json index aa330205cc..b958f28bb2 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Rock PLA @BBL X1C 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture Rock PLA @BBL X1C 0.2 nozzle", "inherits": "Overture Rock PLA @base", "from": "system", - "setting_id": "GFOT004_09", + "setting_id": "HnQhvIXWKZFGVNoY", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Rock PLA @BBL X1C.json similarity index 94% rename from resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Rock PLA @BBL X1C.json index e25071605f..84e0c9c95c 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Rock PLA @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Rock PLA @BBL X1C.json @@ -3,7 +3,7 @@ "name": "Overture Rock PLA @BBL X1C", "inherits": "Overture Rock PLA @base", "from": "system", - "setting_id": "GFOT004_08", + "setting_id": "KsUAem6nMlwcev3c", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Silk PLA @BBL A1 0.2 nozzle.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Silk PLA @BBL A1 0.2 nozzle.json index 1c93195c36..053c01830b 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Silk PLA @BBL A1 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture Silk PLA @BBL A1 0.2 nozzle", "inherits": "Overture Silk PLA @base", "from": "system", - "setting_id": "GFOT002_01", + "setting_id": "UQsPs9GFLPdYgnMp", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Silk PLA @BBL A1.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Silk PLA @BBL A1.json index 6dfdc93163..17fdb143b1 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Silk PLA @BBL A1.json @@ -3,7 +3,7 @@ "name": "Overture Silk PLA @BBL A1", "inherits": "Overture Silk PLA @base", "from": "system", - "setting_id": "GFOT002_00", + "setting_id": "i0iDLQw8NKSQF3Pe", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Silk PLA @BBL A1M 0.2 nozzle.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Silk PLA @BBL A1M 0.2 nozzle.json index 2666d7f316..6cee47ecae 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Silk PLA @BBL A1M 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture Silk PLA @BBL A1M 0.2 nozzle", "inherits": "Overture Silk PLA @base", "from": "system", - "setting_id": "GFOT002_03", + "setting_id": "ugplOmuNqqnsPvfO", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Silk PLA @BBL A1M.json similarity index 93% rename from resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Silk PLA @BBL A1M.json index d625d1453c..7a0ed2f205 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Silk PLA @BBL A1M.json @@ -3,7 +3,7 @@ "name": "Overture Silk PLA @BBL A1M", "inherits": "Overture Silk PLA @base", "from": "system", - "setting_id": "GFOT002_02", + "setting_id": "AMHxNiY2PM8Hell8", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Silk PLA @BBL P1P 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Silk PLA @BBL P1P 0.2 nozzle.json index c855b5d607..098a33d064 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Silk PLA @BBL P1P 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture Silk PLA @BBL P1P 0.2 nozzle", "inherits": "Overture Silk PLA @base", "from": "system", - "setting_id": "GFOT002_05", + "setting_id": "4roLiX33h7u51gl7", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Silk PLA @BBL P1P.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Silk PLA @BBL P1P.json index c744db5570..179b9caa25 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Silk PLA @BBL P1P.json @@ -3,7 +3,7 @@ "name": "Overture Silk PLA @BBL P1P", "inherits": "Overture Silk PLA @base", "from": "system", - "setting_id": "GFOT002_04", + "setting_id": "Qecq5EdIXGd6JRKj", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Silk PLA @BBL X1 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Silk PLA @BBL X1 0.2 nozzle.json index 2f1630fa6c..a4aefdaf23 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Silk PLA @BBL X1 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture Silk PLA @BBL X1 0.2 nozzle", "inherits": "Overture Silk PLA @base", "from": "system", - "setting_id": "GFOT002_07", + "setting_id": "Kyi1iZqSagQAzgeD", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Silk PLA @BBL X1.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Silk PLA @BBL X1.json index 673407ee17..fc66735eb5 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Silk PLA @BBL X1.json @@ -3,7 +3,7 @@ "name": "Overture Silk PLA @BBL X1", "inherits": "Overture Silk PLA @base", "from": "system", - "setting_id": "GFOT002_06", + "setting_id": "dCmwz1TxVv1k4nrj", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Silk PLA @BBL X1C 0.2 nozzle.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Silk PLA @BBL X1C 0.2 nozzle.json index e5ef452f46..033c200681 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Silk PLA @BBL X1C 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture Silk PLA @BBL X1C 0.2 nozzle", "inherits": "Overture Silk PLA @base", "from": "system", - "setting_id": "GFOT002_09", + "setting_id": "wZZy64Zqs8K4jP9J", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Silk PLA @BBL X1C.json similarity index 94% rename from resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Silk PLA @BBL X1C.json index 419c96e79f..3efefaf2fc 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Silk PLA @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Silk PLA @BBL X1C.json @@ -3,7 +3,7 @@ "name": "Overture Silk PLA @BBL X1C", "inherits": "Overture Silk PLA @base", "from": "system", - "setting_id": "GFOT002_08", + "setting_id": "tIykohBzOGcn12G4", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Super PLA+ @BBL A1 0.2 nozzle.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Super PLA+ @BBL A1 0.2 nozzle.json index 4ddcd5b2e2..07a2549567 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Super PLA+ @BBL A1 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture Super PLA+ @BBL A1 0.2 nozzle", "inherits": "Overture Super PLA+ @base", "from": "system", - "setting_id": "GFOT005_01", + "setting_id": "WGfgpz40PV9Ru7Zt", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Super PLA+ @BBL A1.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Super PLA+ @BBL A1.json index 9ce608984d..59e0030198 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Super PLA+ @BBL A1.json @@ -3,7 +3,7 @@ "name": "Overture Super PLA+ @BBL A1", "inherits": "Overture Super PLA+ @base", "from": "system", - "setting_id": "GFOT005_00", + "setting_id": "f0PblNsW9q7iGZxH", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Super PLA+ @BBL A1M 0.2 nozzle.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Super PLA+ @BBL A1M 0.2 nozzle.json index 709fe09c58..a90597f317 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Super PLA+ @BBL A1M 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture Super PLA+ @BBL A1M 0.2 nozzle", "inherits": "Overture Super PLA+ @base", "from": "system", - "setting_id": "GFOT005_03", + "setting_id": "kV0ZlvVhOwzTcc9u", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Super PLA+ @BBL A1M.json similarity index 93% rename from resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Super PLA+ @BBL A1M.json index 0e45b6901b..9dd8261e1e 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Super PLA+ @BBL A1M.json @@ -3,7 +3,7 @@ "name": "Overture Super PLA+ @BBL A1M", "inherits": "Overture Super PLA+ @base", "from": "system", - "setting_id": "GFOT005_02", + "setting_id": "4D70u7cXRWqDdbEN", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Super PLA+ @BBL P1P 0.2 nozzle.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Super PLA+ @BBL P1P 0.2 nozzle.json index 0e425bdac8..451593ab27 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Super PLA+ @BBL P1P 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture Super PLA+ @BBL P1P 0.2 nozzle", "inherits": "Overture Super PLA+ @base", "from": "system", - "setting_id": "GFOT005_05", + "setting_id": "rdS6sZ5bnMnNVI38", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Super PLA+ @BBL P1P.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Super PLA+ @BBL P1P.json index 92554e2dd7..e72b63ac39 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Super PLA+ @BBL P1P.json @@ -3,7 +3,7 @@ "name": "Overture Super PLA+ @BBL P1P", "inherits": "Overture Super PLA+ @base", "from": "system", - "setting_id": "GFOT005_04", + "setting_id": "Lm4gFcVAQrwCbQpJ", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Super PLA+ @BBL X1 0.2 nozzle.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Super PLA+ @BBL X1 0.2 nozzle.json index 70e034c186..e86479ca76 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Super PLA+ @BBL X1 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture Super PLA+ @BBL X1 0.2 nozzle", "inherits": "Overture Super PLA+ @base", "from": "system", - "setting_id": "GFOT005_07", + "setting_id": "rjQvmZrLs2JgPa5G", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Super PLA+ @BBL X1.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Super PLA+ @BBL X1.json index b6c52b1ea8..e0b5a34861 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Super PLA+ @BBL X1.json @@ -3,7 +3,7 @@ "name": "Overture Super PLA+ @BBL X1", "inherits": "Overture Super PLA+ @base", "from": "system", - "setting_id": "GFOT005_06", + "setting_id": "oGCZ4MSkwNzAvPbk", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Super PLA+ @BBL X1C 0.2 nozzle.json similarity index 93% rename from resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Super PLA+ @BBL X1C 0.2 nozzle.json index 51b2c733ee..df71a69633 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Super PLA+ @BBL X1C 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture Super PLA+ @BBL X1C 0.2 nozzle", "inherits": "Overture Super PLA+ @base", "from": "system", - "setting_id": "GFOT005_09", + "setting_id": "J9fImqGnYoSpSs9W", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Super PLA+ @BBL X1C.json similarity index 94% rename from resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Super PLA+ @BBL X1C.json index b6982e47a0..d82b6bec09 100644 --- a/resources/profiles/BBL/filament/Overture/Overture Super PLA+ @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture Super PLA+ @BBL X1C.json @@ -3,7 +3,7 @@ "name": "Overture Super PLA+ @BBL X1C", "inherits": "Overture Super PLA+ @base", "from": "system", - "setting_id": "GFOT005_08", + "setting_id": "Pg160F3SwSEQePIv", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture TPU @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture TPU @BBL A1 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/Overture/Overture TPU @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture TPU @BBL A1 0.2 nozzle.json index 0f6a00d64a..bd24bde2ba 100644 --- a/resources/profiles/BBL/filament/Overture/Overture TPU @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture TPU @BBL A1 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture TPU @BBL A1 0.2 nozzle", "inherits": "Overture TPU @base", "from": "system", - "setting_id": "GFOT008_01", + "setting_id": "Joam1aSO8dvTmJhx", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Overture/Overture TPU @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture TPU @BBL A1.json similarity index 91% rename from resources/profiles/BBL/filament/Overture/Overture TPU @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture TPU @BBL A1.json index d9b354d6bc..cbd7a4a46f 100644 --- a/resources/profiles/BBL/filament/Overture/Overture TPU @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture TPU @BBL A1.json @@ -3,7 +3,7 @@ "name": "Overture TPU @BBL A1", "inherits": "Overture TPU @base", "from": "system", - "setting_id": "GFOT008_00", + "setting_id": "6ff8qgjKmzyaMfEs", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture TPU @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture TPU @BBL A1M 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/Overture/Overture TPU @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture TPU @BBL A1M 0.2 nozzle.json index 43f9df80a9..37b08df2a8 100644 --- a/resources/profiles/BBL/filament/Overture/Overture TPU @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture TPU @BBL A1M 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture TPU @BBL A1M 0.2 nozzle", "inherits": "Overture TPU @base", "from": "system", - "setting_id": "GFOT008_03", + "setting_id": "ivfbVD3bPoUyvP0s", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Overture/Overture TPU @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture TPU @BBL A1M.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture TPU @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture TPU @BBL A1M.json index 55be8761be..884583f481 100644 --- a/resources/profiles/BBL/filament/Overture/Overture TPU @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture TPU @BBL A1M.json @@ -3,7 +3,7 @@ "name": "Overture TPU @BBL A1M", "inherits": "Overture TPU @base", "from": "system", - "setting_id": "GFOT008_02", + "setting_id": "XGXmvtOIxwC6QU6p", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture TPU @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture TPU @BBL P1P 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/Overture/Overture TPU @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture TPU @BBL P1P 0.2 nozzle.json index 8f906df48d..5f67e51cb1 100644 --- a/resources/profiles/BBL/filament/Overture/Overture TPU @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture TPU @BBL P1P 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture TPU @BBL P1P 0.2 nozzle", "inherits": "Overture TPU @base", "from": "system", - "setting_id": "GFOT008_05", + "setting_id": "Eov2TNCnSl1cmOWA", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Overture/Overture TPU @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture TPU @BBL P1P.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture TPU @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture TPU @BBL P1P.json index 9d25d70806..984b4c351c 100644 --- a/resources/profiles/BBL/filament/Overture/Overture TPU @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture TPU @BBL P1P.json @@ -3,7 +3,7 @@ "name": "Overture TPU @BBL P1P", "inherits": "Overture TPU @base", "from": "system", - "setting_id": "GFOT008_04", + "setting_id": "ZqdxAsj5MYTV6Fyn", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture TPU @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture TPU @BBL X1 0.2 nozzle.json similarity index 91% rename from resources/profiles/BBL/filament/Overture/Overture TPU @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture TPU @BBL X1 0.2 nozzle.json index 1f50237b49..a60623e77d 100644 --- a/resources/profiles/BBL/filament/Overture/Overture TPU @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture TPU @BBL X1 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture TPU @BBL X1 0.2 nozzle", "inherits": "Overture TPU @base", "from": "system", - "setting_id": "GFOT008_07", + "setting_id": "YuUN1xxe8zInAObb", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Overture/Overture TPU @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture TPU @BBL X1.json similarity index 91% rename from resources/profiles/BBL/filament/Overture/Overture TPU @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture TPU @BBL X1.json index 0e676f6fbf..7358d45849 100644 --- a/resources/profiles/BBL/filament/Overture/Overture TPU @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture TPU @BBL X1.json @@ -3,7 +3,7 @@ "name": "Overture TPU @BBL X1", "inherits": "Overture TPU @base", "from": "system", - "setting_id": "GFOT008_06", + "setting_id": "PURuOPM03EAwfxRq", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture TPU @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture TPU @BBL X1C 0.2 nozzle.json similarity index 92% rename from resources/profiles/BBL/filament/Overture/Overture TPU @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture TPU @BBL X1C 0.2 nozzle.json index 0fbae23716..88658fc933 100644 --- a/resources/profiles/BBL/filament/Overture/Overture TPU @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture TPU @BBL X1C 0.2 nozzle.json @@ -3,7 +3,7 @@ "name": "Overture TPU @BBL X1C 0.2 nozzle", "inherits": "Overture TPU @base", "from": "system", - "setting_id": "GFOT008_09", + "setting_id": "PXWDk0asjkBa2I9g", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/Overture/Overture TPU @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture TPU @BBL X1C.json similarity index 94% rename from resources/profiles/BBL/filament/Overture/Overture TPU @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture TPU @BBL X1C.json index 68dcbaa3fd..e8beca31f9 100644 --- a/resources/profiles/BBL/filament/Overture/Overture TPU @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Overture/BBL/Overture TPU @BBL X1C.json @@ -3,7 +3,7 @@ "name": "Overture TPU @BBL X1C", "inherits": "Overture TPU @base", "from": "system", - "setting_id": "GFOT008_08", + "setting_id": "JkPJzKrOYYS3RsnL", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Fiberon PA12-CF10 @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Fiberon PA12-CF10 @BBL X1.json similarity index 91% rename from resources/profiles/BBL/filament/Polymaker/Fiberon PA12-CF10 @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Fiberon PA12-CF10 @BBL X1.json index 225e12d539..520c97c01d 100644 --- a/resources/profiles/BBL/filament/Polymaker/Fiberon PA12-CF10 @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Fiberon PA12-CF10 @BBL X1.json @@ -3,7 +3,7 @@ "name": "Fiberon PA12-CF10 @BBL X1", "inherits": "Fiberon PA12-CF10 @base", "from": "system", - "setting_id": "GFSL56_00", + "setting_id": "iK97kha1pRV62Yhj", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Fiberon PA6-CF20 @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Fiberon PA6-CF20 @BBL X1.json similarity index 91% rename from resources/profiles/BBL/filament/Polymaker/Fiberon PA6-CF20 @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Fiberon PA6-CF20 @BBL X1.json index ce552a17e6..6d2dc16779 100644 --- a/resources/profiles/BBL/filament/Polymaker/Fiberon PA6-CF20 @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Fiberon PA6-CF20 @BBL X1.json @@ -3,7 +3,7 @@ "name": "Fiberon PA6-CF20 @BBL X1", "inherits": "Fiberon PA6-CF20 @base", "from": "system", - "setting_id": "GFSL57_00", + "setting_id": "oXBzN409HuCA9c3X", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Fiberon PA6-GF25 @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Fiberon PA6-GF25 @BBL X1.json similarity index 91% rename from resources/profiles/BBL/filament/Polymaker/Fiberon PA6-GF25 @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Fiberon PA6-GF25 @BBL X1.json index 7c03b332b7..c61073f36e 100644 --- a/resources/profiles/BBL/filament/Polymaker/Fiberon PA6-GF25 @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Fiberon PA6-GF25 @BBL X1.json @@ -3,7 +3,7 @@ "name": "Fiberon PA6-GF25 @BBL X1", "inherits": "Fiberon PA6-GF25 @base", "from": "system", - "setting_id": "GFSL58_00", + "setting_id": "tv24rlJLXAHNYOrf", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Fiberon PA612-CF15 @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Fiberon PA612-CF15 @BBL X1.json similarity index 91% rename from resources/profiles/BBL/filament/Polymaker/Fiberon PA612-CF15 @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Fiberon PA612-CF15 @BBL X1.json index a33b87e835..fe7e671ffa 100644 --- a/resources/profiles/BBL/filament/Polymaker/Fiberon PA612-CF15 @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Fiberon PA612-CF15 @BBL X1.json @@ -3,7 +3,7 @@ "name": "Fiberon PA612-CF15 @BBL X1", "inherits": "Fiberon PA612-CF15 @base", "from": "system", - "setting_id": "GFSL59_00", + "setting_id": "zsBPiVizpWSR58Ri", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Fiberon PET-CF17 @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Fiberon PET-CF17 @BBL X1.json similarity index 96% rename from resources/profiles/BBL/filament/Polymaker/Fiberon PET-CF17 @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Fiberon PET-CF17 @BBL X1.json index 4661fc9dfc..dc84326688 100644 --- a/resources/profiles/BBL/filament/Polymaker/Fiberon PET-CF17 @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Fiberon PET-CF17 @BBL X1.json @@ -3,7 +3,7 @@ "name": "Fiberon PET-CF17 @BBL X1", "inherits": "Fiberon PET-CF17 @base", "from": "system", - "setting_id": "GFSL60_00", + "setting_id": "6Roq8NKQujI03Xzb", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Fiberon PETG-ESD @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Fiberon PETG-ESD @BBL X1.json similarity index 85% rename from resources/profiles/BBL/filament/Polymaker/Fiberon PETG-ESD @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Fiberon PETG-ESD @BBL X1.json index 6d72159532..99fcec0536 100644 --- a/resources/profiles/BBL/filament/Polymaker/Fiberon PETG-ESD @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Fiberon PETG-ESD @BBL X1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Fiberon PETG-ESD @BBL X1", - "inherits": "Fiberon PETG-ESD @base", + "inherits": "Fiberon PETG-ESD @BBL base", "from": "system", - "setting_id": "GFSL06_01", + "setting_id": "C2HT9Y3AUpOQ1hXy", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Fiberon PETG-ESD @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Fiberon PETG-ESD @BBL base.json new file mode 100644 index 0000000000..26367622de --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Fiberon PETG-ESD @BBL base.json @@ -0,0 +1,59 @@ +{ + "type": "filament", + "name": "Fiberon PETG-ESD @BBL base", + "inherits": "Fiberon PETG-ESD @base", + "from": "system", + "instantiation": "false", + "close_additional_fan_first_x_layers": [ + "3" + ], + "filament_adhesiveness_category": [ + "300" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "75" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "65", + "55", + "55" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "80" + ], + "filament_dev_drying_cooling_temperature": [ + "55" + ], + "filament_dev_drying_softening_temperature": [ + "60" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/BBL/filament/Polymaker/Fiberon PETG-rCF08 @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Fiberon PETG-rCF08 @BBL X1.json similarity index 98% rename from resources/profiles/BBL/filament/Polymaker/Fiberon PETG-rCF08 @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Fiberon PETG-rCF08 @BBL X1.json index 264472679c..12fc28a3b3 100644 --- a/resources/profiles/BBL/filament/Polymaker/Fiberon PETG-rCF08 @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Fiberon PETG-rCF08 @BBL X1.json @@ -3,7 +3,7 @@ "name": "Fiberon PETG-rCF08 @BBL X1", "inherits": "Fiberon PETG-rCF08 @base", "from": "system", - "setting_id": "GFSL61_00", + "setting_id": "jh9tJUTbisPNdlgS", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL A1 0.2 nozzle.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL A1 0.2 nozzle.json index 17723658e1..1942059805 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL A1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma CoPE @BBL A1 0.2 nozzle", - "inherits": "Panchroma CoPE @base", + "inherits": "Panchroma CoPE @BBL base", "from": "system", - "setting_id": "GFSPM016_01", + "setting_id": "qD6JA9FtX9LlQRjY", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL A1.json similarity index 91% rename from resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL A1.json index ec927bbc52..3949502dbe 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL A1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma CoPE @BBL A1", - "inherits": "Panchroma CoPE @base", + "inherits": "Panchroma CoPE @BBL base", "from": "system", - "setting_id": "GFSPM016_00", + "setting_id": "Lhxp7wzWfMqiUYsW", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL A1M 0.2 nozzle.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL A1M 0.2 nozzle.json index 6c28307dde..9a9476b5d7 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL A1M 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma CoPE @BBL A1M 0.2 nozzle", - "inherits": "Panchroma CoPE @base", + "inherits": "Panchroma CoPE @BBL base", "from": "system", - "setting_id": "GFSPM016_03", + "setting_id": "XIfGqJMiptV6ZgHl", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL A1M.json similarity index 91% rename from resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL A1M.json index 4857f27375..442de47db5 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL A1M.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma CoPE @BBL A1M", - "inherits": "Panchroma CoPE @base", + "inherits": "Panchroma CoPE @BBL base", "from": "system", - "setting_id": "GFSPM016_02", + "setting_id": "Xovp5RS0Bd9x4zbN", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL P1P 0.2 nozzle.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL P1P 0.2 nozzle.json index 902853fe07..5ad5ae0080 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL P1P 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma CoPE @BBL P1P 0.2 nozzle", - "inherits": "Panchroma CoPE @base", + "inherits": "Panchroma CoPE @BBL base", "from": "system", - "setting_id": "GFSPM016_05", + "setting_id": "pWCjS7hx9zYIDvqg", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL P1P.json similarity index 91% rename from resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL P1P.json index a33f7058de..d569c17314 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL P1P.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma CoPE @BBL P1P", - "inherits": "Panchroma CoPE @base", + "inherits": "Panchroma CoPE @BBL base", "from": "system", - "setting_id": "GFSPM016_04", + "setting_id": "1hUd7X4ZLN1fmoxj", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL X1 0.2 nozzle.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL X1 0.2 nozzle.json index fdc4ef045c..e25ca2b2aa 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL X1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma CoPE @BBL X1 0.2 nozzle", - "inherits": "Panchroma CoPE @base", + "inherits": "Panchroma CoPE @BBL base", "from": "system", - "setting_id": "GFSPM016_07", + "setting_id": "Ebl5q2HobL5n5kr0", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL X1.json similarity index 91% rename from resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL X1.json index 2251c3a170..7da192d7d2 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL X1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma CoPE @BBL X1", - "inherits": "Panchroma CoPE @base", + "inherits": "Panchroma CoPE @BBL base", "from": "system", - "setting_id": "GFSPM016_06", + "setting_id": "ybkf8gjoxusiAQph", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL X1C 0.2 nozzle.json similarity index 84% rename from resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL X1C 0.2 nozzle.json index 5294ca84e4..e6a47c969b 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL X1C 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma CoPE @BBL X1C 0.2 nozzle", - "inherits": "Panchroma CoPE @base", + "inherits": "Panchroma CoPE @BBL base", "from": "system", - "setting_id": "GFSPM016_09", + "setting_id": "N5ZsMGwX81KaREg0", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL X1C.json similarity index 88% rename from resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL X1C.json index 300be9e919..5c50a8898a 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma CoPE @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL X1C.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma CoPE @BBL X1C", - "inherits": "Panchroma CoPE @base", + "inherits": "Panchroma CoPE @BBL base", "from": "system", - "setting_id": "GFSPM016_08", + "setting_id": "bhe6owE7ZvcZR33I", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL base.json new file mode 100644 index 0000000000..8c0f134090 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma CoPE @BBL base.json @@ -0,0 +1,59 @@ +{ + "type": "filament", + "name": "Panchroma CoPE @BBL base", + "inherits": "Panchroma CoPE @base", + "from": "system", + "instantiation": "false", + "close_additional_fan_first_x_layers": [ + "3" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_max_volumetric_speed": [ + "24" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL A1 0.2 nozzle.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL A1 0.2 nozzle.json index afd1a28716..960b50781c 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL A1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA @BBL A1 0.2 nozzle", - "inherits": "Panchroma PLA @base", + "inherits": "Panchroma PLA @BBL base", "from": "system", - "setting_id": "GFSPM001_01", + "setting_id": "EcAyHYYBbwh0W7cv", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL A1.json similarity index 91% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL A1.json index 8460996ce9..10dfee2329 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL A1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA @BBL A1", - "inherits": "Panchroma PLA @base", + "inherits": "Panchroma PLA @BBL base", "from": "system", - "setting_id": "GFSPM001_00", + "setting_id": "o66PtkUZsIhPbkHO", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL A1M 0.2 nozzle.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL A1M 0.2 nozzle.json index 6dca0b3e8e..dacd19208d 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL A1M 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA @BBL A1M 0.2 nozzle", - "inherits": "Panchroma PLA @base", + "inherits": "Panchroma PLA @BBL base", "from": "system", - "setting_id": "GFSPM001_03", + "setting_id": "JNSUp4LzTjep3XoO", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL A1M.json similarity index 91% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL A1M.json index c592bdd1da..71cb670085 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL A1M.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA @BBL A1M", - "inherits": "Panchroma PLA @base", + "inherits": "Panchroma PLA @BBL base", "from": "system", - "setting_id": "GFSPM001_02", + "setting_id": "jW21lAphUo0cMqsl", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL P1P 0.2 nozzle.json similarity index 81% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL P1P 0.2 nozzle.json index 35f8d181b0..4ce3915b98 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL P1P 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA @BBL P1P 0.2 nozzle", - "inherits": "Panchroma PLA @base", + "inherits": "Panchroma PLA @BBL base", "from": "system", - "setting_id": "GFSPM001_05", + "setting_id": "Du0ZWcJNqd8W18Wh", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL P1P.json similarity index 90% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL P1P.json index 4f802b2f28..9bd4136dcb 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL P1P.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA @BBL P1P", - "inherits": "Panchroma PLA @base", + "inherits": "Panchroma PLA @BBL base", "from": "system", - "setting_id": "GFSPM001_04", + "setting_id": "u3UE6zNIEtdcpJab", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL X1 0.2 nozzle.json similarity index 81% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL X1 0.2 nozzle.json index 8ac58e3363..9d9cb008b2 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL X1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA @BBL X1 0.2 nozzle", - "inherits": "Panchroma PLA @base", + "inherits": "Panchroma PLA @BBL base", "from": "system", - "setting_id": "GFSPM001_07", + "setting_id": "9zGwmuNOrUdT3WNZ", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL X1.json similarity index 90% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL X1.json index 836f8c4cc7..caf04702a5 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL X1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA @BBL X1", - "inherits": "Panchroma PLA @base", + "inherits": "Panchroma PLA @BBL base", "from": "system", - "setting_id": "GFSPM001_06", + "setting_id": "409xnlGe1IzrXIPC", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL X1C 0.2 nozzle.json similarity index 83% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL X1C 0.2 nozzle.json index 25152f4be0..47977b6bc9 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL X1C 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA @BBL X1C 0.2 nozzle", - "inherits": "Panchroma PLA @base", + "inherits": "Panchroma PLA @BBL base", "from": "system", - "setting_id": "GFSPM001_09", + "setting_id": "SGPzwN6RFKai400f", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL X1C.json similarity index 88% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL X1C.json index 542d61a645..4907976e1d 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL X1C.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA @BBL X1C", - "inherits": "Panchroma PLA @base", + "inherits": "Panchroma PLA @BBL base", "from": "system", - "setting_id": "GFSPM001_08", + "setting_id": "RXeUIZvz0rlPHaqX", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL base.json new file mode 100644 index 0000000000..678d137b88 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA @BBL base.json @@ -0,0 +1,65 @@ +{ + "type": "filament", + "name": "Panchroma PLA @BBL base", + "inherits": "Panchroma PLA @base", + "from": "system", + "instantiation": "false", + "close_additional_fan_first_x_layers": [ + "3" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "filament_wipe": [ + "0" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL A1 0.2 nozzle.json similarity index 81% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL A1 0.2 nozzle.json index f968b7e6d7..db7cecd782 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL A1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Celestial @BBL A1 0.2 nozzle", - "inherits": "Panchroma PLA Celestial @base", + "inherits": "Panchroma PLA Celestial @BBL base", "from": "system", - "setting_id": "GFSPM008_01", + "setting_id": "rIAWIanchOslJupB", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL A1.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL A1.json index 6a34b19049..a2c80dd6ea 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL A1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Celestial @BBL A1", - "inherits": "Panchroma PLA Celestial @base", + "inherits": "Panchroma PLA Celestial @BBL base", "from": "system", - "setting_id": "GFSPM008_00", + "setting_id": "HDgCi6UfHZdjXDzr", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL A1M 0.2 nozzle.json similarity index 81% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL A1M 0.2 nozzle.json index 546a9f5218..2ade265aab 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL A1M 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Celestial @BBL A1M 0.2 nozzle", - "inherits": "Panchroma PLA Celestial @base", + "inherits": "Panchroma PLA Celestial @BBL base", "from": "system", - "setting_id": "GFSPM008_03", + "setting_id": "7VaribjbKdvyTwD4", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL A1M.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL A1M.json index 74aa730a03..93730978e9 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL A1M.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Celestial @BBL A1M", - "inherits": "Panchroma PLA Celestial @base", + "inherits": "Panchroma PLA Celestial @BBL base", "from": "system", - "setting_id": "GFSPM008_02", + "setting_id": "8ah5CAsPw9MmdkS1", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL P1P 0.2 nozzle.json similarity index 81% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL P1P 0.2 nozzle.json index 1770bfc6fc..4407c9a3ab 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL P1P 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Celestial @BBL P1P 0.2 nozzle", - "inherits": "Panchroma PLA Celestial @base", + "inherits": "Panchroma PLA Celestial @BBL base", "from": "system", - "setting_id": "GFSPM008_05", + "setting_id": "hgz8wyLSMeGXpVfM", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL P1P.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL P1P.json index 97c3558b2c..2661e9b46e 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL P1P.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Celestial @BBL P1P", - "inherits": "Panchroma PLA Celestial @base", + "inherits": "Panchroma PLA Celestial @BBL base", "from": "system", - "setting_id": "GFSPM008_04", + "setting_id": "NIFRCroV1KVjKF97", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL X1 0.2 nozzle.json similarity index 81% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL X1 0.2 nozzle.json index 9611e74064..50ddece26e 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL X1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Celestial @BBL X1 0.2 nozzle", - "inherits": "Panchroma PLA Celestial @base", + "inherits": "Panchroma PLA Celestial @BBL base", "from": "system", - "setting_id": "GFSPM008_07", + "setting_id": "ipgwBtocyVVSwJmb", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL X1.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL X1.json index ef1c0886e7..04e3588789 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL X1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Celestial @BBL X1", - "inherits": "Panchroma PLA Celestial @base", + "inherits": "Panchroma PLA Celestial @BBL base", "from": "system", - "setting_id": "GFSPM008_06", + "setting_id": "4FFTu7rnCK2ebMUJ", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL X1C 0.2 nozzle.json similarity index 83% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL X1C 0.2 nozzle.json index 3e31f69e9b..ef737817f1 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL X1C 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Celestial @BBL X1C 0.2 nozzle", - "inherits": "Panchroma PLA Celestial @base", + "inherits": "Panchroma PLA Celestial @BBL base", "from": "system", - "setting_id": "GFSPM008_09", + "setting_id": "JHISMlNlBTFJaGf0", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL X1C.json similarity index 87% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL X1C.json index 7e2eff119c..ab2d7cb3de 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Celestial @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL X1C.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Celestial @BBL X1C", - "inherits": "Panchroma PLA Celestial @base", + "inherits": "Panchroma PLA Celestial @BBL base", "from": "system", - "setting_id": "GFSPM008_08", + "setting_id": "d2X6FU4NkwHHaP1f", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL base.json new file mode 100644 index 0000000000..e6519aab8a --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Celestial @BBL base.json @@ -0,0 +1,59 @@ +{ + "type": "filament", + "name": "Panchroma PLA Celestial @BBL base", + "inherits": "Panchroma PLA Celestial @base", + "from": "system", + "instantiation": "false", + "close_additional_fan_first_x_layers": [ + "3" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL A1 0.2 nozzle.json similarity index 81% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL A1 0.2 nozzle.json index b9a1387c7d..3365bc8122 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL A1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Galaxy @BBL A1 0.2 nozzle", - "inherits": "Panchroma PLA Galaxy @base", + "inherits": "Panchroma PLA Galaxy @BBL base", "from": "system", - "setting_id": "GFSPM007_01", + "setting_id": "ZrOxMUGgsizajGy5", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL A1.json similarity index 90% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL A1.json index 2201897336..762c347447 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL A1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Galaxy @BBL A1", - "inherits": "Panchroma PLA Galaxy @base", + "inherits": "Panchroma PLA Galaxy @BBL base", "from": "system", - "setting_id": "GFSPM007_00", + "setting_id": "SBhUnTx3hn0BUZt7", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL A1M 0.2 nozzle.json similarity index 81% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL A1M 0.2 nozzle.json index cae0556865..bbfc74f8a9 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL A1M 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Galaxy @BBL A1M 0.2 nozzle", - "inherits": "Panchroma PLA Galaxy @base", + "inherits": "Panchroma PLA Galaxy @BBL base", "from": "system", - "setting_id": "GFSPM007_03", + "setting_id": "0pWJRx7TOMdsmNMl", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL A1M.json similarity index 90% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL A1M.json index 29a115d824..defebe61af 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL A1M.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Galaxy @BBL A1M", - "inherits": "Panchroma PLA Galaxy @base", + "inherits": "Panchroma PLA Galaxy @BBL base", "from": "system", - "setting_id": "GFSPM007_02", + "setting_id": "hdbXfBG9ybegQrYC", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL P1P 0.2 nozzle.json similarity index 81% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL P1P 0.2 nozzle.json index 5b5b20ed1e..0a97e15c8c 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL P1P 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Galaxy @BBL P1P 0.2 nozzle", - "inherits": "Panchroma PLA Galaxy @base", + "inherits": "Panchroma PLA Galaxy @BBL base", "from": "system", - "setting_id": "GFSPM007_05", + "setting_id": "t4aSBTluntMqFXVx", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL P1P.json similarity index 90% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL P1P.json index a5bda6970b..2af46fc880 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL P1P.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Galaxy @BBL P1P", - "inherits": "Panchroma PLA Galaxy @base", + "inherits": "Panchroma PLA Galaxy @BBL base", "from": "system", - "setting_id": "GFSPM007_04", + "setting_id": "5G4872zbCMhL2AfW", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL X1 0.2 nozzle.json similarity index 81% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL X1 0.2 nozzle.json index 39167dd06d..3a462dcc96 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL X1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Galaxy @BBL X1 0.2 nozzle", - "inherits": "Panchroma PLA Galaxy @base", + "inherits": "Panchroma PLA Galaxy @BBL base", "from": "system", - "setting_id": "GFSPM007_07", + "setting_id": "cnP7n2P50AAugJIM", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL X1.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL X1.json index c36bf6bf63..f85d6fcd68 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL X1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Galaxy @BBL X1", - "inherits": "Panchroma PLA Galaxy @base", + "inherits": "Panchroma PLA Galaxy @BBL base", "from": "system", - "setting_id": "GFSPM007_06", + "setting_id": "KkNb6pbD1nfB0hab", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL X1C 0.2 nozzle.json similarity index 84% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL X1C 0.2 nozzle.json index 2e6def811d..d09e0c31a5 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL X1C 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Galaxy @BBL X1C 0.2 nozzle", - "inherits": "Panchroma PLA Galaxy @base", + "inherits": "Panchroma PLA Galaxy @BBL base", "from": "system", - "setting_id": "GFSPM007_09", + "setting_id": "hw5cUrvg4USa0PGq", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL X1C.json similarity index 88% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL X1C.json index 01e13b013b..f1c0770442 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Galaxy @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL X1C.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Galaxy @BBL X1C", - "inherits": "Panchroma PLA Galaxy @base", + "inherits": "Panchroma PLA Galaxy @BBL base", "from": "system", - "setting_id": "GFSPM007_08", + "setting_id": "DYAuEfsNR9uFeu8B", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL base.json new file mode 100644 index 0000000000..9b2179bb1f --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Galaxy @BBL base.json @@ -0,0 +1,59 @@ +{ + "type": "filament", + "name": "Panchroma PLA Galaxy @BBL base", + "inherits": "Panchroma PLA Galaxy @base", + "from": "system", + "instantiation": "false", + "close_additional_fan_first_x_layers": [ + "3" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL A1 0.2 nozzle.json similarity index 83% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL A1 0.2 nozzle.json index dadf681d5b..4e88a9b087 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL A1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Glow @BBL A1 0.2 nozzle", - "inherits": "Panchroma PLA Glow @base", + "inherits": "Panchroma PLA Glow @BBL base", "from": "system", - "setting_id": "GFSPM010_01", + "setting_id": "yIA49PJ8keAftG2V", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL A1.json similarity index 90% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL A1.json index 29aa7205ee..3fc88e67fc 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL A1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Glow @BBL A1", - "inherits": "Panchroma PLA Glow @base", + "inherits": "Panchroma PLA Glow @BBL base", "from": "system", - "setting_id": "GFSPM010_00", + "setting_id": "fekuuLTiJQoB1g7X", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL A1M 0.2 nozzle.json similarity index 83% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL A1M 0.2 nozzle.json index dc9f4fab28..ea4226ed27 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL A1M 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Glow @BBL A1M 0.2 nozzle", - "inherits": "Panchroma PLA Glow @base", + "inherits": "Panchroma PLA Glow @BBL base", "from": "system", - "setting_id": "GFSPM010_03", + "setting_id": "kbweRw9oFJKMEvDZ", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL A1M.json similarity index 90% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL A1M.json index d07309eef6..c99f50a841 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL A1M.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Glow @BBL A1M", - "inherits": "Panchroma PLA Glow @base", + "inherits": "Panchroma PLA Glow @BBL base", "from": "system", - "setting_id": "GFSPM010_02", + "setting_id": "IknQVZ1JKDhWNjhR", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL P1P 0.2 nozzle.json similarity index 83% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL P1P 0.2 nozzle.json index 3e6c0fb5d3..30dd7aeedb 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL P1P 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Glow @BBL P1P 0.2 nozzle", - "inherits": "Panchroma PLA Glow @base", + "inherits": "Panchroma PLA Glow @BBL base", "from": "system", - "setting_id": "GFSPM010_05", + "setting_id": "PVxGiD5EsfILtoXr", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL P1P.json similarity index 90% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL P1P.json index c81ef58f9c..5538a0c2e2 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL P1P.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Glow @BBL P1P", - "inherits": "Panchroma PLA Glow @base", + "inherits": "Panchroma PLA Glow @BBL base", "from": "system", - "setting_id": "GFSPM010_04", + "setting_id": "09YUARvE0trJdL9W", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL X1 0.2 nozzle.json similarity index 83% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL X1 0.2 nozzle.json index 376c88decd..312820e515 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL X1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Glow @BBL X1 0.2 nozzle", - "inherits": "Panchroma PLA Glow @base", + "inherits": "Panchroma PLA Glow @BBL base", "from": "system", - "setting_id": "GFSPM010_07", + "setting_id": "djzqnlITUbE88XaR", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL X1.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL X1.json index 10701cfc01..1dedfbbcbe 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL X1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Glow @BBL X1", - "inherits": "Panchroma PLA Glow @base", + "inherits": "Panchroma PLA Glow @BBL base", "from": "system", - "setting_id": "GFSPM010_06", + "setting_id": "45ePNVRJQTB9RfK6", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL X1C 0.2 nozzle.json similarity index 85% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL X1C 0.2 nozzle.json index 277e90e9f7..47e1816e91 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL X1C 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Glow @BBL X1C 0.2 nozzle", - "inherits": "Panchroma PLA Glow @base", + "inherits": "Panchroma PLA Glow @BBL base", "from": "system", - "setting_id": "GFSPM010_09", + "setting_id": "5gNvQlBSR7uJpdfZ", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL X1C.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL X1C.json index 1c5af79b77..a07275076d 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Glow @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL X1C.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Glow @BBL X1C", - "inherits": "Panchroma PLA Glow @base", + "inherits": "Panchroma PLA Glow @BBL base", "from": "system", - "setting_id": "GFSPM010_08", + "setting_id": "GwpJCEpzSLf6WQPM", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL base.json new file mode 100644 index 0000000000..66685f2324 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Glow @BBL base.json @@ -0,0 +1,59 @@ +{ + "type": "filament", + "name": "Panchroma PLA Glow @BBL base", + "inherits": "Panchroma PLA Glow @base", + "from": "system", + "instantiation": "false", + "close_additional_fan_first_x_layers": [ + "3" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL A1 0.2 nozzle.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL A1 0.2 nozzle.json index d33e7192de..f97ab3fe9d 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL A1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Luminous @BBL A1 0.2 nozzle", - "inherits": "Panchroma PLA Luminous @base", + "inherits": "Panchroma PLA Luminous @BBL base", "from": "system", - "setting_id": "GFSPM011_01", + "setting_id": "Gm0V2yS38B73lzej", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL A1.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL A1.json index 4da92b5a04..615c17f131 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL A1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Luminous @BBL A1", - "inherits": "Panchroma PLA Luminous @base", + "inherits": "Panchroma PLA Luminous @BBL base", "from": "system", - "setting_id": "GFSPM011_00", + "setting_id": "cNayl2LdadgzGPIu", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL A1M 0.2 nozzle.json similarity index 83% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL A1M 0.2 nozzle.json index 4701429827..8622522aa4 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL A1M 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Luminous @BBL A1M 0.2 nozzle", - "inherits": "Panchroma PLA Luminous @base", + "inherits": "Panchroma PLA Luminous @BBL base", "from": "system", - "setting_id": "GFSPM011_03", + "setting_id": "svpeogHNJpG6OJcs", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL A1M.json similarity index 90% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL A1M.json index e121d53f7d..391098c405 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL A1M.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Luminous @BBL A1M", - "inherits": "Panchroma PLA Luminous @base", + "inherits": "Panchroma PLA Luminous @BBL base", "from": "system", - "setting_id": "GFSPM011_02", + "setting_id": "eZXv92vdqjhAMw8d", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL P1P 0.2 nozzle.json similarity index 83% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL P1P 0.2 nozzle.json index fd3b873bb2..df695ab23b 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL P1P 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Luminous @BBL P1P 0.2 nozzle", - "inherits": "Panchroma PLA Luminous @base", + "inherits": "Panchroma PLA Luminous @BBL base", "from": "system", - "setting_id": "GFSPM011_05", + "setting_id": "iq98CGGzUCwjBNJ3", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL P1P.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL P1P.json index f15189902b..4649b9a73e 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL P1P.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Luminous @BBL P1P", - "inherits": "Panchroma PLA Luminous @base", + "inherits": "Panchroma PLA Luminous @BBL base", "from": "system", - "setting_id": "GFSPM011_04", + "setting_id": "CyVrwfMZwfYtiqKh", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL X1 0.2 nozzle.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL X1 0.2 nozzle.json index 1a506784f0..eb5634ab03 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL X1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Luminous @BBL X1 0.2 nozzle", - "inherits": "Panchroma PLA Luminous @base", + "inherits": "Panchroma PLA Luminous @BBL base", "from": "system", - "setting_id": "GFSPM011_07", + "setting_id": "wLKtViV6H7LzbbzO", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL X1.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL X1.json index db9dcf9269..5b500d904e 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL X1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Luminous @BBL X1", - "inherits": "Panchroma PLA Luminous @base", + "inherits": "Panchroma PLA Luminous @BBL base", "from": "system", - "setting_id": "GFSPM011_06", + "setting_id": "pbsffX1Tn2uZBQAC", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL X1C 0.2 nozzle.json similarity index 85% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL X1C 0.2 nozzle.json index 98f9ce2376..da45931ab7 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL X1C 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Luminous @BBL X1C 0.2 nozzle", - "inherits": "Panchroma PLA Luminous @base", + "inherits": "Panchroma PLA Luminous @BBL base", "from": "system", - "setting_id": "GFSPM011_09", + "setting_id": "dBfdr3XSx2Ycs0t1", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL X1C.json similarity index 88% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL X1C.json index 9134015573..013a8709e5 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Luminous @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL X1C.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Luminous @BBL X1C", - "inherits": "Panchroma PLA Luminous @base", + "inherits": "Panchroma PLA Luminous @BBL base", "from": "system", - "setting_id": "GFSPM011_08", + "setting_id": "FR0NsZuwXmyydY91", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL base.json new file mode 100644 index 0000000000..0cbb162fe3 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Luminous @BBL base.json @@ -0,0 +1,59 @@ +{ + "type": "filament", + "name": "Panchroma PLA Luminous @BBL base", + "inherits": "Panchroma PLA Luminous @base", + "from": "system", + "instantiation": "false", + "close_additional_fan_first_x_layers": [ + "3" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL A1 0.2 nozzle.json similarity index 81% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL A1 0.2 nozzle.json index a5ddad4353..ae607f61e7 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL A1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Marble @BBL A1 0.2 nozzle", - "inherits": "Panchroma PLA Marble @base", + "inherits": "Panchroma PLA Marble @BBL base", "from": "system", - "setting_id": "GFSPM003_01", + "setting_id": "R6T9OGfLgYyuJQQV", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL A1.json similarity index 91% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL A1.json index e18cf6058f..b00e3ac4d5 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL A1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Marble @BBL A1", - "inherits": "Panchroma PLA Marble @base", + "inherits": "Panchroma PLA Marble @BBL base", "from": "system", - "setting_id": "GFSPM003_00", + "setting_id": "74wdx9EmWTPhMgGp", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL A1M 0.2 nozzle.json similarity index 81% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL A1M 0.2 nozzle.json index 298b3f0830..f73242632a 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL A1M 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Marble @BBL A1M 0.2 nozzle", - "inherits": "Panchroma PLA Marble @base", + "inherits": "Panchroma PLA Marble @BBL base", "from": "system", - "setting_id": "GFSPM003_03", + "setting_id": "JGiyk0wyB9sND2BX", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL A1M.json similarity index 91% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL A1M.json index 0cddd47a22..a694565762 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL A1M.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Marble @BBL A1M", - "inherits": "Panchroma PLA Marble @base", + "inherits": "Panchroma PLA Marble @BBL base", "from": "system", - "setting_id": "GFSPM003_02", + "setting_id": "TV9TVGXyBgKJjLj4", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL P1P 0.2 nozzle.json similarity index 81% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL P1P 0.2 nozzle.json index 70b8f89852..0f233b0b14 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL P1P 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Marble @BBL P1P 0.2 nozzle", - "inherits": "Panchroma PLA Marble @base", + "inherits": "Panchroma PLA Marble @BBL base", "from": "system", - "setting_id": "GFSPM003_05", + "setting_id": "xmuKHrKm68rk6LGG", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL P1P.json similarity index 90% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL P1P.json index e67d08514c..ecf207c701 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL P1P.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Marble @BBL P1P", - "inherits": "Panchroma PLA Marble @base", + "inherits": "Panchroma PLA Marble @BBL base", "from": "system", - "setting_id": "GFSPM003_04", + "setting_id": "AiUXencnnJ8dsI3G", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL X1 0.2 nozzle.json similarity index 81% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL X1 0.2 nozzle.json index 8e8e4e4e84..a435975aed 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL X1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Marble @BBL X1 0.2 nozzle", - "inherits": "Panchroma PLA Marble @base", + "inherits": "Panchroma PLA Marble @BBL base", "from": "system", - "setting_id": "GFSPM003_07", + "setting_id": "OHXft04xIKN5AtVc", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL X1.json similarity index 90% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL X1.json index 8f85dff8df..632b5488e7 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL X1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Marble @BBL X1", - "inherits": "Panchroma PLA Marble @base", + "inherits": "Panchroma PLA Marble @BBL base", "from": "system", - "setting_id": "GFSPM003_06", + "setting_id": "FTcxWNxE7TXZvX9g", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL X1C 0.2 nozzle.json similarity index 84% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL X1C 0.2 nozzle.json index 6a83b160a7..7492f0474e 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL X1C 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Marble @BBL X1C 0.2 nozzle", - "inherits": "Panchroma PLA Marble @base", + "inherits": "Panchroma PLA Marble @BBL base", "from": "system", - "setting_id": "GFSPM003_09", + "setting_id": "X610ITrFop4MDa77", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL X1C.json similarity index 88% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL X1C.json index f9c4181158..446522db10 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Marble @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL X1C.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Marble @BBL X1C", - "inherits": "Panchroma PLA Marble @base", + "inherits": "Panchroma PLA Marble @BBL base", "from": "system", - "setting_id": "GFSPM003_08", + "setting_id": "2mvGOjwoOrlKnLZD", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL base.json new file mode 100644 index 0000000000..77f862243e --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Marble @BBL base.json @@ -0,0 +1,62 @@ +{ + "type": "filament", + "name": "Panchroma PLA Marble @BBL base", + "inherits": "Panchroma PLA Marble @base", + "from": "system", + "instantiation": "false", + "close_additional_fan_first_x_layers": [ + "3" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_max_volumetric_speed": [ + "22" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_min_speed": [ + "20" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL A1 0.2 nozzle.json similarity index 81% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL A1 0.2 nozzle.json index de3a7c35e1..44e22c2015 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL A1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Matte @BBL A1 0.2 nozzle", - "inherits": "Panchroma PLA Matte @base", + "inherits": "Panchroma PLA Matte @BBL base", "from": "system", - "setting_id": "GFSPM002_01", + "setting_id": "feUwXmzCUHI8Ani5", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL A1.json similarity index 91% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL A1.json index 905b6e8624..fe82cc670d 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL A1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Matte @BBL A1", - "inherits": "Panchroma PLA Matte @base", + "inherits": "Panchroma PLA Matte @BBL base", "from": "system", - "setting_id": "GFSPM002_00", + "setting_id": "LCcphd1X1Id1EY7i", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL A1M 0.2 nozzle.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL A1M 0.2 nozzle.json index 9f0e3b708e..86618b113d 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL A1M 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Matte @BBL A1M 0.2 nozzle", - "inherits": "Panchroma PLA Matte @base", + "inherits": "Panchroma PLA Matte @BBL base", "from": "system", - "setting_id": "GFSPM002_03", + "setting_id": "U9z6EWwT6wjpR7HL", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL A1M.json similarity index 91% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL A1M.json index 2bd26f4411..e359124d5b 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL A1M.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Matte @BBL A1M", - "inherits": "Panchroma PLA Matte @base", + "inherits": "Panchroma PLA Matte @BBL base", "from": "system", - "setting_id": "GFSPM002_02", + "setting_id": "p7NNq8w4i95ofi0p", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL P1P 0.2 nozzle.json similarity index 81% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL P1P 0.2 nozzle.json index 5f6a0bea90..56c2f2dedc 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL P1P 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Matte @BBL P1P 0.2 nozzle", - "inherits": "Panchroma PLA Matte @base", + "inherits": "Panchroma PLA Matte @BBL base", "from": "system", - "setting_id": "GFSPM002_05", + "setting_id": "35T8Ez3Y9PToAZSa", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL P1P.json similarity index 91% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL P1P.json index 4100fe84ab..55f0d71f82 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL P1P.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Matte @BBL P1P", - "inherits": "Panchroma PLA Matte @base", + "inherits": "Panchroma PLA Matte @BBL base", "from": "system", - "setting_id": "GFSPM002_04", + "setting_id": "GjYsfwFb1rjW2HWh", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL X1 0.2 nozzle.json similarity index 81% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL X1 0.2 nozzle.json index 26219eeffa..af771680cb 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL X1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Matte @BBL X1 0.2 nozzle", - "inherits": "Panchroma PLA Matte @base", + "inherits": "Panchroma PLA Matte @BBL base", "from": "system", - "setting_id": "GFSPM002_07", + "setting_id": "UIBovjt1ahFJMP3C", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL X1.json similarity index 90% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL X1.json index 6901a33b60..b66e36e578 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL X1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Matte @BBL X1", - "inherits": "Panchroma PLA Matte @base", + "inherits": "Panchroma PLA Matte @BBL base", "from": "system", - "setting_id": "GFSPM002_06", + "setting_id": "iaQKkGk4P0Fmwczg", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL X1C 0.2 nozzle.json similarity index 84% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL X1C 0.2 nozzle.json index 2ef1da596c..8bd5609b00 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL X1C 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Matte @BBL X1C 0.2 nozzle", - "inherits": "Panchroma PLA Matte @base", + "inherits": "Panchroma PLA Matte @BBL base", "from": "system", - "setting_id": "GFSPM002_09", + "setting_id": "rrF1mxIIRougcDSP", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL X1C.json similarity index 88% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL X1C.json index bd3d25b3e6..7f162d80bf 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Matte @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL X1C.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Matte @BBL X1C", - "inherits": "Panchroma PLA Matte @base", + "inherits": "Panchroma PLA Matte @BBL base", "from": "system", - "setting_id": "GFSPM002_08", + "setting_id": "K3UxBLo5EwyO5RJH", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL base.json new file mode 100644 index 0000000000..d19670cc6e --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Matte @BBL base.json @@ -0,0 +1,62 @@ +{ + "type": "filament", + "name": "Panchroma PLA Matte @BBL base", + "inherits": "Panchroma PLA Matte @base", + "from": "system", + "instantiation": "false", + "close_additional_fan_first_x_layers": [ + "3" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_max_volumetric_speed": [ + "22" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_min_speed": [ + "20" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL A1 0.2 nozzle.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL A1 0.2 nozzle.json index e0e3f84b3d..074f6328a9 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL A1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Metallic @BBL A1 0.2 nozzle", - "inherits": "Panchroma PLA Metallic @base", + "inherits": "Panchroma PLA Metallic @BBL base", "from": "system", - "setting_id": "GFSPM012_01", + "setting_id": "8oiaDU9UY2x6kI6x", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL A1.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL A1.json index 546e7c323c..804b4c9444 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL A1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Metallic @BBL A1", - "inherits": "Panchroma PLA Metallic @base", + "inherits": "Panchroma PLA Metallic @BBL base", "from": "system", - "setting_id": "GFSPM012_00", + "setting_id": "7nQYDYBd96AF3H1C", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL A1M 0.2 nozzle.json similarity index 83% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL A1M 0.2 nozzle.json index deea2a43ed..103f582d97 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL A1M 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Metallic @BBL A1M 0.2 nozzle", - "inherits": "Panchroma PLA Metallic @base", + "inherits": "Panchroma PLA Metallic @BBL base", "from": "system", - "setting_id": "GFSPM012_03", + "setting_id": "Illg4tjxcHRlYb1n", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL A1M.json similarity index 90% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL A1M.json index f96e849799..88b432b6de 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL A1M.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Metallic @BBL A1M", - "inherits": "Panchroma PLA Metallic @base", + "inherits": "Panchroma PLA Metallic @BBL base", "from": "system", - "setting_id": "GFSPM012_02", + "setting_id": "tQfPV5JmDkRn2OOV", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL P1P 0.2 nozzle.json similarity index 83% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL P1P 0.2 nozzle.json index b2b5bd7776..918f3764ea 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL P1P 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Metallic @BBL P1P 0.2 nozzle", - "inherits": "Panchroma PLA Metallic @base", + "inherits": "Panchroma PLA Metallic @BBL base", "from": "system", - "setting_id": "GFSPM012_05", + "setting_id": "OI3pVdKp585lQcs9", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL P1P.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL P1P.json index a386ec3306..c4e7df4c22 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL P1P.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Metallic @BBL P1P", - "inherits": "Panchroma PLA Metallic @base", + "inherits": "Panchroma PLA Metallic @BBL base", "from": "system", - "setting_id": "GFSPM012_04", + "setting_id": "jYQVdc3W3vGJfDzz", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL X1 0.2 nozzle.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL X1 0.2 nozzle.json index c439b25f93..5c93a002aa 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL X1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Metallic @BBL X1 0.2 nozzle", - "inherits": "Panchroma PLA Metallic @base", + "inherits": "Panchroma PLA Metallic @BBL base", "from": "system", - "setting_id": "GFSPM012_07", + "setting_id": "KbzFSFJBykP6kZkL", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL X1.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL X1.json index ca62255017..f63b0e7852 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL X1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Metallic @BBL X1", - "inherits": "Panchroma PLA Metallic @base", + "inherits": "Panchroma PLA Metallic @BBL base", "from": "system", - "setting_id": "GFSPM012_06", + "setting_id": "l5X4qdMfFoyvDsqJ", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL X1C 0.2 nozzle.json similarity index 85% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL X1C 0.2 nozzle.json index 435ffab33f..0e871c4ae1 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL X1C 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Metallic @BBL X1C 0.2 nozzle", - "inherits": "Panchroma PLA Metallic @base", + "inherits": "Panchroma PLA Metallic @BBL base", "from": "system", - "setting_id": "GFSPM012_09", + "setting_id": "P9tuNS2IJYvkWdgK", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL X1C.json similarity index 88% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL X1C.json index bbb4f8a603..84e1cf33c8 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Metallic @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL X1C.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Metallic @BBL X1C", - "inherits": "Panchroma PLA Metallic @base", + "inherits": "Panchroma PLA Metallic @BBL base", "from": "system", - "setting_id": "GFSPM012_08", + "setting_id": "qHZ93iDrS0Yq0nve", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL base.json new file mode 100644 index 0000000000..aa2532e6b3 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Metallic @BBL base.json @@ -0,0 +1,59 @@ +{ + "type": "filament", + "name": "Panchroma PLA Metallic @BBL base", + "inherits": "Panchroma PLA Metallic @base", + "from": "system", + "instantiation": "false", + "close_additional_fan_first_x_layers": [ + "3" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL A1 0.2 nozzle.json similarity index 83% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL A1 0.2 nozzle.json index 05824a933b..c916a76c59 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL A1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Neon @BBL A1 0.2 nozzle", - "inherits": "Panchroma PLA Neon @base", + "inherits": "Panchroma PLA Neon @BBL base", "from": "system", - "setting_id": "GFSPM013_01", + "setting_id": "x8Legvhy2R0I1VAs", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL A1.json similarity index 90% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL A1.json index cfb6c3f3d3..9ace07f696 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL A1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Neon @BBL A1", - "inherits": "Panchroma PLA Neon @base", + "inherits": "Panchroma PLA Neon @BBL base", "from": "system", - "setting_id": "GFSPM013_00", + "setting_id": "N7SOOVeq1hiXmrKQ", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL A1M 0.2 nozzle.json similarity index 83% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL A1M 0.2 nozzle.json index 268ef04f05..2db77f41f1 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL A1M 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Neon @BBL A1M 0.2 nozzle", - "inherits": "Panchroma PLA Neon @base", + "inherits": "Panchroma PLA Neon @BBL base", "from": "system", - "setting_id": "GFSPM013_03", + "setting_id": "Ptuq1zUHdeoGINzD", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL A1M.json similarity index 90% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL A1M.json index d970f6b468..4df64db262 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL A1M.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Neon @BBL A1M", - "inherits": "Panchroma PLA Neon @base", + "inherits": "Panchroma PLA Neon @BBL base", "from": "system", - "setting_id": "GFSPM013_02", + "setting_id": "laH74uyf5UCItC8M", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL P1P 0.2 nozzle.json similarity index 83% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL P1P 0.2 nozzle.json index e3d6d2a600..1f0450c396 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL P1P 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Neon @BBL P1P 0.2 nozzle", - "inherits": "Panchroma PLA Neon @base", + "inherits": "Panchroma PLA Neon @BBL base", "from": "system", - "setting_id": "GFSPM013_05", + "setting_id": "MgoWnobu5p8ksS6s", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL P1P.json similarity index 90% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL P1P.json index c09699ecd7..182e803ace 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL P1P.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Neon @BBL P1P", - "inherits": "Panchroma PLA Neon @base", + "inherits": "Panchroma PLA Neon @BBL base", "from": "system", - "setting_id": "GFSPM013_04", + "setting_id": "xChAJ7xQfHPMZwr0", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL X1 0.2 nozzle.json similarity index 83% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL X1 0.2 nozzle.json index 90a6ebd9e7..9214dd3848 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL X1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Neon @BBL X1 0.2 nozzle", - "inherits": "Panchroma PLA Neon @base", + "inherits": "Panchroma PLA Neon @BBL base", "from": "system", - "setting_id": "GFSPM013_07", + "setting_id": "h201yjxsJ93sqVhB", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL X1.json similarity index 90% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL X1.json index 4a08ef9ec7..407ae307cc 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL X1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Neon @BBL X1", - "inherits": "Panchroma PLA Neon @base", + "inherits": "Panchroma PLA Neon @BBL base", "from": "system", - "setting_id": "GFSPM013_06", + "setting_id": "ZNx216TW1gv9bXyT", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL X1C 0.2 nozzle.json similarity index 85% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL X1C 0.2 nozzle.json index 4ab620fa59..0a404b1a53 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL X1C 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Neon @BBL X1C 0.2 nozzle", - "inherits": "Panchroma PLA Neon @base", + "inherits": "Panchroma PLA Neon @BBL base", "from": "system", - "setting_id": "GFSPM013_09", + "setting_id": "Iq6TUkH1NFn0p6Ds", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL X1C.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL X1C.json index 7184cb4caf..4f133f3eda 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Neon @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL X1C.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Neon @BBL X1C", - "inherits": "Panchroma PLA Neon @base", + "inherits": "Panchroma PLA Neon @BBL base", "from": "system", - "setting_id": "GFSPM013_08", + "setting_id": "xeteveYJBnFTC3A9", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL base.json new file mode 100644 index 0000000000..d83b3e2009 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Neon @BBL base.json @@ -0,0 +1,59 @@ +{ + "type": "filament", + "name": "Panchroma PLA Neon @BBL base", + "inherits": "Panchroma PLA Neon @base", + "from": "system", + "instantiation": "false", + "close_additional_fan_first_x_layers": [ + "3" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL A1 0.2 nozzle.json similarity index 85% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL A1 0.2 nozzle.json index ad7a553237..edd74d38bf 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL A1 0.2 nozzle.json @@ -2,9 +2,9 @@ "type": "filament", "name": "Panchroma PLA Satin @BBL A1 0.2 nozzle", "renamed_from": "Panchroma PLA Stain @BBL A1 0.2 nozzle", - "inherits": "Panchroma PLA Satin @base", + "inherits": "Panchroma PLA Satin @BBL base", "from": "system", - "setting_id": "GFSPM005_01", + "setting_id": "nQu34WPbkpyMfQ4J", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL A1.json similarity index 90% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL A1.json index e516c24976..b19355f06c 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL A1.json @@ -2,9 +2,9 @@ "type": "filament", "name": "Panchroma PLA Satin @BBL A1", "renamed_from": "Panchroma PLA Stain @BBL A1", - "inherits": "Panchroma PLA Satin @base", + "inherits": "Panchroma PLA Satin @BBL base", "from": "system", - "setting_id": "GFSPM005_00", + "setting_id": "91v2p9zMeGRNWX4C", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL A1M 0.2 nozzle.json similarity index 85% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL A1M 0.2 nozzle.json index bc354c062d..3cc973ed27 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL A1M 0.2 nozzle.json @@ -2,9 +2,9 @@ "type": "filament", "name": "Panchroma PLA Satin @BBL A1M 0.2 nozzle", "renamed_from": "Panchroma PLA Stain @BBL A1M 0.2 nozzle", - "inherits": "Panchroma PLA Satin @base", + "inherits": "Panchroma PLA Satin @BBL base", "from": "system", - "setting_id": "GFSPM005_03", + "setting_id": "31G5dYmmEeEeDnGx", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL A1M.json similarity index 90% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL A1M.json index b9698daa75..4e2a28e870 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL A1M.json @@ -2,9 +2,9 @@ "type": "filament", "name": "Panchroma PLA Satin @BBL A1M", "renamed_from": "Panchroma PLA Stain @BBL A1M", - "inherits": "Panchroma PLA Satin @base", + "inherits": "Panchroma PLA Satin @BBL base", "from": "system", - "setting_id": "GFSPM005_02", + "setting_id": "h8Iw5jv0LkEsGWWC", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL P1P 0.2 nozzle.json similarity index 85% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL P1P 0.2 nozzle.json index cab5e39ee6..2e664a44b2 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL P1P 0.2 nozzle.json @@ -2,9 +2,9 @@ "type": "filament", "name": "Panchroma PLA Satin @BBL P1P 0.2 nozzle", "renamed_from": "Panchroma PLA Stain @BBL P1P 0.2 nozzle", - "inherits": "Panchroma PLA Satin @base", + "inherits": "Panchroma PLA Satin @BBL base", "from": "system", - "setting_id": "GFSPM005_05", + "setting_id": "8wht7zi8DcoOFMSB", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL P1P.json similarity index 90% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL P1P.json index fcb4636518..b4e3228b09 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL P1P.json @@ -2,9 +2,9 @@ "type": "filament", "name": "Panchroma PLA Satin @BBL P1P", "renamed_from": "Panchroma PLA Stain @BBL P1P", - "inherits": "Panchroma PLA Satin @base", + "inherits": "Panchroma PLA Satin @BBL base", "from": "system", - "setting_id": "GFSPM005_04", + "setting_id": "7b5ZYEJp7KK75tKw", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL X1 0.2 nozzle.json similarity index 85% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL X1 0.2 nozzle.json index 2ca9056d3a..fdae5f5719 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL X1 0.2 nozzle.json @@ -2,9 +2,9 @@ "type": "filament", "name": "Panchroma PLA Satin @BBL X1 0.2 nozzle", "renamed_from": "Panchroma PLA Stain @BBL X1 0.2 nozzle", - "inherits": "Panchroma PLA Satin @base", + "inherits": "Panchroma PLA Satin @BBL base", "from": "system", - "setting_id": "GFSPM005_07", + "setting_id": "zRkt2fsqDlC8i8hO", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL X1.json similarity index 90% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL X1.json index 804564f4e8..b08400c092 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL X1.json @@ -2,9 +2,9 @@ "type": "filament", "name": "Panchroma PLA Satin @BBL X1", "renamed_from": "Panchroma PLA Stain @BBL X1", - "inherits": "Panchroma PLA Satin @base", + "inherits": "Panchroma PLA Satin @BBL base", "from": "system", - "setting_id": "GFSPM005_06", + "setting_id": "bf2w3EzBrBkeZ2ds", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL X1C 0.2 nozzle.json similarity index 86% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL X1C 0.2 nozzle.json index ef4fe88115..a3065b143a 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL X1C 0.2 nozzle.json @@ -2,9 +2,9 @@ "type": "filament", "name": "Panchroma PLA Satin @BBL X1C 0.2 nozzle", "renamed_from": "Panchroma PLA Stain @BBL X1C 0.2 nozzle", - "inherits": "Panchroma PLA Satin @base", + "inherits": "Panchroma PLA Satin @BBL base", "from": "system", - "setting_id": "GFSPM005_09", + "setting_id": "BqsKjFUcRPWxKg7B", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL X1C.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL X1C.json index 349e489fd5..e48b0812c9 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Satin @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL X1C.json @@ -2,9 +2,9 @@ "type": "filament", "name": "Panchroma PLA Satin @BBL X1C", "renamed_from": "Panchroma PLA Stain @BBL X1C", - "inherits": "Panchroma PLA Satin @base", + "inherits": "Panchroma PLA Satin @BBL base", "from": "system", - "setting_id": "GFSPM005_08", + "setting_id": "dRGzGPHSG9tujLWW", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL base.json new file mode 100644 index 0000000000..aa84850f06 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Satin @BBL base.json @@ -0,0 +1,62 @@ +{ + "type": "filament", + "name": "Panchroma PLA Satin @BBL base", + "inherits": "Panchroma PLA Satin @base", + "from": "system", + "instantiation": "false", + "close_additional_fan_first_x_layers": [ + "3" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_layer_time": [ + "5" + ], + "slow_down_min_speed": [ + "20" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL A1 0.2 nozzle.json similarity index 83% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL A1 0.2 nozzle.json index 8bb018f7b1..01109cc58a 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL A1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Silk @BBL A1 0.2 nozzle", - "inherits": "Panchroma PLA Silk @base", + "inherits": "Panchroma PLA Silk @BBL base", "from": "system", - "setting_id": "GFSPM004_01", + "setting_id": "IF4pmYpCYGXFEioc", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL A1.json similarity index 91% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL A1.json index 964735c284..34c7df8605 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL A1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Silk @BBL A1", - "inherits": "Panchroma PLA Silk @base", + "inherits": "Panchroma PLA Silk @BBL base", "from": "system", - "setting_id": "GFSPM004_00", + "setting_id": "BKrse8svL0dwO85f", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL A1M 0.2 nozzle.json similarity index 83% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL A1M 0.2 nozzle.json index 7c667a7ce1..63f11eff05 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL A1M 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Silk @BBL A1M 0.2 nozzle", - "inherits": "Panchroma PLA Silk @base", + "inherits": "Panchroma PLA Silk @BBL base", "from": "system", - "setting_id": "GFSPM004_03", + "setting_id": "7a6AEiNpDN8tcV9b", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL A1M.json similarity index 91% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL A1M.json index ea303d2dcf..c7f7958b6d 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL A1M.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Silk @BBL A1M", - "inherits": "Panchroma PLA Silk @base", + "inherits": "Panchroma PLA Silk @BBL base", "from": "system", - "setting_id": "GFSPM004_02", + "setting_id": "kB393DUVClzaxcwJ", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL P1P 0.2 nozzle.json similarity index 83% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL P1P 0.2 nozzle.json index b66894171d..1bfeb9a8bb 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL P1P 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Silk @BBL P1P 0.2 nozzle", - "inherits": "Panchroma PLA Silk @base", + "inherits": "Panchroma PLA Silk @BBL base", "from": "system", - "setting_id": "GFSPM004_05", + "setting_id": "1nztFtUL604XOsra", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL P1P.json similarity index 90% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL P1P.json index 8523bbb0cc..49d831a1de 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL P1P.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Silk @BBL P1P", - "inherits": "Panchroma PLA Silk @base", + "inherits": "Panchroma PLA Silk @BBL base", "from": "system", - "setting_id": "GFSPM004_04", + "setting_id": "k9BIYLfdkxVgSQ6d", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL X1 0.2 nozzle.json similarity index 83% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL X1 0.2 nozzle.json index 1bf7ceab18..41368a10e4 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL X1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Silk @BBL X1 0.2 nozzle", - "inherits": "Panchroma PLA Silk @base", + "inherits": "Panchroma PLA Silk @BBL base", "from": "system", - "setting_id": "GFSPM004_07", + "setting_id": "iaoE6g4vlMos1s6D", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL X1.json similarity index 90% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL X1.json index 8bb1c8a001..05e03e19c2 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL X1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Silk @BBL X1", - "inherits": "Panchroma PLA Silk @base", + "inherits": "Panchroma PLA Silk @BBL base", "from": "system", - "setting_id": "GFSPM004_06", + "setting_id": "XcR7Y0PAtTf1tH3L", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL X1C 0.2 nozzle.json similarity index 85% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL X1C 0.2 nozzle.json index 592eea2e73..50812453ef 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL X1C 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Silk @BBL X1C 0.2 nozzle", - "inherits": "Panchroma PLA Silk @base", + "inherits": "Panchroma PLA Silk @BBL base", "from": "system", - "setting_id": "GFSPM004_09", + "setting_id": "BMTCNRFG2REbt9Bh", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL X1C.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL X1C.json index 632617eb41..d9eddf1f37 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Silk @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL X1C.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Silk @BBL X1C", - "inherits": "Panchroma PLA Silk @base", + "inherits": "Panchroma PLA Silk @BBL base", "from": "system", - "setting_id": "GFSPM004_08", + "setting_id": "mXuLnQicus3Uhhfj", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL base.json new file mode 100644 index 0000000000..43f4b10fb8 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Silk @BBL base.json @@ -0,0 +1,62 @@ +{ + "type": "filament", + "name": "Panchroma PLA Silk @BBL base", + "inherits": "Panchroma PLA Silk @base", + "from": "system", + "instantiation": "false", + "close_additional_fan_first_x_layers": [ + "3" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_min_speed": [ + "20" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL A1 0.2 nozzle.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL A1 0.2 nozzle.json index 973f8c99a6..b337099a21 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL A1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Starlight @BBL A1 0.2 nozzle", - "inherits": "Panchroma PLA Starlight @base", + "inherits": "Panchroma PLA Starlight @BBL base", "from": "system", - "setting_id": "GFSPM009_01", + "setting_id": "GBzsX4zOxHFSZf2p", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL A1.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL A1.json index 7195ee8aee..bfd4e12372 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL A1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Starlight @BBL A1", - "inherits": "Panchroma PLA Starlight @base", + "inherits": "Panchroma PLA Starlight @BBL base", "from": "system", - "setting_id": "GFSPM009_00", + "setting_id": "q6gmM7NizDVBcW99", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL A1M 0.2 nozzle.json similarity index 83% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL A1M 0.2 nozzle.json index c5d1f19e60..9df5de026d 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL A1M 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Starlight @BBL A1M 0.2 nozzle", - "inherits": "Panchroma PLA Starlight @base", + "inherits": "Panchroma PLA Starlight @BBL base", "from": "system", - "setting_id": "GFSPM009_03", + "setting_id": "xywCdWs1PD3mizua", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL A1M.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL A1M.json index 86702002c9..05648190e1 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL A1M.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Starlight @BBL A1M", - "inherits": "Panchroma PLA Starlight @base", + "inherits": "Panchroma PLA Starlight @BBL base", "from": "system", - "setting_id": "GFSPM009_02", + "setting_id": "94bGLG3JVHJqeuwm", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL P1P 0.2 nozzle.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL P1P 0.2 nozzle.json index 47d3ca9b7c..9281a7c061 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL P1P 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Starlight @BBL P1P 0.2 nozzle", - "inherits": "Panchroma PLA Starlight @base", + "inherits": "Panchroma PLA Starlight @BBL base", "from": "system", - "setting_id": "GFSPM009_05", + "setting_id": "vWIBfFxUxiYs0noT", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL P1P.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL P1P.json index 5a814b235b..7c8188b63f 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL P1P.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Starlight @BBL P1P", - "inherits": "Panchroma PLA Starlight @base", + "inherits": "Panchroma PLA Starlight @BBL base", "from": "system", - "setting_id": "GFSPM009_04", + "setting_id": "SA4k2TGlvq09KgSP", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL X1 0.2 nozzle.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL X1 0.2 nozzle.json index d9ff1754f5..9c289222ed 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL X1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Starlight @BBL X1 0.2 nozzle", - "inherits": "Panchroma PLA Starlight @base", + "inherits": "Panchroma PLA Starlight @BBL base", "from": "system", - "setting_id": "GFSPM009_07", + "setting_id": "buWzLlidD8kqVn9M", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL X1.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL X1.json index 6d22d51867..c30f32eb9c 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL X1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Starlight @BBL X1", - "inherits": "Panchroma PLA Starlight @base", + "inherits": "Panchroma PLA Starlight @BBL base", "from": "system", - "setting_id": "GFSPM009_06", + "setting_id": "iJpQBSxPtmXKX6LW", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL X1C 0.2 nozzle.json similarity index 84% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL X1C 0.2 nozzle.json index 227615d682..9783999b83 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL X1C 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Starlight @BBL X1C 0.2 nozzle", - "inherits": "Panchroma PLA Starlight @base", + "inherits": "Panchroma PLA Starlight @BBL base", "from": "system", - "setting_id": "GFSPM009_09", + "setting_id": "3PYDMfg7fybbTYDk", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL X1C.json similarity index 88% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL X1C.json index d8b4cd49ca..9192a3af91 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Starlight @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL X1C.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Starlight @BBL X1C", - "inherits": "Panchroma PLA Starlight @base", + "inherits": "Panchroma PLA Starlight @BBL base", "from": "system", - "setting_id": "GFSPM009_08", + "setting_id": "TPy2tnZX4boCuzTE", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL base.json new file mode 100644 index 0000000000..16c1a8bfcb --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Starlight @BBL base.json @@ -0,0 +1,59 @@ +{ + "type": "filament", + "name": "Panchroma PLA Starlight @BBL base", + "inherits": "Panchroma PLA Starlight @base", + "from": "system", + "instantiation": "false", + "close_additional_fan_first_x_layers": [ + "3" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL A1 0.2 nozzle.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL A1 0.2 nozzle.json index c31df860c9..18c47b256a 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL A1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Temp Shift @BBL A1 0.2 nozzle", - "inherits": "Panchroma PLA Temp Shift @base", + "inherits": "Panchroma PLA Temp Shift @BBL base", "from": "system", - "setting_id": "GFSPM015_01", + "setting_id": "MhWpOISJ94dCFLkL", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL A1.json similarity index 84% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL A1.json index 7d0a259c82..8f35932204 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL A1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Temp Shift @BBL A1", - "inherits": "Panchroma PLA Temp Shift @base", + "inherits": "Panchroma PLA Temp Shift @BBL base", "from": "system", - "setting_id": "GFSPM015_00", + "setting_id": "afjWBIswJY3gc5LB", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL A1M 0.2 nozzle.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL A1M 0.2 nozzle.json index e965532271..fe118e5196 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL A1M 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Temp Shift @BBL A1M 0.2 nozzle", - "inherits": "Panchroma PLA Temp Shift @base", + "inherits": "Panchroma PLA Temp Shift @BBL base", "from": "system", - "setting_id": "GFSPM015_03", + "setting_id": "FLjIiVwIw3hBR4zr", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL A1M.json similarity index 84% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL A1M.json index b8d390ac59..847caf796d 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL A1M.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Temp Shift @BBL A1M", - "inherits": "Panchroma PLA Temp Shift @base", + "inherits": "Panchroma PLA Temp Shift @BBL base", "from": "system", - "setting_id": "GFSPM015_02", + "setting_id": "FnQCzJdXUvEN6UQD", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL P1P 0.2 nozzle.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL P1P 0.2 nozzle.json index 18bc4ee042..f56dcd1e1c 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL P1P 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Temp Shift @BBL P1P 0.2 nozzle", - "inherits": "Panchroma PLA Temp Shift @base", + "inherits": "Panchroma PLA Temp Shift @BBL base", "from": "system", - "setting_id": "GFSPM015_05", + "setting_id": "Q0sKvONnbUG681AH", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL P1P.json similarity index 84% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL P1P.json index da5f9cb944..f661d2c87c 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL P1P.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Temp Shift @BBL P1P", - "inherits": "Panchroma PLA Temp Shift @base", + "inherits": "Panchroma PLA Temp Shift @BBL base", "from": "system", - "setting_id": "GFSPM015_04", + "setting_id": "I85PKyUlLOUrI6PX", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL X1 0.2 nozzle.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL X1 0.2 nozzle.json index ca3d26546d..6e2cfc1a2f 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL X1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Temp Shift @BBL X1 0.2 nozzle", - "inherits": "Panchroma PLA Temp Shift @base", + "inherits": "Panchroma PLA Temp Shift @BBL base", "from": "system", - "setting_id": "GFSPM015_07", + "setting_id": "t8zf48odJN0uPudJ", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL X1.json similarity index 84% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL X1.json index b5c6ac4677..62a3fe9c94 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL X1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Temp Shift @BBL X1", - "inherits": "Panchroma PLA Temp Shift @base", + "inherits": "Panchroma PLA Temp Shift @BBL base", "from": "system", - "setting_id": "GFSPM015_06", + "setting_id": "BdVwwKFmYpKF3lRd", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL X1C 0.2 nozzle.json similarity index 84% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL X1C 0.2 nozzle.json index a0d88ed2a2..8d441e2155 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL X1C 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Temp Shift @BBL X1C 0.2 nozzle", - "inherits": "Panchroma PLA Temp Shift @base", + "inherits": "Panchroma PLA Temp Shift @BBL base", "from": "system", - "setting_id": "GFSPM015_09", + "setting_id": "XYFkKA5rrYglMvYM", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL X1C.json similarity index 88% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL X1C.json index 904a5a8989..7912a33d33 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Temp Shift @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL X1C.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Temp Shift @BBL X1C", - "inherits": "Panchroma PLA Temp Shift @base", + "inherits": "Panchroma PLA Temp Shift @BBL base", "from": "system", - "setting_id": "GFSPM015_08", + "setting_id": "OlYGtaCNurO3M3sg", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL base.json new file mode 100644 index 0000000000..763d8eb6ca --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Temp Shift @BBL base.json @@ -0,0 +1,59 @@ +{ + "type": "filament", + "name": "Panchroma PLA Temp Shift @BBL base", + "inherits": "Panchroma PLA Temp Shift @base", + "from": "system", + "instantiation": "false", + "close_additional_fan_first_x_layers": [ + "3" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL A1 0.2 nozzle.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL A1 0.2 nozzle.json index 0078623ce2..76ded72324 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL A1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Translucent @BBL A1 0.2 nozzle", - "inherits": "Panchroma PLA Translucent @base", + "inherits": "Panchroma PLA Translucent @BBL base", "from": "system", - "setting_id": "GFSPM006_01", + "setting_id": "zDyzNmefpuxJCUf1", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL A1.json similarity index 90% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL A1.json index aaa1caeb72..267542b75b 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL A1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Translucent @BBL A1", - "inherits": "Panchroma PLA Translucent @base", + "inherits": "Panchroma PLA Translucent @BBL base", "from": "system", - "setting_id": "GFSPM006_00", + "setting_id": "oJpOjk6xOr69m72O", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL A1M 0.2 nozzle.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL A1M 0.2 nozzle.json index f8c904ca5a..f8d9c88a56 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL A1M 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Translucent @BBL A1M 0.2 nozzle", - "inherits": "Panchroma PLA Translucent @base", + "inherits": "Panchroma PLA Translucent @BBL base", "from": "system", - "setting_id": "GFSPM006_03", + "setting_id": "pJn7qO8UafWUd7bK", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL A1M.json similarity index 90% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL A1M.json index af56eb9d0b..c98588964b 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL A1M.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Translucent @BBL A1M", - "inherits": "Panchroma PLA Translucent @base", + "inherits": "Panchroma PLA Translucent @BBL base", "from": "system", - "setting_id": "GFSPM006_02", + "setting_id": "P0oMTDXeotLr88q3", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL P1P 0.2 nozzle.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL P1P 0.2 nozzle.json index d184549271..8accf85cd7 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL P1P 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Translucent @BBL P1P 0.2 nozzle", - "inherits": "Panchroma PLA Translucent @base", + "inherits": "Panchroma PLA Translucent @BBL base", "from": "system", - "setting_id": "GFSPM006_05", + "setting_id": "yLrxM4mMZK4Fnbix", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL P1P.json similarity index 90% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL P1P.json index 7c6352f796..121ce473fc 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL P1P.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Translucent @BBL P1P", - "inherits": "Panchroma PLA Translucent @base", + "inherits": "Panchroma PLA Translucent @BBL base", "from": "system", - "setting_id": "GFSPM006_04", + "setting_id": "NlLnaah4H9VBmrg5", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL X1 0.2 nozzle.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL X1 0.2 nozzle.json index 5e6459dab2..8740aacf3b 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL X1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Translucent @BBL X1 0.2 nozzle", - "inherits": "Panchroma PLA Translucent @base", + "inherits": "Panchroma PLA Translucent @BBL base", "from": "system", - "setting_id": "GFSPM006_07", + "setting_id": "h0XL2rQLSJDH201O", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL X1.json similarity index 90% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL X1.json index e4c5264897..e47becd271 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL X1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Translucent @BBL X1", - "inherits": "Panchroma PLA Translucent @base", + "inherits": "Panchroma PLA Translucent @BBL base", "from": "system", - "setting_id": "GFSPM006_06", + "setting_id": "jwYkduo5MDavMoAq", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL X1C 0.2 nozzle.json similarity index 84% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL X1C 0.2 nozzle.json index 7de90acf15..c97b449e17 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL X1C 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Translucent @BBL X1C 0.2 nozzle", - "inherits": "Panchroma PLA Translucent @base", + "inherits": "Panchroma PLA Translucent @BBL base", "from": "system", - "setting_id": "GFSPM006_09", + "setting_id": "lYVGQR5ASM1xcY5x", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL X1C.json similarity index 88% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL X1C.json index a7b9f9d960..9b96d50f32 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA Translucent @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL X1C.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA Translucent @BBL X1C", - "inherits": "Panchroma PLA Translucent @base", + "inherits": "Panchroma PLA Translucent @BBL base", "from": "system", - "setting_id": "GFSPM006_08", + "setting_id": "8wamrzX02dIlNwyB", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL base.json new file mode 100644 index 0000000000..de3edbb787 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA Translucent @BBL base.json @@ -0,0 +1,56 @@ +{ + "type": "filament", + "name": "Panchroma PLA Translucent @BBL base", + "inherits": "Panchroma PLA Translucent @base", + "from": "system", + "instantiation": "false", + "close_additional_fan_first_x_layers": [ + "3" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL A1 0.2 nozzle.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL A1 0.2 nozzle.json index ad46ce3ca8..73bad6fa61 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL A1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA UV Shift @BBL A1 0.2 nozzle", - "inherits": "Panchroma PLA UV Shift @base", + "inherits": "Panchroma PLA UV Shift @BBL base", "from": "system", - "setting_id": "GFSPM014_01", + "setting_id": "7TCFz5BoNlzot5qI", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL A1.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL A1.json index ebc5d11ea1..de81558654 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL A1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA UV Shift @BBL A1", - "inherits": "Panchroma PLA UV Shift @base", + "inherits": "Panchroma PLA UV Shift @BBL base", "from": "system", - "setting_id": "GFSPM014_00", + "setting_id": "oc0d9P8i9ayTXhbo", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL A1M 0.2 nozzle.json similarity index 83% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL A1M 0.2 nozzle.json index f69f8986f1..3489fcc0a0 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL A1M 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA UV Shift @BBL A1M 0.2 nozzle", - "inherits": "Panchroma PLA UV Shift @base", + "inherits": "Panchroma PLA UV Shift @BBL base", "from": "system", - "setting_id": "GFSPM014_03", + "setting_id": "wWQ8UeVEjOFGNcF0", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL A1M.json similarity index 90% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL A1M.json index 2d62c7b9bd..abfa010e9e 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL A1M.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA UV Shift @BBL A1M", - "inherits": "Panchroma PLA UV Shift @base", + "inherits": "Panchroma PLA UV Shift @BBL base", "from": "system", - "setting_id": "GFSPM014_02", + "setting_id": "EIduHLHB0VdCzUaZ", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL P1P 0.2 nozzle.json similarity index 83% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL P1P 0.2 nozzle.json index 7781c4576e..c01a00df0c 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL P1P 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA UV Shift @BBL P1P 0.2 nozzle", - "inherits": "Panchroma PLA UV Shift @base", + "inherits": "Panchroma PLA UV Shift @BBL base", "from": "system", - "setting_id": "GFSPM014_05", + "setting_id": "D27EcyIrV9yzFJTU", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL P1P.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL P1P.json index 795fa3ded8..22b64cd805 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL P1P.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA UV Shift @BBL P1P", - "inherits": "Panchroma PLA UV Shift @base", + "inherits": "Panchroma PLA UV Shift @BBL base", "from": "system", - "setting_id": "GFSPM014_04", + "setting_id": "ek4lPfBD7JS3B4rK", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL X1 0.2 nozzle.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL X1 0.2 nozzle.json index 2fd8082b4a..b45a366ed1 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL X1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA UV Shift @BBL X1 0.2 nozzle", - "inherits": "Panchroma PLA UV Shift @base", + "inherits": "Panchroma PLA UV Shift @BBL base", "from": "system", - "setting_id": "GFSPM014_07", + "setting_id": "HoU6Q2qUtDHDhP8L", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL X1.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL X1.json index c2bc0b9eda..b0fbc37193 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL X1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA UV Shift @BBL X1", - "inherits": "Panchroma PLA UV Shift @base", + "inherits": "Panchroma PLA UV Shift @BBL base", "from": "system", - "setting_id": "GFSPM014_06", + "setting_id": "hVSsizCHzMJgGpZt", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL X1C 0.2 nozzle.json similarity index 85% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL X1C 0.2 nozzle.json index 3fa53d3985..744e3e941b 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL X1C 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA UV Shift @BBL X1C 0.2 nozzle", - "inherits": "Panchroma PLA UV Shift @base", + "inherits": "Panchroma PLA UV Shift @BBL base", "from": "system", - "setting_id": "GFSPM014_09", + "setting_id": "aZKuZsTTX3GQP0uE", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL X1C.json similarity index 88% rename from resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL X1C.json index db9a5a9da0..69a4e897a2 100644 --- a/resources/profiles/BBL/filament/Polymaker/Panchroma PLA UV Shift @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL X1C.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Panchroma PLA UV Shift @BBL X1C", - "inherits": "Panchroma PLA UV Shift @base", + "inherits": "Panchroma PLA UV Shift @BBL base", "from": "system", - "setting_id": "GFSPM014_08", + "setting_id": "0PPfIX4yL8BoCdD1", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL base.json new file mode 100644 index 0000000000..a3e099410e --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Panchroma PLA UV Shift @BBL base.json @@ -0,0 +1,59 @@ +{ + "type": "filament", + "name": "Panchroma PLA UV Shift @BBL base", + "inherits": "Panchroma PLA UV Shift @base", + "from": "system", + "instantiation": "false", + "close_additional_fan_first_x_layers": [ + "3" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite CosPLA @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite CosPLA @BBL A1.json similarity index 88% rename from resources/profiles/BBL/filament/Polymaker/PolyLite CosPLA @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite CosPLA @BBL A1.json index b45a5cbad4..8f5acc37e9 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite CosPLA @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite CosPLA @BBL A1.json @@ -3,7 +3,7 @@ "name": "PolyLite CosPLA @BBL A1", "inherits": "PolyLite CosPLA @base", "from": "system", - "setting_id": "GFSL62_00", + "setting_id": "RZYqtQDR4zIvSrXg", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite CosPLA @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite CosPLA @BBL A1M.json similarity index 88% rename from resources/profiles/BBL/filament/Polymaker/PolyLite CosPLA @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite CosPLA @BBL A1M.json index 679b39ff18..4f7eaba197 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite CosPLA @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite CosPLA @BBL A1M.json @@ -3,7 +3,7 @@ "name": "PolyLite CosPLA @BBL A1M", "inherits": "PolyLite CosPLA @base", "from": "system", - "setting_id": "GFSL62_01", + "setting_id": "yNMQPBXRPOdpkuiG", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite CosPLA @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite CosPLA @BBL P1P.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/PolyLite CosPLA @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite CosPLA @BBL P1P.json index ef0e9ae3a6..2f5b93746f 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite CosPLA @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite CosPLA @BBL P1P.json @@ -3,7 +3,7 @@ "name": "PolyLite CosPLA @BBL P1P", "inherits": "PolyLite CosPLA @base", "from": "system", - "setting_id": "GFSL62_02", + "setting_id": "jvptdmELTscDj8ay", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite CosPLA @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite CosPLA @BBL X1.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/PolyLite CosPLA @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite CosPLA @BBL X1.json index 7442729e32..5bbf9ff1b1 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite CosPLA @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite CosPLA @BBL X1.json @@ -3,7 +3,7 @@ "name": "PolyLite CosPLA @BBL X1", "inherits": "PolyLite CosPLA @base", "from": "system", - "setting_id": "GFSL62_03", + "setting_id": "2kR4lOogidryispD", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Galaxy @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Galaxy @BBL A1.json similarity index 88% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Galaxy @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Galaxy @BBL A1.json index feee6effdb..d324c766bc 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Galaxy @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Galaxy @BBL A1.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Galaxy @BBL A1", "inherits": "PolyLite PLA Galaxy @base", "from": "system", - "setting_id": "GFSL63_00", + "setting_id": "BLC6OE9zCj7LjJjp", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Galaxy @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Galaxy @BBL A1M.json similarity index 88% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Galaxy @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Galaxy @BBL A1M.json index e7e4f70f23..f87860f55d 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Galaxy @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Galaxy @BBL A1M.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Galaxy @BBL A1M", "inherits": "PolyLite PLA Galaxy @base", "from": "system", - "setting_id": "GFSL63_01", + "setting_id": "FNCJtFwvh9M7HyuM", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Galaxy @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Galaxy @BBL P1P.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Galaxy @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Galaxy @BBL P1P.json index 5c29bee1f3..ea0c64e419 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Galaxy @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Galaxy @BBL P1P.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Galaxy @BBL P1P", "inherits": "PolyLite PLA Galaxy @base", "from": "system", - "setting_id": "GFSL63_02", + "setting_id": "8BCbg87dmo5amtRg", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Galaxy @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Galaxy @BBL X1.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Galaxy @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Galaxy @BBL X1.json index 5442a29906..f2dacc4ca3 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Galaxy @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Galaxy @BBL X1.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Galaxy @BBL X1", "inherits": "PolyLite PLA Galaxy @base", "from": "system", - "setting_id": "GFSL63_03", + "setting_id": "2kfI9rkYF93LpNRd", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Glow @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Glow @BBL A1.json similarity index 88% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Glow @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Glow @BBL A1.json index 3c9a455cae..be691b2ace 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Glow @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Glow @BBL A1.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Glow @BBL A1", "inherits": "PolyLite PLA Glow @base", "from": "system", - "setting_id": "GFSL64_00", + "setting_id": "qn7H5PN0KgMm8Ee6", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Glow @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Glow @BBL A1M.json similarity index 88% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Glow @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Glow @BBL A1M.json index 205722c3d2..853fce1442 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Glow @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Glow @BBL A1M.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Glow @BBL A1M", "inherits": "PolyLite PLA Glow @base", "from": "system", - "setting_id": "GFSL64_01", + "setting_id": "IVp9am7BOL6CAN5z", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Glow @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Glow @BBL P1P.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Glow @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Glow @BBL P1P.json index 2c67c2098b..c009583f3d 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Glow @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Glow @BBL P1P.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Glow @BBL P1P", "inherits": "PolyLite PLA Glow @base", "from": "system", - "setting_id": "GFSL64_02", + "setting_id": "RHZanpy7EGdGAtF3", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Glow @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Glow @BBL X1.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Glow @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Glow @BBL X1.json index 932e217ee5..066db3d6e6 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Glow @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Glow @BBL X1.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Glow @BBL X1", "inherits": "PolyLite PLA Glow @base", "from": "system", - "setting_id": "GFSL64_03", + "setting_id": "Awxx4RSqrQAIhEFv", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Luminous @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Luminous @BBL A1.json similarity index 88% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Luminous @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Luminous @BBL A1.json index 7b9b747ad1..53b45dbd2f 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Luminous @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Luminous @BBL A1.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Luminous @BBL A1", "inherits": "PolyLite PLA Luminous @base", "from": "system", - "setting_id": "GFSL65_00", + "setting_id": "97DOrlNHiPMMGWR5", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Luminous @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Luminous @BBL A1M.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Luminous @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Luminous @BBL A1M.json index f6a84a52cb..d756a5516d 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Luminous @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Luminous @BBL A1M.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Luminous @BBL A1M", "inherits": "PolyLite PLA Luminous @base", "from": "system", - "setting_id": "GFSL65_01", + "setting_id": "LOv2b9kaKYXUJIrJ", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Luminous @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Luminous @BBL P1P.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Luminous @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Luminous @BBL P1P.json index c89622dd47..147fa2c3f2 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Luminous @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Luminous @BBL P1P.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Luminous @BBL P1P", "inherits": "PolyLite PLA Luminous @base", "from": "system", - "setting_id": "GFSL65_02", + "setting_id": "2wls9L4EqRFiGypv", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Luminous @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Luminous @BBL X1.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Luminous @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Luminous @BBL X1.json index d9cca17665..4795f26970 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Luminous @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Luminous @BBL X1.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Luminous @BBL X1", "inherits": "PolyLite PLA Luminous @base", "from": "system", - "setting_id": "GFSL65_03", + "setting_id": "gp70NZoz5qCgHz5k", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Neon @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Neon @BBL A1.json similarity index 88% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Neon @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Neon @BBL A1.json index c54ed61ca9..5636638102 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Neon @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Neon @BBL A1.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Neon @BBL A1", "inherits": "PolyLite PLA Neon @base", "from": "system", - "setting_id": "GFSL66_00", + "setting_id": "hwWKjnndkCU3SlEZ", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Neon @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Neon @BBL A1M.json similarity index 88% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Neon @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Neon @BBL A1M.json index b324cfd9bf..52c2899c98 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Neon @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Neon @BBL A1M.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Neon @BBL A1M", "inherits": "PolyLite PLA Neon @base", "from": "system", - "setting_id": "GFSL66_01", + "setting_id": "CA5E5Q1TA87iSWzO", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Neon @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Neon @BBL P1P.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Neon @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Neon @BBL P1P.json index 79e994ecc4..a52ec2c4e7 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Neon @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Neon @BBL P1P.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Neon @BBL P1P", "inherits": "PolyLite PLA Neon @base", "from": "system", - "setting_id": "GFSL66_02", + "setting_id": "N5UTXT19kDfbXFzU", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Neon @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Neon @BBL X1.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Neon @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Neon @BBL X1.json index 6cc2023b3b..d915656d02 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Neon @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Neon @BBL X1.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Neon @BBL X1", "inherits": "PolyLite PLA Neon @base", "from": "system", - "setting_id": "GFSL66_03", + "setting_id": "sUxGOFvUcbomrJPf", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL A1 0.2 nozzle.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL A1 0.2 nozzle.json index 0ff17288b1..5ffa8cadb5 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL A1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "PolyLite PLA Pro @BBL A1 0.2 nozzle", - "inherits": "PolyLite PLA Pro @base", + "inherits": "PolyLite PLA Pro @BBL base", "from": "system", - "setting_id": "GFSPM019_01", + "setting_id": "7nuAyrO27zNpg9wf", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL A1.json similarity index 83% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL A1.json index ec9d964a24..a84d5e6e4a 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL A1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "PolyLite PLA Pro @BBL A1", - "inherits": "PolyLite PLA Pro @base", + "inherits": "PolyLite PLA Pro @BBL base", "from": "system", - "setting_id": "GFSPM019_00", + "setting_id": "BHoc6AnMAH5K74Aj", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL A1M 0.2 nozzle.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL A1M 0.2 nozzle.json index f054661b8a..4c40ae1a7f 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL A1M 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "PolyLite PLA Pro @BBL A1M 0.2 nozzle", - "inherits": "PolyLite PLA Pro @base", + "inherits": "PolyLite PLA Pro @BBL base", "from": "system", - "setting_id": "GFSPM019_03", + "setting_id": "dDZvDBIEzJ09HaIY", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL A1M.json similarity index 84% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL A1M.json index b2cec16452..6878b2883b 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL A1M.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "PolyLite PLA Pro @BBL A1M", - "inherits": "PolyLite PLA Pro @base", + "inherits": "PolyLite PLA Pro @BBL base", "from": "system", - "setting_id": "GFSPM019_02", + "setting_id": "tvVT77ReLWwXVJ94", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL P1P 0.2 nozzle.json similarity index 80% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL P1P 0.2 nozzle.json index f68cec25ac..6feb074149 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL P1P 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "PolyLite PLA Pro @BBL P1P 0.2 nozzle", - "inherits": "PolyLite PLA Pro @base", + "inherits": "PolyLite PLA Pro @BBL base", "from": "system", - "setting_id": "GFSPM019_05", + "setting_id": "DQXQkdBzvuKYGgwy", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL P1P.json similarity index 84% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL P1P.json index ebbcb11a4d..23d88dc5e3 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL P1P.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "PolyLite PLA Pro @BBL P1P", - "inherits": "PolyLite PLA Pro @base", + "inherits": "PolyLite PLA Pro @BBL base", "from": "system", - "setting_id": "GFSPM019_04", + "setting_id": "4UouP8fbyytuGEh9", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL X1 0.2 nozzle.json similarity index 80% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL X1 0.2 nozzle.json index 5c160455d3..28c725b198 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL X1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "PolyLite PLA Pro @BBL X1 0.2 nozzle", - "inherits": "PolyLite PLA Pro @base", + "inherits": "PolyLite PLA Pro @BBL base", "from": "system", - "setting_id": "GFSPM019_07", + "setting_id": "LhJeeHkaASQEVjTn", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL X1.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL X1.json index 1edee961a4..ba78098938 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL X1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "PolyLite PLA Pro @BBL X1", - "inherits": "PolyLite PLA Pro @base", + "inherits": "PolyLite PLA Pro @BBL base", "from": "system", - "setting_id": "GFSPM019_06", + "setting_id": "YcS2HQfu2ryGKNjU", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL X1C 0.2 nozzle.json similarity index 83% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL X1C 0.2 nozzle.json index 66a6b1361b..5bda0d2371 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL X1C 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "PolyLite PLA Pro @BBL X1C 0.2 nozzle", - "inherits": "PolyLite PLA Pro @base", + "inherits": "PolyLite PLA Pro @BBL base", "from": "system", - "setting_id": "GFSPM019_09", + "setting_id": "ZV4GAHpitfQoTpCI", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL X1C.json similarity index 88% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL X1C.json index 95e83272ee..c8d422f0e9 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Pro @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL X1C.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "PolyLite PLA Pro @BBL X1C", - "inherits": "PolyLite PLA Pro @base", + "inherits": "PolyLite PLA Pro @BBL base", "from": "system", - "setting_id": "GFSPM019_08", + "setting_id": "4srNqDfqtDziN7qV", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL base.json new file mode 100644 index 0000000000..ed50abf183 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Pro @BBL base.json @@ -0,0 +1,56 @@ +{ + "type": "filament", + "name": "PolyLite PLA Pro @BBL base", + "inherits": "PolyLite PLA Pro @base", + "from": "system", + "instantiation": "false", + "close_additional_fan_first_x_layers": [ + "3" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Starlight @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Starlight @BBL A1.json similarity index 88% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Starlight @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Starlight @BBL A1.json index 8e1425278b..5d52618010 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Starlight @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Starlight @BBL A1.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Starlight @BBL A1", "inherits": "PolyLite PLA Starlight @base", "from": "system", - "setting_id": "GFSL67_00", + "setting_id": "x3HpVqx9XW9lbRqW", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Starlight @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Starlight @BBL A1M.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Starlight @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Starlight @BBL A1M.json index ecb482cdcb..35b02ad63b 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Starlight @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Starlight @BBL A1M.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Starlight @BBL A1M", "inherits": "PolyLite PLA Starlight @base", "from": "system", - "setting_id": "GFSL67_01", + "setting_id": "s9Bt0isdVCbdSW0F", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Starlight @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Starlight @BBL P1P.json similarity index 90% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Starlight @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Starlight @BBL P1P.json index 0f7210a5cc..a863663828 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Starlight @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Starlight @BBL P1P.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Starlight @BBL P1P", "inherits": "PolyLite PLA Starlight @base", "from": "system", - "setting_id": "GFSL67_02", + "setting_id": "00qUK2jehjtj3TGx", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Starlight @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Starlight @BBL X1.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Starlight @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Starlight @BBL X1.json index 88d436c526..3ba8df3c03 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Starlight @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Starlight @BBL X1.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Starlight @BBL X1", "inherits": "PolyLite PLA Starlight @base", "from": "system", - "setting_id": "GFSL67_03", + "setting_id": "DKJZNSTf5GsaaIGh", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Translucent @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Translucent @BBL A1.json similarity index 88% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Translucent @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Translucent @BBL A1.json index 6664212a43..ddbfc08f77 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Translucent @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Translucent @BBL A1.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Translucent @BBL A1", "inherits": "PolyLite PLA Translucent @base", "from": "system", - "setting_id": "GFSL68_00", + "setting_id": "dHceYRjzcwzLsj0x", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Translucent @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Translucent @BBL A1M.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Translucent @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Translucent @BBL A1M.json index 7b20e40ce1..61dbdfaaf9 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Translucent @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Translucent @BBL A1M.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Translucent @BBL A1M", "inherits": "PolyLite PLA Translucent @base", "from": "system", - "setting_id": "GFSL68_01", + "setting_id": "OdzH7quFslZrWu4D", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Translucent @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Translucent @BBL P1P.json similarity index 90% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Translucent @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Translucent @BBL P1P.json index f3f3198158..3c990bc685 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Translucent @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Translucent @BBL P1P.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Translucent @BBL P1P", "inherits": "PolyLite PLA Translucent @base", "from": "system", - "setting_id": "GFSL68_02", + "setting_id": "JRp3eQU5ss6L3c1q", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Translucent @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Translucent @BBL X1.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/PolyLite PLA Translucent @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Translucent @BBL X1.json index f67db0a271..d3df5df701 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyLite PLA Translucent @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyLite PLA Translucent @BBL X1.json @@ -3,7 +3,7 @@ "name": "PolyLite PLA Translucent @BBL X1", "inherits": "PolyLite PLA Translucent @base", "from": "system", - "setting_id": "GFSL68_03", + "setting_id": "bb3M8zXSY90Q1itv", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA Marble @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyTerra PLA Marble @BBL A1.json similarity index 88% rename from resources/profiles/BBL/filament/Polymaker/PolyTerra PLA Marble @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyTerra PLA Marble @BBL A1.json index 9bda6808d9..15a9b254cb 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA Marble @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyTerra PLA Marble @BBL A1.json @@ -3,7 +3,7 @@ "name": "PolyTerra PLA Marble @BBL A1", "inherits": "PolyTerra PLA Marble @base", "from": "system", - "setting_id": "GFSL69_00", + "setting_id": "Ni47TgOKsSs85PJE", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA Marble @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyTerra PLA Marble @BBL A1M.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/PolyTerra PLA Marble @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyTerra PLA Marble @BBL A1M.json index 721e0b3d3d..6b8267439f 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA Marble @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyTerra PLA Marble @BBL A1M.json @@ -3,7 +3,7 @@ "name": "PolyTerra PLA Marble @BBL A1M", "inherits": "PolyTerra PLA Marble @base", "from": "system", - "setting_id": "GFSL69_01", + "setting_id": "Kson0GJmt8ntF4YI", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA Marble @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyTerra PLA Marble @BBL P1P.json similarity index 90% rename from resources/profiles/BBL/filament/Polymaker/PolyTerra PLA Marble @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyTerra PLA Marble @BBL P1P.json index 5dedafd5ff..55c7b5303f 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA Marble @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyTerra PLA Marble @BBL P1P.json @@ -3,7 +3,7 @@ "name": "PolyTerra PLA Marble @BBL P1P", "inherits": "PolyTerra PLA Marble @base", "from": "system", - "setting_id": "GFSL69_02", + "setting_id": "aWpbrCSSX38lHCnA", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA Marble @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyTerra PLA Marble @BBL X1.json similarity index 91% rename from resources/profiles/BBL/filament/Polymaker/PolyTerra PLA Marble @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyTerra PLA Marble @BBL X1.json index 8a47922219..e8f9e60ac7 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA Marble @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyTerra PLA Marble @BBL X1.json @@ -3,7 +3,7 @@ "name": "PolyTerra PLA Marble @BBL X1", "inherits": "PolyTerra PLA Marble @base", "from": "system", - "setting_id": "GFSL69_03", + "setting_id": "O7XwxOsxwFvLmnpP", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA+ @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyTerra PLA+ @BBL A1.json similarity index 88% rename from resources/profiles/BBL/filament/Polymaker/PolyTerra PLA+ @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyTerra PLA+ @BBL A1.json index 08ace4c6a5..d425ce94e2 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA+ @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyTerra PLA+ @BBL A1.json @@ -3,7 +3,7 @@ "name": "PolyTerra PLA+ @BBL A1", "inherits": "PolyTerra PLA+ @base", "from": "system", - "setting_id": "GFSL70_00", + "setting_id": "dUlbwjCqWtjlCvnm", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA+ @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyTerra PLA+ @BBL A1M.json similarity index 88% rename from resources/profiles/BBL/filament/Polymaker/PolyTerra PLA+ @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyTerra PLA+ @BBL A1M.json index 86f3ab3ffb..956956002f 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA+ @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyTerra PLA+ @BBL A1M.json @@ -3,7 +3,7 @@ "name": "PolyTerra PLA+ @BBL A1M", "inherits": "PolyTerra PLA+ @base", "from": "system", - "setting_id": "GFSL70_01", + "setting_id": "0JDQqqSmuHYSyw96", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA+ @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyTerra PLA+ @BBL P1P.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/PolyTerra PLA+ @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyTerra PLA+ @BBL P1P.json index dd09d09637..3207cd79a9 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA+ @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyTerra PLA+ @BBL P1P.json @@ -3,7 +3,7 @@ "name": "PolyTerra PLA+ @BBL P1P", "inherits": "PolyTerra PLA+ @base", "from": "system", - "setting_id": "GFSL70_02", + "setting_id": "0OM8MaObnp4YapKh", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA+ @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyTerra PLA+ @BBL X1.json similarity index 89% rename from resources/profiles/BBL/filament/Polymaker/PolyTerra PLA+ @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyTerra PLA+ @BBL X1.json index a28a8d30d8..17067e580a 100644 --- a/resources/profiles/BBL/filament/Polymaker/PolyTerra PLA+ @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/PolyTerra PLA+ @BBL X1.json @@ -3,7 +3,7 @@ "name": "PolyTerra PLA+ @BBL X1", "inherits": "PolyTerra PLA+ @base", "from": "system", - "setting_id": "GFSL70_03", + "setting_id": "g8UtZo9rzucrDDRO", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL A1 0.2 nozzle.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL A1 0.2 nozzle.json index ed5963f237..5512413504 100644 --- a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL A1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Polymaker HT-PLA @BBL A1 0.2 nozzle", - "inherits": "Polymaker HT-PLA @base", + "inherits": "Polymaker HT-PLA @BBL base", "from": "system", - "setting_id": "GFSPM017_01", + "setting_id": "slYmT9dA3LLqD0be", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL A1.json similarity index 83% rename from resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL A1.json index 1b56b76099..f1bf555ba4 100644 --- a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL A1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Polymaker HT-PLA @BBL A1", - "inherits": "Polymaker HT-PLA @base", + "inherits": "Polymaker HT-PLA @BBL base", "from": "system", - "setting_id": "GFSPM017_00", + "setting_id": "zVgRM5YBqLHPK4GW", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL A1M 0.2 nozzle.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL A1M 0.2 nozzle.json index 77c6eb8c4f..dc1e605560 100644 --- a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL A1M 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Polymaker HT-PLA @BBL A1M 0.2 nozzle", - "inherits": "Polymaker HT-PLA @base", + "inherits": "Polymaker HT-PLA @BBL base", "from": "system", - "setting_id": "GFSPM017_03", + "setting_id": "jsAUYwGfSOhSbD4j", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL A1M.json similarity index 84% rename from resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL A1M.json index d2658cdaaf..8b143fb54c 100644 --- a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL A1M.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Polymaker HT-PLA @BBL A1M", - "inherits": "Polymaker HT-PLA @base", + "inherits": "Polymaker HT-PLA @BBL base", "from": "system", - "setting_id": "GFSPM017_02", + "setting_id": "wu8GY5oLKYeRmTBz", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL P1P 0.2 nozzle.json similarity index 80% rename from resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL P1P 0.2 nozzle.json index a17c2cca66..b7601df909 100644 --- a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL P1P 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Polymaker HT-PLA @BBL P1P 0.2 nozzle", - "inherits": "Polymaker HT-PLA @base", + "inherits": "Polymaker HT-PLA @BBL base", "from": "system", - "setting_id": "GFSPM017_05", + "setting_id": "i9pO3z5aKKpG2Bzx", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL P1P.json similarity index 84% rename from resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL P1P.json index 249eb1f3be..0482c25ee3 100644 --- a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL P1P.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Polymaker HT-PLA @BBL P1P", - "inherits": "Polymaker HT-PLA @base", + "inherits": "Polymaker HT-PLA @BBL base", "from": "system", - "setting_id": "GFSPM017_04", + "setting_id": "AnMfPI9uXHGmULQB", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL X1 0.2 nozzle.json similarity index 80% rename from resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL X1 0.2 nozzle.json index e5480765e3..28254af5ba 100644 --- a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL X1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Polymaker HT-PLA @BBL X1 0.2 nozzle", - "inherits": "Polymaker HT-PLA @base", + "inherits": "Polymaker HT-PLA @BBL base", "from": "system", - "setting_id": "GFSPM017_07", + "setting_id": "Oc91jGuSipSzgUfJ", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL X1.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL X1.json index 2e94b04dc7..bb1dde93c6 100644 --- a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL X1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Polymaker HT-PLA @BBL X1", - "inherits": "Polymaker HT-PLA @base", + "inherits": "Polymaker HT-PLA @BBL base", "from": "system", - "setting_id": "GFSPM017_06", + "setting_id": "lHSGRJDnVnktPC00", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL X1C 0.2 nozzle.json similarity index 83% rename from resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL X1C 0.2 nozzle.json index 1f60d42cc1..e236a3d94e 100644 --- a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL X1C 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Polymaker HT-PLA @BBL X1C 0.2 nozzle", - "inherits": "Polymaker HT-PLA @base", + "inherits": "Polymaker HT-PLA @BBL base", "from": "system", - "setting_id": "GFSPM017_09", + "setting_id": "MTp1xeVFrOKH0i0c", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL X1C.json similarity index 88% rename from resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL X1C.json index 04257c17e7..09bf02b13f 100644 --- a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL X1C.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Polymaker HT-PLA @BBL X1C", - "inherits": "Polymaker HT-PLA @base", + "inherits": "Polymaker HT-PLA @BBL base", "from": "system", - "setting_id": "GFSPM017_08", + "setting_id": "2GENTxe0e6vil9B1", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL base.json new file mode 100644 index 0000000000..e9ffeb7382 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA @BBL base.json @@ -0,0 +1,65 @@ +{ + "type": "filament", + "name": "Polymaker HT-PLA @BBL base", + "inherits": "Polymaker HT-PLA @base", + "from": "system", + "instantiation": "false", + "close_additional_fan_first_x_layers": [ + "3" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_max_volumetric_speed": [ + "24" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "hot_plate_temp": [ + "55" + ], + "hot_plate_temp_initial_layer": [ + "55" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @BBL A1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL A1 0.2 nozzle.json similarity index 81% rename from resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @BBL A1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL A1 0.2 nozzle.json index 5bdd8b529b..6e04d7cd01 100644 --- a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @BBL A1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL A1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Polymaker HT-PLA-GF @BBL A1 0.2 nozzle", - "inherits": "Polymaker HT-PLA-GF @base", + "inherits": "Polymaker HT-PLA-GF @BBL base", "from": "system", - "setting_id": "GFSPM018_01", + "setting_id": "kZzdx6ZKazTMyAFO", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @BBL A1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL A1.json similarity index 83% rename from resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @BBL A1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL A1.json index 042880d506..e4fb10f2cb 100644 --- a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @BBL A1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL A1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Polymaker HT-PLA-GF @BBL A1", - "inherits": "Polymaker HT-PLA-GF @base", + "inherits": "Polymaker HT-PLA-GF @BBL base", "from": "system", - "setting_id": "GFSPM018_00", + "setting_id": "5utdPhp0IJwPR4UM", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @BBL A1M 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL A1M 0.2 nozzle.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @BBL A1M 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL A1M 0.2 nozzle.json index 3a67107ed5..2bd90b6671 100644 --- a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @BBL A1M 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL A1M 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Polymaker HT-PLA-GF @BBL A1M 0.2 nozzle", - "inherits": "Polymaker HT-PLA-GF @base", + "inherits": "Polymaker HT-PLA-GF @BBL base", "from": "system", - "setting_id": "GFSPM018_03", + "setting_id": "BWfRU15xATzKPSDq", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @BBL A1M.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL A1M.json similarity index 84% rename from resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @BBL A1M.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL A1M.json index e3dff1d4fc..14d0860498 100644 --- a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @BBL A1M.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL A1M.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Polymaker HT-PLA-GF @BBL A1M", - "inherits": "Polymaker HT-PLA-GF @base", + "inherits": "Polymaker HT-PLA-GF @BBL base", "from": "system", - "setting_id": "GFSPM018_02", + "setting_id": "cmE8Id8aqjJnEQOC", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @BBL P1P 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL P1P 0.2 nozzle.json similarity index 80% rename from resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @BBL P1P 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL P1P 0.2 nozzle.json index a77c921c4f..6230d2266f 100644 --- a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @BBL P1P 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL P1P 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Polymaker HT-PLA-GF @BBL P1P 0.2 nozzle", - "inherits": "Polymaker HT-PLA-GF @base", + "inherits": "Polymaker HT-PLA-GF @BBL base", "from": "system", - "setting_id": "GFSPM018_05", + "setting_id": "qRNDKVWDQjvhsbRk", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @BBL P1P.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL P1P.json similarity index 83% rename from resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @BBL P1P.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL P1P.json index 4ac3029cc8..432b4540b9 100644 --- a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @BBL P1P.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL P1P.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Polymaker HT-PLA-GF @BBL P1P", - "inherits": "Polymaker HT-PLA-GF @base", + "inherits": "Polymaker HT-PLA-GF @BBL base", "from": "system", - "setting_id": "GFSPM018_04", + "setting_id": "WQ9Ie36OxVWVMZTs", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @BBL X1 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL X1 0.2 nozzle.json similarity index 80% rename from resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @BBL X1 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL X1 0.2 nozzle.json index 990f68be15..6ac4908f51 100644 --- a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @BBL X1 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL X1 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Polymaker HT-PLA-GF @BBL X1 0.2 nozzle", - "inherits": "Polymaker HT-PLA-GF @base", + "inherits": "Polymaker HT-PLA-GF @BBL base", "from": "system", - "setting_id": "GFSPM018_07", + "setting_id": "VVzPI5haSYrbQSwt", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.2 nozzle" diff --git a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @BBL X1.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL X1.json similarity index 82% rename from resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @BBL X1.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL X1.json index d8052b99a8..3d02b62c3b 100644 --- a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @BBL X1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL X1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Polymaker HT-PLA-GF @BBL X1", - "inherits": "Polymaker HT-PLA-GF @base", + "inherits": "Polymaker HT-PLA-GF @BBL base", "from": "system", - "setting_id": "GFSPM018_06", + "setting_id": "Zd7H1E7L2dB9wec4", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @BBL X1C 0.2 nozzle.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL X1C 0.2 nozzle.json similarity index 83% rename from resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @BBL X1C 0.2 nozzle.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL X1C 0.2 nozzle.json index c4c95ccca8..37e860c8a1 100644 --- a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @BBL X1C 0.2 nozzle.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL X1C 0.2 nozzle.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Polymaker HT-PLA-GF @BBL X1C 0.2 nozzle", - "inherits": "Polymaker HT-PLA-GF @base", + "inherits": "Polymaker HT-PLA-GF @BBL base", "from": "system", - "setting_id": "GFSPM018_09", + "setting_id": "LdFkOELESgEZ2hxP", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.2 nozzle", diff --git a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @BBL X1C.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL X1C.json similarity index 87% rename from resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @BBL X1C.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL X1C.json index 0d12e2b887..212387a20d 100644 --- a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @BBL X1C.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL X1C.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "Polymaker HT-PLA-GF @BBL X1C", - "inherits": "Polymaker HT-PLA-GF @base", + "inherits": "Polymaker HT-PLA-GF @BBL base", "from": "system", - "setting_id": "GFSPM018_08", + "setting_id": "Y9702HoKQefN1etQ", "instantiation": "true", "compatible_printers": [ "Bambu Lab X1 Carbon 0.4 nozzle", diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL base.json new file mode 100644 index 0000000000..55f7b14d94 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/BBL/Polymaker HT-PLA-GF @BBL base.json @@ -0,0 +1,71 @@ +{ + "type": "filament", + "name": "Polymaker HT-PLA-GF @BBL base", + "inherits": "Polymaker HT-PLA-GF @base", + "from": "system", + "instantiation": "false", + "close_additional_fan_first_x_layers": [ + "3" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_max_volumetric_speed": [ + "24" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "hot_plate_temp": [ + "55" + ], + "hot_plate_temp_initial_layer": [ + "55" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "textured_plate_temp": [ + "55" + ], + "textured_plate_temp_initial_layer": [ + "55" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/BBL/filament/Polymaker/Fiberon PA12-CF10 @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA12-CF10 @base.json similarity index 54% rename from resources/profiles/BBL/filament/Polymaker/Fiberon PA12-CF10 @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA12-CF10 @base.json index 674d5acb38..299b26856b 100644 --- a/resources/profiles/BBL/filament/Polymaker/Fiberon PA12-CF10 @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA12-CF10 @base.json @@ -73,5 +73,50 @@ ], "textured_plate_temp_initial_layer": [ "40" + ], + "activate_air_filtration": [ + "1" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_start_gcode": [ + "; Filament gcode\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "400" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_time": [ + "18" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "165" + ], + "filament_dev_drying_cooling_temperature": [ + "150" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "85", + "65", + "85" + ], + "filament_dev_drying_softening_temperature": [ + "150" ] } diff --git a/resources/profiles/BBL/filament/Polymaker/Fiberon PA6-CF20 @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA6-CF20 @base.json similarity index 54% rename from resources/profiles/BBL/filament/Polymaker/Fiberon PA6-CF20 @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA6-CF20 @base.json index f28ee154b8..6b12a9a40e 100644 --- a/resources/profiles/BBL/filament/Polymaker/Fiberon PA6-CF20 @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA6-CF20 @base.json @@ -70,5 +70,50 @@ ], "textured_plate_temp_initial_layer": [ "40" + ], + "activate_air_filtration": [ + "1" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_start_gcode": [ + "; Filament gcode\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "400" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_time": [ + "18" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "165" + ], + "filament_dev_drying_cooling_temperature": [ + "150" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "85", + "65", + "85" + ], + "filament_dev_drying_softening_temperature": [ + "150" ] } diff --git a/resources/profiles/BBL/filament/Polymaker/Fiberon PA6-GF25 @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA6-GF25 @base.json similarity index 54% rename from resources/profiles/BBL/filament/Polymaker/Fiberon PA6-GF25 @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA6-GF25 @base.json index 426e4175db..6160c94714 100644 --- a/resources/profiles/BBL/filament/Polymaker/Fiberon PA6-GF25 @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA6-GF25 @base.json @@ -73,5 +73,50 @@ ], "textured_plate_temp_initial_layer": [ "40" + ], + "activate_air_filtration": [ + "1" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_start_gcode": [ + "; Filament gcode\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "400" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_time": [ + "18" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "165" + ], + "filament_dev_drying_cooling_temperature": [ + "150" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "85", + "65", + "85" + ], + "filament_dev_drying_softening_temperature": [ + "150" ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA612-CF15 @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA612-CF15 @base.json new file mode 100644 index 0000000000..9e7c30dc14 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PA612-CF15 @base.json @@ -0,0 +1,104 @@ +{ + "type": "filament", + "name": "Fiberon PA612-CF15 @base", + "inherits": "fdm_filament_pa", + "from": "system", + "filament_id": "OFcBl0nJ", + "instantiation": "false", + "bed_type": [ + "Cool Plate" + ], + "fan_cooling_layer_time": [ + "5" + ], + "fan_max_speed": [ + "30" + ], + "fan_min_speed": [ + "10" + ], + "filament_cost": [ + "94.99" + ], + "filament_density": [ + "1.03" + ], + "filament_flow_ratio": [ + "0.96" + ], + "filament_type": [ + "PA-CF" + ], + "filament_vendor": [ + "Polymaker" + ], + "full_fan_speed_layer": [ + "2" + ], + "nozzle_temperature_range_low": [ + "250" + ], + "overhang_fan_speed": [ + "40" + ], + "overhang_fan_threshold": [ + "0%" + ], + "slow_down_min_speed": [ + "10" + ], + "temperature_vitrification": [ + "206.2" + ], + "activate_air_filtration": [ + "1" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "nozzle_temperature": [ + "290" + ], + "nozzle_temperature_initial_layer": [ + "290" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_start_gcode": [ + "; Filament gcode\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "400" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_time": [ + "18" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "165" + ], + "filament_dev_drying_cooling_temperature": [ + "150" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "85", + "65", + "85" + ], + "filament_dev_drying_softening_temperature": [ + "150" + ] +} diff --git a/resources/profiles/BBL/filament/Polymaker/Fiberon PET-CF17 @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PET-CF17 @base.json similarity index 50% rename from resources/profiles/BBL/filament/Polymaker/Fiberon PET-CF17 @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PET-CF17 @base.json index d55b7d2daf..f56f885917 100644 --- a/resources/profiles/BBL/filament/Polymaker/Fiberon PET-CF17 @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PET-CF17 @base.json @@ -82,5 +82,51 @@ ], "textured_plate_temp_initial_layer": [ "70" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S180\n{elsif (bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S255\n{endif};Prevent PLA from jamming\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "300" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "80" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "75" + ], + "filament_dev_drying_cooling_temperature": [ + "55" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "65", + "55", + "55" + ], + "filament_dev_drying_softening_temperature": [ + "60" ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PETG-rCF08 @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PETG-rCF08 @base.json new file mode 100644 index 0000000000..08e7989dbc --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Fiberon PETG-rCF08 @base.json @@ -0,0 +1,147 @@ +{ + "type": "filament", + "name": "Fiberon PETG-rCF08 @base", + "inherits": "fdm_filament_pet", + "from": "system", + "filament_id": "OFw4WD4T", + "instantiation": "false", + "bed_type": [ + "Cool Plate" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "fan_cooling_layer_time": [ + "12" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "0" + ], + "filament_cost": [ + "39.99" + ], + "filament_density": [ + "1.3" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "filament_type": [ + "PETG-CF" + ], + "filament_vendor": [ + "Polymaker" + ], + "full_fan_speed_layer": [ + "0" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "nozzle_temperature": [ + "270" + ], + "nozzle_temperature_initial_layer": [ + "270" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "nozzle_temperature_range_low": [ + "240" + ], + "overhang_fan_speed": [ + "70" + ], + "overhang_fan_threshold": [ + "95%" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "2" + ], + "slow_down_min_speed": [ + "20" + ], + "temperature_vitrification": [ + "69.7" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S180\n{elsif (bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S255\n{endif};Prevent PLA from jamming\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "300" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "80" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "75" + ], + "filament_dev_drying_cooling_temperature": [ + "55" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "65", + "55", + "55" + ], + "filament_dev_drying_softening_temperature": [ + "60" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite CosPLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite CosPLA @base.json new file mode 100644 index 0000000000..a0ed46734e --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite CosPLA @base.json @@ -0,0 +1,117 @@ +{ + "type": "filament", + "name": "PolyLite CosPLA @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "OFJgijky", + "instantiation": "false", + "bed_type": [ + "Cool Plate" + ], + "cool_plate_temp": [ + "60" + ], + "cool_plate_temp_initial_layer": [ + "60" + ], + "eng_plate_temp": [ + "60" + ], + "eng_plate_temp_initial_layer": [ + "60" + ], + "filament_cost": [ + "20.99" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "filament_vendor": [ + "Polymaker" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature": [ + "230" + ], + "nozzle_temperature_initial_layer": [ + "230" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "overhang_fan_speed": [ + "75" + ], + "slow_down_layer_time": [ + "5" + ], + "slow_down_min_speed": [ + "5" + ], + "temperature_vitrification": [ + "59" + ], + "textured_plate_temp": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ], + "filament_type": [ + "PLA" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA Galaxy @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA Galaxy @base.json new file mode 100644 index 0000000000..3dbf49779f --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA Galaxy @base.json @@ -0,0 +1,114 @@ +{ + "type": "filament", + "name": "PolyLite PLA Galaxy @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "OFvyB0Bz", + "instantiation": "false", + "bed_type": [ + "Cool Plate" + ], + "cool_plate_temp": [ + "60" + ], + "cool_plate_temp_initial_layer": [ + "60" + ], + "eng_plate_temp": [ + "60" + ], + "eng_plate_temp_initial_layer": [ + "60" + ], + "filament_cost": [ + "29.99" + ], + "filament_density": [ + "1.17" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "filament_vendor": [ + "Polymaker" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "overhang_fan_speed": [ + "75" + ], + "slow_down_layer_time": [ + "2" + ], + "slow_down_min_speed": [ + "5" + ], + "temperature_vitrification": [ + "61" + ], + "textured_plate_temp": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ], + "filament_type": [ + "PLA" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA Glow @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA Glow @base.json new file mode 100644 index 0000000000..fd598973b3 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA Glow @base.json @@ -0,0 +1,114 @@ +{ + "type": "filament", + "name": "PolyLite PLA Glow @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "OF5umxxT", + "instantiation": "false", + "bed_type": [ + "Cool Plate" + ], + "cool_plate_temp": [ + "60" + ], + "cool_plate_temp_initial_layer": [ + "60" + ], + "eng_plate_temp": [ + "60" + ], + "eng_plate_temp_initial_layer": [ + "60" + ], + "filament_cost": [ + "29.99" + ], + "filament_density": [ + "1.17" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "filament_vendor": [ + "Polymaker" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "overhang_fan_speed": [ + "75" + ], + "slow_down_layer_time": [ + "2" + ], + "slow_down_min_speed": [ + "5" + ], + "temperature_vitrification": [ + "61" + ], + "textured_plate_temp": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ], + "filament_type": [ + "PLA" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA Luminous @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA Luminous @base.json new file mode 100644 index 0000000000..e4c4679b13 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA Luminous @base.json @@ -0,0 +1,114 @@ +{ + "type": "filament", + "name": "PolyLite PLA Luminous @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "OFBoSWxb", + "instantiation": "false", + "bed_type": [ + "Cool Plate" + ], + "cool_plate_temp": [ + "60" + ], + "cool_plate_temp_initial_layer": [ + "60" + ], + "eng_plate_temp": [ + "60" + ], + "eng_plate_temp_initial_layer": [ + "60" + ], + "filament_cost": [ + "29.99" + ], + "filament_density": [ + "1.17" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "filament_vendor": [ + "Polymaker" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "overhang_fan_speed": [ + "75" + ], + "slow_down_layer_time": [ + "2" + ], + "slow_down_min_speed": [ + "5" + ], + "temperature_vitrification": [ + "61" + ], + "textured_plate_temp": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ], + "filament_type": [ + "PLA" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA Neon @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA Neon @base.json new file mode 100644 index 0000000000..df73135660 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA Neon @base.json @@ -0,0 +1,114 @@ +{ + "type": "filament", + "name": "PolyLite PLA Neon @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "OFitS8al", + "instantiation": "false", + "bed_type": [ + "Cool Plate" + ], + "cool_plate_temp": [ + "60" + ], + "cool_plate_temp_initial_layer": [ + "60" + ], + "eng_plate_temp": [ + "60" + ], + "eng_plate_temp_initial_layer": [ + "60" + ], + "filament_cost": [ + "29.99" + ], + "filament_density": [ + "1.17" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "filament_vendor": [ + "Polymaker" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "overhang_fan_speed": [ + "75" + ], + "slow_down_layer_time": [ + "2" + ], + "slow_down_min_speed": [ + "5" + ], + "temperature_vitrification": [ + "61" + ], + "textured_plate_temp": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ], + "filament_type": [ + "PLA" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA Starlight @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA Starlight @base.json new file mode 100644 index 0000000000..467b3e5083 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA Starlight @base.json @@ -0,0 +1,114 @@ +{ + "type": "filament", + "name": "PolyLite PLA Starlight @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "OFIxOuOu", + "instantiation": "false", + "bed_type": [ + "Cool Plate" + ], + "cool_plate_temp": [ + "60" + ], + "cool_plate_temp_initial_layer": [ + "60" + ], + "eng_plate_temp": [ + "60" + ], + "eng_plate_temp_initial_layer": [ + "60" + ], + "filament_cost": [ + "29.99" + ], + "filament_density": [ + "1.17" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "filament_vendor": [ + "Polymaker" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "overhang_fan_speed": [ + "75" + ], + "slow_down_layer_time": [ + "2" + ], + "slow_down_min_speed": [ + "5" + ], + "temperature_vitrification": [ + "61" + ], + "textured_plate_temp": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ], + "filament_type": [ + "PLA" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA Translucent @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA Translucent @base.json new file mode 100644 index 0000000000..8a03d118c7 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyLite PLA Translucent @base.json @@ -0,0 +1,114 @@ +{ + "type": "filament", + "name": "PolyLite PLA Translucent @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "OFy02QHU", + "instantiation": "false", + "bed_type": [ + "Cool Plate" + ], + "cool_plate_temp": [ + "60" + ], + "cool_plate_temp_initial_layer": [ + "60" + ], + "eng_plate_temp": [ + "60" + ], + "eng_plate_temp_initial_layer": [ + "60" + ], + "filament_cost": [ + "29.99" + ], + "filament_density": [ + "1.17" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "filament_vendor": [ + "Polymaker" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "overhang_fan_speed": [ + "75" + ], + "slow_down_layer_time": [ + "2" + ], + "slow_down_min_speed": [ + "5" + ], + "temperature_vitrification": [ + "61" + ], + "textured_plate_temp": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ], + "filament_type": [ + "PLA" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyTerra PLA Marble @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyTerra PLA Marble @base.json new file mode 100644 index 0000000000..470a945b3a --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyTerra PLA Marble @base.json @@ -0,0 +1,123 @@ +{ + "type": "filament", + "name": "PolyTerra PLA Marble @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "OFxe4rXr", + "instantiation": "false", + "bed_type": [ + "Cool Plate" + ], + "cool_plate_temp": [ + "60" + ], + "cool_plate_temp_initial_layer": [ + "60" + ], + "eng_plate_temp": [ + "60" + ], + "eng_plate_temp_initial_layer": [ + "60" + ], + "fan_cooling_layer_time": [ + "80" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "60" + ], + "filament_cost": [ + "21.99" + ], + "filament_density": [ + "1.37" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "22" + ], + "filament_vendor": [ + "Polymaker" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "overhang_fan_speed": [ + "75" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_min_speed": [ + "5" + ], + "temperature_vitrification": [ + "61" + ], + "textured_plate_temp": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ], + "filament_type": [ + "PLA" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyTerra PLA+ @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyTerra PLA+ @base.json new file mode 100644 index 0000000000..ac351462b1 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/PolyTerra PLA+ @base.json @@ -0,0 +1,117 @@ +{ + "type": "filament", + "name": "PolyTerra PLA+ @base", + "inherits": "fdm_filament_pla", + "from": "system", + "filament_id": "OFEjbwqG", + "instantiation": "false", + "bed_type": [ + "Cool Plate" + ], + "cool_plate_temp": [ + "60" + ], + "cool_plate_temp_initial_layer": [ + "60" + ], + "eng_plate_temp": [ + "60" + ], + "eng_plate_temp_initial_layer": [ + "60" + ], + "filament_cost": [ + "20.99" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "filament_vendor": [ + "Polymaker" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature": [ + "230" + ], + "nozzle_temperature_initial_layer": [ + "230" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "overhang_fan_speed": [ + "75" + ], + "slow_down_layer_time": [ + "5" + ], + "slow_down_min_speed": [ + "5" + ], + "temperature_vitrification": [ + "59" + ], + "textured_plate_temp": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ], + "filament_type": [ + "PLA" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Polymaker PLA Pro @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Polymaker PLA Pro @System.json new file mode 100644 index 0000000000..db1a73238a --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Polymaker PLA Pro @System.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "Polymaker PLA Pro @System", + "inherits": "Polymaker PLA Pro @base", + "from": "system", + "setting_id": "i5Fvxdl7AAJcErsv", + "instantiation": "true", + "filament_flow_ratio": [ + "0.96" + ], + "filament_max_volumetric_speed": [ + "15" + ] +} diff --git a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Polymaker PLA Pro @base.json similarity index 73% rename from resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Polymaker PLA Pro @base.json index 585a6dd554..b3878553fe 100644 --- a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA-GF @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Polymaker/Polymaker PLA Pro @base.json @@ -1,21 +1,18 @@ { "type": "filament", - "name": "Polymaker HT-PLA-GF @base", + "name": "Polymaker PLA Pro @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OFlwmqrC", + "filament_id": "OF5oXk4M", "instantiation": "false", - "filament_cost": [ - "32.99" - ], "filament_density": [ - "1.34" + "1.23" ], "filament_flow_ratio": [ - "0.98" + "0.96" ], "filament_max_volumetric_speed": [ - "24" + "15" ], "filament_vendor": [ "Polymaker" @@ -32,10 +29,7 @@ "nozzle_temperature_range_low": [ "210" ], - "slow_down_layer_time": [ - "4" - ], "temperature_vitrification": [ - "60" + "55" ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Printalot/PlastAR PLA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Printalot/PlastAR PLA @System.json new file mode 100644 index 0000000000..3eb8940374 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Printalot/PlastAR PLA @System.json @@ -0,0 +1,9 @@ +{ + "type": "filament", + "name": "PlastAR PLA @System", + "inherits": "PlastAR PLA @base", + "from": "system", + "setting_id": "BuWjJYav1gbWZacL", + "instantiation": "true", + "compatible_printers": [] +} diff --git a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Printalot/PlastAR PLA @base.json similarity index 51% rename from resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @base.json rename to resources/profiles/OrcaFilamentLibrary/filament/Printalot/PlastAR PLA @base.json index 94ab2b2fd9..6179da8788 100644 --- a/resources/profiles/BBL/filament/Polymaker/Polymaker HT-PLA @base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/Printalot/PlastAR PLA @base.json @@ -1,47 +1,48 @@ { "type": "filament", - "name": "Polymaker HT-PLA @base", + "name": "PlastAR PLA @base", "inherits": "fdm_filament_pla", "from": "system", - "filament_id": "OFPoyiFs", + "filament_id": "OFCTqYGM", "instantiation": "false", - "filament_cost": [ - "26.99" + "filament_vendor": [ + "PlastAR" + ], + "filament_type": [ + "PLA" + ], + "filament_notes": "PlastAR PLA (Printalot budget line). Product page: https://printalot.com.ar/productos/filamentos/pla/plast-ar-pla-1-kg/ Community-contributed profile; not affiliated with or endorsed by Printalot.", + "filament_diameter": [ + "1.75" ], "filament_density": [ - "1.28" + "1.24" ], "filament_flow_ratio": [ "0.98" ], - "filament_max_volumetric_speed": [ - "24" - ], - "filament_vendor": [ - "Polymaker" - ], "nozzle_temperature": [ "220" ], "nozzle_temperature_initial_layer": [ "220" ], + "nozzle_temperature_range_low": [ + "190" + ], "nozzle_temperature_range_high": [ "230" ], - "nozzle_temperature_range_low": [ - "210" + "hot_plate_temp": [ + "60" ], - "slow_down_layer_time": [ - "4" - ], - "temperature_vitrification": [ + "hot_plate_temp_initial_layer": [ "60" ], "textured_plate_temp": [ - "65" + "60" ], "textured_plate_temp_initial_layer": [ - "65" + "60" ] } diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Printalot/Printalot ABS @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Printalot/Printalot ABS @System.json new file mode 100644 index 0000000000..28dcf49bd2 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Printalot/Printalot ABS @System.json @@ -0,0 +1,9 @@ +{ + "type": "filament", + "name": "Printalot ABS @System", + "inherits": "Printalot ABS @base", + "from": "system", + "setting_id": "yIAtpMcQarjl45T7", + "instantiation": "true", + "compatible_printers": [] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Printalot/Printalot ABS @base.json b/resources/profiles/OrcaFilamentLibrary/filament/Printalot/Printalot ABS @base.json new file mode 100644 index 0000000000..073dc5c47d --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Printalot/Printalot ABS @base.json @@ -0,0 +1,54 @@ +{ + "type": "filament", + "name": "Printalot ABS @base", + "inherits": "fdm_filament_abs", + "from": "system", + "filament_id": "OFgq39c2", + "instantiation": "false", + "filament_vendor": [ + "Printalot" + ], + "filament_type": [ + "ABS" + ], + "filament_notes": "Printalot ABS. Product page: https://printalot.com.ar/productos/filamentos/abs/abs-1-kg/ Community-contributed profile; not affiliated with or endorsed by Printalot.", + "filament_diameter": [ + "1.75" + ], + "filament_density": [ + "1.05" + ], + "filament_flow_ratio": [ + "0.94" + ], + "filament_max_volumetric_speed": [ + "18" + ], + "filament_retraction_length": [ + "0.2" + ], + "nozzle_temperature": [ + "250" + ], + "nozzle_temperature_initial_layer": [ + "250" + ], + "nozzle_temperature_range_low": [ + "240" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "hot_plate_temp": [ + "100" + ], + "hot_plate_temp_initial_layer": [ + "100" + ], + "textured_plate_temp": [ + "100" + ], + "textured_plate_temp_initial_layer": [ + "100" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic ABS @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic ABS @BBL base.json new file mode 100644 index 0000000000..d4a694e968 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic ABS @BBL base.json @@ -0,0 +1,82 @@ +{ + "type": "filament", + "name": "Generic ABS @BBL base", + "inherits": "fdm_filament_abs", + "from": "system", + "instantiation": "false", + "activate_air_filtration": [ + "1" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "eng_plate_temp": [ + "90" + ], + "eng_plate_temp_initial_layer": [ + "90" + ], + "filament_adhesiveness_category": [ + "200" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "90" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "80", + "65", + "75" + ], + "filament_dev_ams_drying_time": [ + "12", + "8.0", + "12", + "8.0" + ], + "filament_dev_drying_cooling_temperature": [ + "75" + ], + "filament_dev_drying_softening_temperature": [ + "80" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "filament_start_gcode": [ + "; Filament gcode\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "hot_plate_temp": [ + "90" + ], + "hot_plate_temp_initial_layer": [ + "90" + ], + "nozzle_temperature": [ + "270" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "temperature_vitrification": [ + "100" + ], + "textured_plate_temp": [ + "90" + ], + "textured_plate_temp_initial_layer": [ + "90" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic PA @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic PA @BBL base.json new file mode 100644 index 0000000000..87e9176216 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic PA @BBL base.json @@ -0,0 +1,88 @@ +{ + "type": "filament", + "name": "Generic PA @BBL base", + "inherits": "fdm_filament_pa", + "from": "system", + "instantiation": "false", + "activate_air_filtration": [ + "1" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "fan_cooling_layer_time": [ + "65" + ], + "fan_max_speed": [ + "85" + ], + "fan_min_speed": [ + "40" + ], + "filament_adhesiveness_category": [ + "400" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "90" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "80", + "65", + "80" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_time": [ + "18" + ], + "filament_dev_drying_cooling_temperature": [ + "65" + ], + "filament_dev_drying_softening_temperature": [ + "85" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "filament_start_gcode": [ + "; Filament gcode\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "nozzle_temperature": [ + "260" + ], + "nozzle_temperature_initial_layer": [ + "260" + ], + "nozzle_temperature_range_high": [ + "280" + ], + "nozzle_temperature_range_low": [ + "240" + ], + "overhang_fan_speed": [ + "95" + ], + "overhang_fan_threshold": [ + "10%" + ], + "required_nozzle_HRC": [ + "3" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_layer_time": [ + "8" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic PA-CF @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic PA-CF @BBL base.json new file mode 100644 index 0000000000..27a6bcc8fe --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic PA-CF @BBL base.json @@ -0,0 +1,85 @@ +{ + "type": "filament", + "name": "Generic PA-CF @BBL base", + "inherits": "fdm_filament_pa", + "from": "system", + "instantiation": "false", + "activate_air_filtration": [ + "1" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "fan_cooling_layer_time": [ + "5" + ], + "fan_max_speed": [ + "30" + ], + "fan_min_speed": [ + "10" + ], + "filament_adhesiveness_category": [ + "400" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "165" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "85", + "65", + "85" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_time": [ + "18" + ], + "filament_dev_drying_cooling_temperature": [ + "150" + ], + "filament_dev_drying_softening_temperature": [ + "150" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_start_gcode": [ + "; Filament gcode\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "filament_type": [ + "PA-CF" + ], + "full_fan_speed_layer": [ + "2" + ], + "nozzle_temperature": [ + "290" + ], + "nozzle_temperature_initial_layer": [ + "290" + ], + "overhang_fan_speed": [ + "40" + ], + "overhang_fan_threshold": [ + "0%" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "temperature_vitrification": [ + "170" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic PC @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic PC @BBL base.json new file mode 100644 index 0000000000..d979d07df1 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic PC @BBL base.json @@ -0,0 +1,52 @@ +{ + "type": "filament", + "name": "Generic PC @BBL base", + "inherits": "fdm_filament_pc", + "from": "system", + "instantiation": "false", + "close_additional_fan_first_x_layers": [ + "3" + ], + "filament_adhesiveness_category": [ + "500" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "105" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "80", + "65", + "80" + ], + "filament_dev_ams_drying_time": [ + "12", + "8.0", + "12", + "8.0" + ], + "filament_dev_drying_cooling_temperature": [ + "90" + ], + "filament_dev_drying_softening_temperature": [ + "90" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_max_volumetric_speed": [ + "16" + ], + "filament_start_gcode": [ + "; Filament gcode\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_min_speed": [ + "20" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic PETG @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic PETG @BBL base.json new file mode 100644 index 0000000000..a65e4d08bc --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic PETG @BBL base.json @@ -0,0 +1,107 @@ +{ + "type": "filament", + "name": "Generic PETG @BBL base", + "inherits": "fdm_filament_pet", + "from": "system", + "instantiation": "false", + "close_additional_fan_first_x_layers": [ + "3" + ], + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "90" + ], + "fan_min_speed": [ + "40" + ], + "filament_adhesiveness_category": [ + "300" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "75" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "65", + "55", + "55" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "80" + ], + "filament_dev_drying_cooling_temperature": [ + "55" + ], + "filament_dev_drying_softening_temperature": [ + "60" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "10%" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_layer_time": [ + "12" + ], + "slow_down_min_speed": [ + "20" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic PETG-CF @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic PETG-CF @BBL base.json new file mode 100644 index 0000000000..8349f1f552 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic PETG-CF @BBL base.json @@ -0,0 +1,113 @@ +{ + "type": "filament", + "name": "Generic PETG-CF @BBL base", + "inherits": "Generic PETG-CF @base", + "from": "system", + "instantiation": "false", + "close_additional_fan_first_x_layers": [ + "3" + ], + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "70" + ], + "eng_plate_temp_initial_layer": [ + "70" + ], + "fan_max_speed": [ + "30" + ], + "fan_min_speed": [ + "0" + ], + "filament_adhesiveness_category": [ + "300" + ], + "filament_cost": [ + "34.99" + ], + "filament_density": [ + "1.25" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "75" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "65", + "55", + "55" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "80" + ], + "filament_dev_drying_cooling_temperature": [ + "55" + ], + "filament_dev_drying_softening_temperature": [ + "60" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "hot_plate_temp": [ + "70" + ], + "hot_plate_temp_initial_layer": [ + "70" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "nozzle_temperature_range_low": [ + "240" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "10%" + ], + "required_nozzle_HRC": [ + "40" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_layer_time": [ + "6" + ], + "textured_plate_temp": [ + "70" + ], + "textured_plate_temp_initial_layer": [ + "70" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic PLA @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic PLA @BBL base.json new file mode 100644 index 0000000000..75bd53937d --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic PLA @BBL base.json @@ -0,0 +1,59 @@ +{ + "type": "filament", + "name": "Generic PLA @BBL base", + "inherits": "fdm_filament_pla", + "from": "system", + "instantiation": "false", + "close_additional_fan_first_x_layers": [ + "3" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif};Prevent PLA from jamming\n\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_min_speed": [ + "20" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic PLA High Speed @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic PLA High Speed @BBL base.json new file mode 100644 index 0000000000..d25b8b2972 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic PLA High Speed @BBL base.json @@ -0,0 +1,62 @@ +{ + "type": "filament", + "name": "Generic PLA High Speed @BBL base", + "inherits": "fdm_filament_pla", + "from": "system", + "instantiation": "false", + "close_additional_fan_first_x_layers": [ + "3" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_max_volumetric_speed": [ + "18" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_min_speed": [ + "20" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic PLA Silk @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic PLA Silk @BBL base.json new file mode 100644 index 0000000000..15a73adc83 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic PLA Silk @BBL base.json @@ -0,0 +1,65 @@ +{ + "type": "filament", + "name": "Generic PLA Silk @BBL base", + "inherits": "fdm_filament_pla", + "from": "system", + "instantiation": "false", + "close_additional_fan_first_x_layers": [ + "3" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif};Prevent PLA from jamming\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_min_speed": [ + "20" + ], + "supertack_plate_temp": [ + "35" + ], + "supertack_plate_temp_initial_layer": [ + "35" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic PLA-CF @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic PLA-CF @BBL base.json new file mode 100644 index 0000000000..0f1f98fe3d --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic PLA-CF @BBL base.json @@ -0,0 +1,83 @@ +{ + "type": "filament", + "name": "Generic PLA-CF @BBL base", + "inherits": "fdm_filament_pla", + "from": "system", + "instantiation": "false", + "additional_cooling_fan_speed": [ + "0" + ], + "close_additional_fan_first_x_layers": [ + "3" + ], + "cool_plate_temp": [ + "45" + ], + "cool_plate_temp_initial_layer": [ + "45" + ], + "filament_adhesiveness_category": [ + "100" + ], + "filament_dev_ams_drying_ams_limitations": [ + "1", + "0" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "45", + "45", + "45", + "45" + ], + "filament_dev_ams_drying_time": [ + "12", + "12", + "12", + "12" + ], + "filament_dev_chamber_drying_bed_temperature": [ + "70" + ], + "filament_dev_drying_cooling_temperature": [ + "45" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "filament_type": [ + "PLA-CF" + ], + "required_nozzle_HRC": [ + "40" + ], + "retraction_distances_when_ec": [ + "0" + ], + "slow_down_layer_time": [ + "7" + ], + "slow_down_min_speed": [ + "20" + ], + "supertack_plate_temp": [ + "50" + ], + "supertack_plate_temp_initial_layer": [ + "50" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic TPU @BBL base.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic TPU @BBL base.json new file mode 100644 index 0000000000..37ca736246 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/Generic TPU @BBL base.json @@ -0,0 +1,49 @@ +{ + "type": "filament", + "name": "Generic TPU @BBL base", + "inherits": "fdm_filament_tpu", + "from": "system", + "instantiation": "false", + "close_additional_fan_first_x_layers": [ + "3" + ], + "filament_adhesiveness_category": [ + "600" + ], + "filament_dev_ams_drying_heat_distortion_temperature": [ + "45" + ], + "filament_dev_ams_drying_temperature": [ + "65", + "75", + "45", + "45" + ], + "filament_dev_ams_drying_time": [ + "12", + "18", + "12", + "18" + ], + "filament_dev_chamber_drying_time": [ + "16" + ], + "filament_dev_drying_cooling_temperature": [ + "40" + ], + "filament_dev_drying_softening_temperature": [ + "50" + ], + "filament_end_gcode": [ + "; filament end gcode \n\n" + ], + "filament_start_gcode": [ + "; filament start gcode\n{if (bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >30)||(bed_temperature_initial_layer[current_extruder] >30)}M106 P3 S180\n{endif} \n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" + ], + "retraction_distances_when_ec": [ + "0" + ], + "volumetric_speed_coefficients": [ + "0 0 0 0 0 0" + ] +} diff --git a/resources/profiles/BBL/filament/addnorth/addnorth ABS rABS.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth ABS rABS.json similarity index 98% rename from resources/profiles/BBL/filament/addnorth/addnorth ABS rABS.json rename to resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth ABS rABS.json index 5d6b376e47..c5e97344e6 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth ABS rABS.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth ABS rABS.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "addnorth ABS rABS", - "inherits": "Generic ABS @base", + "inherits": "Generic ABS @BBL base", "from": "system", - "setting_id": "GF_ANRA_00", + "setting_id": "bYVQgQBBRMux4QtM", "filament_id": "OFzk5oAo", "instantiation": "true", "activate_air_filtration": [ diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PA Adura FDA.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA Adura FDA.json similarity index 98% rename from resources/profiles/BBL/filament/addnorth/addnorth PA Adura FDA.json rename to resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA Adura FDA.json index 703389a687..a6cec42f4a 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PA Adura FDA.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA Adura FDA.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "addnorth PA Adura FDA", - "inherits": "Generic PA @base", + "inherits": "Generic PA @BBL base", "from": "system", - "setting_id": "GF_ANAF_00", + "setting_id": "P7DJKbbOFdbW8PiQ", "filament_id": "OFSw6Mor", "instantiation": "true", "activate_air_filtration": [ diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PA Adura.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA Adura.json similarity index 98% rename from resources/profiles/BBL/filament/addnorth/addnorth PA Adura.json rename to resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA Adura.json index beba3c51de..1c072f99b1 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PA Adura.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA Adura.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "addnorth PA Adura", - "inherits": "Generic PA @base", + "inherits": "Generic PA @BBL base", "from": "system", - "setting_id": "GF_ANAD_00", + "setting_id": "08Ph3NCT7oy6bt1I", "filament_id": "OFWK0Y9A", "instantiation": "true", "activate_air_filtration": [ diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PA-CF Adura X.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA-CF Adura X.json similarity index 98% rename from resources/profiles/BBL/filament/addnorth/addnorth PA-CF Adura X.json rename to resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA-CF Adura X.json index f4894e3e6a..b07d89b749 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PA-CF Adura X.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA-CF Adura X.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "addnorth PA-CF Adura X", - "inherits": "Generic PA-CF @base", + "inherits": "Generic PA-CF @BBL base", "from": "system", - "setting_id": "GF_ANAX_00", + "setting_id": "anjeZ96YVijlGovm", "filament_id": "OFBsbMMF", "instantiation": "true", "activate_air_filtration": [ diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PA6 Addlantis.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA6 Addlantis.json similarity index 98% rename from resources/profiles/BBL/filament/addnorth/addnorth PA6 Addlantis.json rename to resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA6 Addlantis.json index 5cb61738c8..a0a967026e 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PA6 Addlantis.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA6 Addlantis.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "addnorth PA6 Addlantis", - "inherits": "Generic PA @base", + "inherits": "Generic PA @BBL base", "from": "system", - "setting_id": "GF_ANLA_00", + "setting_id": "b9bF4KKvxA9TaOjF", "filament_id": "OF1ID4N1", "instantiation": "true", "activate_air_filtration": [ diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PC BLend HT LCF.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PC BLend HT LCF.json similarity index 98% rename from resources/profiles/BBL/filament/addnorth/addnorth PC BLend HT LCF.json rename to resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PC BLend HT LCF.json index b94065e44d..2a4219ef1d 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PC BLend HT LCF.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PC BLend HT LCF.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "addnorth PC BLend HT LCF", - "inherits": "Generic PC @base", + "inherits": "Generic PC @BBL base", "from": "system", - "setting_id": "GF_ANPBX_00", + "setting_id": "UWA9V5XulJ8hHOsK", "filament_id": "OFhN09f0", "instantiation": "true", "activate_air_filtration": [ diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PETG Base.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Base.json similarity index 98% rename from resources/profiles/BBL/filament/addnorth/addnorth PETG Base.json rename to resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Base.json index eb1ffaf48c..2f4206faea 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PETG Base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Base.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "addnorth PETG Base", - "inherits": "Generic PETG @base", + "inherits": "Generic PETG @BBL base", "from": "system", - "setting_id": "GF_ANPE_00", + "setting_id": "Akp0GVUm3MHf7OsA", "filament_id": "OFHHwrd1", "instantiation": "true", "activate_air_filtration": [ diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PETG ESD.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG ESD.json similarity index 98% rename from resources/profiles/BBL/filament/addnorth/addnorth PETG ESD.json rename to resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG ESD.json index de07353b97..1cafba7a4e 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PETG ESD.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG ESD.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "addnorth PETG ESD", - "inherits": "Generic PETG @base", + "inherits": "Generic PETG @BBL base", "from": "system", - "setting_id": "GF_ANEG_00", + "setting_id": "6nKNE7WJ6wCFrNoi", "filament_id": "OFUtiVRn", "instantiation": "true", "activate_air_filtration": [ diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PETG Economy.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Economy.json similarity index 98% rename from resources/profiles/BBL/filament/addnorth/addnorth PETG Economy.json rename to resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Economy.json index f3df226774..17f23ee8b3 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PETG Economy.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Economy.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "addnorth PETG Economy", - "inherits": "Generic PETG @base", + "inherits": "Generic PETG @BBL base", "from": "system", - "setting_id": "GF_ANGE_00", + "setting_id": "eQivhqRViItWCwEX", "filament_id": "OFZGrQTU", "instantiation": "true", "activate_air_filtration": [ diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PETG Flame v0.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Flame v0.json similarity index 98% rename from resources/profiles/BBL/filament/addnorth/addnorth PETG Flame v0.json rename to resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Flame v0.json index 08ad97161a..3a83fffcdc 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PETG Flame v0.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Flame v0.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "addnorth PETG Flame v0", - "inherits": "Generic PETG @base", + "inherits": "Generic PETG @BBL base", "from": "system", - "setting_id": "GF_ANPF_00", + "setting_id": "mrOAjreoxAIouiAt", "filament_id": "OF0EYBWQ", "instantiation": "true", "activate_air_filtration": [ diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PETG PRO Matte.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG PRO Matte.json similarity index 98% rename from resources/profiles/BBL/filament/addnorth/addnorth PETG PRO Matte.json rename to resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG PRO Matte.json index 0948d9f9c7..b894fad112 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PETG PRO Matte.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG PRO Matte.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "addnorth PETG PRO Matte", - "inherits": "Generic PETG @base", + "inherits": "Generic PETG @BBL base", "from": "system", - "setting_id": "GF_ANPM_00", + "setting_id": "KFHaOT0Jte5AvS9h", "filament_id": "OFU5JPDy", "instantiation": "true", "activate_air_filtration": [ diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PETG rPETG Matte.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG rPETG Matte.json similarity index 98% rename from resources/profiles/BBL/filament/addnorth/addnorth PETG rPETG Matte.json rename to resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG rPETG Matte.json index 0396c6578d..fc7470096e 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PETG rPETG Matte.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG rPETG Matte.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "addnorth PETG rPETG Matte", - "inherits": "Generic PETG @base", + "inherits": "Generic PETG @BBL base", "from": "system", - "setting_id": "GF_ANRM_00", + "setting_id": "nQKorwiLMPEErXYY", "filament_id": "OFqTwtXM", "instantiation": "true", "activate_air_filtration": [ diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PETG-CF Rigid X.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG-CF Rigid X.json similarity index 98% rename from resources/profiles/BBL/filament/addnorth/addnorth PETG-CF Rigid X.json rename to resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG-CF Rigid X.json index a0f78bb956..70d3df17cf 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PETG-CF Rigid X.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG-CF Rigid X.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "addnorth PETG-CF Rigid X", - "inherits": "Generic PETG-CF @base", + "inherits": "Generic PETG-CF @BBL base", "from": "system", - "setting_id": "GF_ANRX_00", + "setting_id": "YBPZbWUVDHXCCNuf", "filament_id": "OFAcJkl1", "instantiation": "true", "activate_air_filtration": [ diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PLA E-PLA.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA E-PLA.json similarity index 98% rename from resources/profiles/BBL/filament/addnorth/addnorth PLA E-PLA.json rename to resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA E-PLA.json index 3a35d16b29..783ee6ccd1 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PLA E-PLA.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA E-PLA.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "addnorth PLA E-PLA", - "inherits": "Generic PLA @base", + "inherits": "Generic PLA @BBL base", "from": "system", - "setting_id": "GF_ANEP_00", + "setting_id": "8uUckNJ5ysf07IYC", "filament_id": "OF71b7qO", "instantiation": "true", "activate_air_filtration": [ diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PLA Economy.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Economy.json similarity index 98% rename from resources/profiles/BBL/filament/addnorth/addnorth PLA Economy.json rename to resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Economy.json index 77a86797f0..84a22a9a60 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PLA Economy.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Economy.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "addnorth PLA Economy", - "inherits": "Generic PLA @base", + "inherits": "Generic PLA @BBL base", "from": "system", - "setting_id": "GF_ANPL_00", + "setting_id": "ZENT5cw0e5khSvwe", "filament_id": "OFZJft47", "instantiation": "true", "activate_air_filtration": [ diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PLA HT-PLA PRO Matte.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA HT-PLA PRO Matte.json similarity index 98% rename from resources/profiles/BBL/filament/addnorth/addnorth PLA HT-PLA PRO Matte.json rename to resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA HT-PLA PRO Matte.json index 5327b8a083..f3236b5d5a 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PLA HT-PLA PRO Matte.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA HT-PLA PRO Matte.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "addnorth PLA HT-PLA PRO Matte", - "inherits": "Generic PLA @base", + "inherits": "Generic PLA @BBL base", "from": "system", - "setting_id": "GF_ANHTP_00", + "setting_id": "9qfkzOF7e8gAXv57", "filament_id": "OFVDWuxl", "instantiation": "true", "activate_air_filtration": [ diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PLA Premium Silk.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Premium Silk.json similarity index 98% rename from resources/profiles/BBL/filament/addnorth/addnorth PLA Premium Silk.json rename to resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Premium Silk.json index 1487f567cd..f1bf250692 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PLA Premium Silk.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Premium Silk.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "addnorth PLA Premium Silk", - "inherits": "Generic PLA Silk @base", + "inherits": "Generic PLA Silk @BBL base", "from": "system", - "setting_id": "GF_ANPS_00", + "setting_id": "Z15Ye6VtACtidxAY", "filament_id": "OFOQCfVa", "instantiation": "true", "activate_air_filtration": [ diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PLA Textura.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Textura.json similarity index 98% rename from resources/profiles/BBL/filament/addnorth/addnorth PLA Textura.json rename to resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Textura.json index 789d2bd096..218bb0f6af 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PLA Textura.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Textura.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "addnorth PLA Textura", - "inherits": "Generic PLA @base", + "inherits": "Generic PLA @BBL base", "from": "system", - "setting_id": "GF_ANTE_00", + "setting_id": "Lghtct7718TzOZhh", "filament_id": "OFRFhdqy", "instantiation": "true", "activate_air_filtration": [ diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PLA Wood.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Wood.json similarity index 98% rename from resources/profiles/BBL/filament/addnorth/addnorth PLA Wood.json rename to resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Wood.json index aed77a1a1a..d4c4c4c04f 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PLA Wood.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Wood.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "addnorth PLA Wood", - "inherits": "Generic PLA @base", + "inherits": "Generic PLA @BBL base", "from": "system", - "setting_id": "GF_ANPLW_00", + "setting_id": "HLJjfniZF8YnyDXs", "filament_id": "OFN8QBhu", "instantiation": "true", "activate_air_filtration": [ diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PLA X-PLA High Speed.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA X-PLA High Speed.json similarity index 98% rename from resources/profiles/BBL/filament/addnorth/addnorth PLA X-PLA High Speed.json rename to resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA X-PLA High Speed.json index 6e0a0952d5..939a8301fb 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PLA X-PLA High Speed.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA X-PLA High Speed.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "addnorth PLA X-PLA High Speed", - "inherits": "Generic PLA High Speed @base", + "inherits": "Generic PLA High Speed @BBL base", "from": "system", - "setting_id": "GF_ANXPH_00", + "setting_id": "6Z0HjNASgsk02KHj", "filament_id": "OFLjDYxH", "instantiation": "true", "activate_air_filtration": [ diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PLA X-PLA.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA X-PLA.json similarity index 98% rename from resources/profiles/BBL/filament/addnorth/addnorth PLA X-PLA.json rename to resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA X-PLA.json index d785327ee7..075ab03f46 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PLA X-PLA.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA X-PLA.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "addnorth PLA X-PLA", - "inherits": "Generic PLA @base", + "inherits": "Generic PLA @BBL base", "from": "system", - "setting_id": "GF_ANXP_00", + "setting_id": "DwatndcgamhNXNwa", "filament_id": "OFtdVZpV", "instantiation": "true", "activate_air_filtration": [ diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PLA rPLA RE-ADD.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA rPLA RE-ADD.json similarity index 98% rename from resources/profiles/BBL/filament/addnorth/addnorth PLA rPLA RE-ADD.json rename to resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA rPLA RE-ADD.json index c530f3fa7c..771869bc04 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PLA rPLA RE-ADD.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA rPLA RE-ADD.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "addnorth PLA rPLA RE-ADD", - "inherits": "Generic PLA @base", + "inherits": "Generic PLA @BBL base", "from": "system", - "setting_id": "GF_ANRPL_00", + "setting_id": "C3PV2FCtxFb74701", "filament_id": "OFnBvPhb", "instantiation": "true", "activate_air_filtration": [ diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PLA-CF Carbon Fiber.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA-CF Carbon Fiber.json similarity index 98% rename from resources/profiles/BBL/filament/addnorth/addnorth PLA-CF Carbon Fiber.json rename to resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA-CF Carbon Fiber.json index 32debd4c18..60eebfce37 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PLA-CF Carbon Fiber.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA-CF Carbon Fiber.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "addnorth PLA-CF Carbon Fiber", - "inherits": "Generic PLA-CF @base", + "inherits": "Generic PLA-CF @BBL base", "from": "system", - "setting_id": "GF_ANPCF_00", + "setting_id": "6EGbWT7sxqv613lw", "filament_id": "OFcpa50Z", "instantiation": "true", "activate_air_filtration": [ diff --git a/resources/profiles/BBL/filament/addnorth/addnorth PVDF Adamant S1.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PVDF Adamant S1.json similarity index 98% rename from resources/profiles/BBL/filament/addnorth/addnorth PVDF Adamant S1.json rename to resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PVDF Adamant S1.json index 88258976f2..584d049776 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth PVDF Adamant S1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PVDF Adamant S1.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "addnorth PVDF Adamant S1", - "inherits": "Generic PA @base", + "inherits": "Generic PA @BBL base", "from": "system", - "setting_id": "GF_ANPV_00", + "setting_id": "rc1IER71KiN6wNpH", "filament_id": "OFQ5TxZ2", "instantiation": "true", "activate_air_filtration": [ diff --git a/resources/profiles/BBL/filament/addnorth/addnorth TPU EasyFlex.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU EasyFlex.json similarity index 98% rename from resources/profiles/BBL/filament/addnorth/addnorth TPU EasyFlex.json rename to resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU EasyFlex.json index afdcb43296..f75218b666 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth TPU EasyFlex.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU EasyFlex.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "addnorth TPU EasyFlex", - "inherits": "Generic TPU @base", + "inherits": "Generic TPU @BBL base", "from": "system", - "setting_id": "GF_ANEF_00", + "setting_id": "X0NEq8DKNad80uRp", "filament_id": "OFO6GMJ3", "instantiation": "true", "activate_air_filtration": [ diff --git a/resources/profiles/BBL/filament/addnorth/addnorth TPU Pro Matte 85A.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU Pro Matte 85A.json similarity index 98% rename from resources/profiles/BBL/filament/addnorth/addnorth TPU Pro Matte 85A.json rename to resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU Pro Matte 85A.json index 81d08c4681..446377b7c4 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth TPU Pro Matte 85A.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU Pro Matte 85A.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "addnorth TPU Pro Matte 85A", - "inherits": "Generic TPU @base", + "inherits": "Generic TPU @BBL base", "from": "system", - "setting_id": "GF_ANTA_00", + "setting_id": "2vvu1QFF18EEijLG", "filament_id": "OFvcIGee", "instantiation": "true", "activate_air_filtration": [ diff --git a/resources/profiles/BBL/filament/addnorth/addnorth TPU Pro Matte 95A.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU Pro Matte 95A.json similarity index 98% rename from resources/profiles/BBL/filament/addnorth/addnorth TPU Pro Matte 95A.json rename to resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU Pro Matte 95A.json index 0b4e7c3fcd..b63da895a8 100644 --- a/resources/profiles/BBL/filament/addnorth/addnorth TPU Pro Matte 95A.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU Pro Matte 95A.json @@ -1,9 +1,9 @@ { "type": "filament", "name": "addnorth TPU Pro Matte 95A", - "inherits": "Generic TPU @base", + "inherits": "Generic TPU @BBL base", "from": "system", - "setting_id": "GF_ANTM_00", + "setting_id": "lfe1hOdWYCc1gyop", "filament_id": "OFyJjkek", "instantiation": "true", "activate_air_filtration": [ diff --git a/resources/profiles/Prusa.json b/resources/profiles/Prusa.json index 723874f67d..e16e2d3be3 100644 --- a/resources/profiles/Prusa.json +++ b/resources/profiles/Prusa.json @@ -1,6 +1,6 @@ { "name": "Prusa", - "version": "02.04.00.06", + "version": "02.04.00.08", "force_update": "0", "description": "Prusa configurations", "machine_model_list": [ @@ -20,6 +20,10 @@ "name": "Prusa CORE One L HF", "sub_path": "machine/Prusa CORE One L HF.json" }, + { + "name": "Prusa CORE One MMU3", + "sub_path": "machine/Prusa CORE One MMU3.json" + }, { "name": "Prusa MINI", "sub_path": "machine/Prusa MINI.json" @@ -702,6 +706,26 @@ "name": "0.25mm Speed @MINIIS", "sub_path": "process/0.25mm Speed @MINIIS.json" }, + { + "name": "0.15mm BALANCED @COREONE0.4 + MMU3", + "sub_path": "process/0.15mm BALANCED @COREONE0.4 + MMU3.json" + }, + { + "name": "0.20mm BALANCED @COREONE0.4 + MMU3", + "sub_path": "process/0.20mm BALANCED @COREONE0.4 + MMU3.json" + }, + { + "name": "0.25mm BALANCED @COREONE0.4 + MMU3", + "sub_path": "process/0.25mm BALANCED @COREONE0.4 + MMU3.json" + }, + { + "name": "0.25mm SPEED @COREONE0.4 + MMU3", + "sub_path": "process/0.25mm SPEED @COREONE0.4 + MMU3.json" + }, + { + "name": "0.25mm STRUCTURAL @COREONE0.4 + MMU3", + "sub_path": "process/0.25mm STRUCTURAL @COREONE0.4 + MMU3.json" + }, { "name": "0.05mm DETAIL @MK4S 0.25", "sub_path": "process/0.05mm DETAIL @MK4S 0.25.json" @@ -1114,6 +1138,14 @@ "name": "0.05mm DETAIL @CORE One L 0.25", "sub_path": "process/0.05mm DETAIL @CORE One L 0.25.json" }, + { + "name": "0.07mm DETAIL @COREONE0.25 + MMU3", + "sub_path": "process/0.07mm DETAIL @COREONE0.25 + MMU3.json" + }, + { + "name": "0.12mm SPEED @COREONE0.25 + MMU3", + "sub_path": "process/0.12mm SPEED @COREONE0.25 + MMU3.json" + }, { "name": "0.12mm STRUCTURAL @CORE One 0.25", "sub_path": "process/0.12mm STRUCTURAL @CORE One 0.25.json" @@ -1134,6 +1166,10 @@ "name": "0.15mm STRUCTURAL @MK4S 0.25", "sub_path": "process/0.15mm STRUCTURAL @MK4S 0.25.json" }, + { + "name": "0.12mm STRUCTURAL @COREONE0.3 + MMU3", + "sub_path": "process/0.12mm STRUCTURAL @COREONE0.3 + MMU3.json" + }, { "name": "0.16mm SPEED @MK4S 0.3", "sub_path": "process/0.16mm SPEED @MK4S 0.3.json" @@ -1158,6 +1194,10 @@ "name": "0.10mm FAST DETAIL @CORE One L 0.4", "sub_path": "process/0.10mm FAST DETAIL @CORE One L 0.4.json" }, + { + "name": "0.15mm SPEED @COREONE0.4 + MMU3", + "sub_path": "process/0.15mm SPEED @COREONE0.4 + MMU3.json" + }, { "name": "0.15mm SPEED @CORE One HF 0.4", "sub_path": "process/0.15mm SPEED @CORE One HF 0.4.json" @@ -1166,6 +1206,22 @@ "name": "0.15mm SPEED @CORE One L HF 0.4", "sub_path": "process/0.15mm SPEED @CORE One L HF 0.4.json" }, + { + "name": "0.15mm STRUCTURAL @COREONE0.6 + MMU3", + "sub_path": "process/0.15mm STRUCTURAL @COREONE0.6 + MMU3.json" + }, + { + "name": "0.20mm SOLUBLE FULL @COREONE0.4 + MMU3", + "sub_path": "process/0.20mm SOLUBLE FULL @COREONE0.4 + MMU3.json" + }, + { + "name": "0.20mm SOLUBLE INTERFACE @COREONE0.4 + MMU3", + "sub_path": "process/0.20mm SOLUBLE INTERFACE @COREONE0.4 + MMU3.json" + }, + { + "name": "0.20mm SPEED @COREONE0.4 + MMU3", + "sub_path": "process/0.20mm SPEED @COREONE0.4 + MMU3.json" + }, { "name": "0.20mm SPEED @CORE One HF 0.5", "sub_path": "process/0.20mm SPEED @CORE One HF 0.5.json" @@ -1198,6 +1254,10 @@ "name": "0.25mm SPEED @MK4S HF0.5", "sub_path": "process/0.25mm SPEED @MK4S HF0.5.json" }, + { + "name": "0.20mm SPEED @COREONE0.6 + MMU3", + "sub_path": "process/0.20mm SPEED @COREONE0.6 + MMU3.json" + }, { "name": "0.20mm SPEED @CORE One HF 0.6", "sub_path": "process/0.20mm SPEED @CORE One HF 0.6.json" @@ -1222,6 +1282,10 @@ "name": "0.15mm STRUCTURAL @CORE One L 0.4", "sub_path": "process/0.15mm STRUCTURAL @CORE One L 0.4.json" }, + { + "name": "0.20mm STRUCTURAL @COREONE0.4 + MMU3", + "sub_path": "process/0.20mm STRUCTURAL @COREONE0.4 + MMU3.json" + }, { "name": "0.25mm STRUCTURAL @CORE One HF 0.4", "sub_path": "process/0.25mm STRUCTURAL @CORE One HF 0.4.json" @@ -1230,6 +1294,10 @@ "name": "0.25mm STRUCTURAL @CORE One L HF 0.4", "sub_path": "process/0.25mm STRUCTURAL @CORE One L HF 0.4.json" }, + { + "name": "0.25mm SPEED @COREONE0.6 + MMU3", + "sub_path": "process/0.25mm SPEED @COREONE0.6 + MMU3.json" + }, { "name": "0.25mm SPEED @CORE One HF 0.6", "sub_path": "process/0.25mm SPEED @CORE One HF 0.6.json" @@ -1262,6 +1330,10 @@ "name": "0.30mm STRUCTURAL @CORE One L HF 0.8", "sub_path": "process/0.30mm STRUCTURAL @CORE One L HF 0.8.json" }, + { + "name": "0.32mm SPEED @COREONE0.6 + MMU3", + "sub_path": "process/0.32mm SPEED @COREONE0.6 + MMU3.json" + }, { "name": "0.32mm SPEED @CORE One HF 0.6", "sub_path": "process/0.32mm SPEED @CORE One HF 0.6.json" @@ -1318,6 +1390,18 @@ "name": "0.55mm SPEED @CORE One L HF 0.8", "sub_path": "process/0.55mm SPEED @CORE One L HF 0.8.json" }, + { + "name": "0.05mm DETAIL @COREONE0.25 + MMU3", + "sub_path": "process/0.05mm DETAIL @COREONE0.25 + MMU3.json" + }, + { + "name": "0.12mm STRUCTURAL @COREONE0.25 + MMU3", + "sub_path": "process/0.12mm STRUCTURAL @COREONE0.25 + MMU3.json" + }, + { + "name": "0.15mm SPEED @COREONE0.25 + MMU3", + "sub_path": "process/0.15mm SPEED @COREONE0.25 + MMU3.json" + }, { "name": "0.15mm STRUCTURAL @CORE One 0.25", "sub_path": "process/0.15mm STRUCTURAL @CORE One 0.25.json" @@ -1338,6 +1422,10 @@ "name": "0.20mm SPEED @MK4S 0.3", "sub_path": "process/0.20mm SPEED @MK4S 0.3.json" }, + { + "name": "0.16mm STRUCTURAL @COREONE0.3 + MMU3", + "sub_path": "process/0.16mm STRUCTURAL @COREONE0.3 + MMU3.json" + }, { "name": "0.20mm STRUCTURAL @CORE One 0.3", "sub_path": "process/0.20mm STRUCTURAL @CORE One 0.3.json" @@ -1346,6 +1434,10 @@ "name": "0.20mm STRUCTURAL @CORE One L 0.3", "sub_path": "process/0.20mm STRUCTURAL @CORE One L 0.3.json" }, + { + "name": "0.10mm FAST DETAIL @COREONE0.4 + MMU3", + "sub_path": "process/0.10mm FAST DETAIL @COREONE0.4 + MMU3.json" + }, { "name": "0.25mm STRUCTURAL @CORE One 0.5", "sub_path": "process/0.25mm STRUCTURAL @CORE One 0.5.json" @@ -1370,6 +1462,30 @@ "name": "0.32mm SPEED @MK4S HF0.5", "sub_path": "process/0.32mm SPEED @MK4S HF0.5.json" }, + { + "name": "0.20mm STRUCTURAL @COREONE0.6 + MMU3", + "sub_path": "process/0.20mm STRUCTURAL @COREONE0.6 + MMU3.json" + }, + { + "name": "0.15mm STRUCTURAL @COREONE0.4 + MMU3", + "sub_path": "process/0.15mm STRUCTURAL @COREONE0.4 + MMU3.json" + }, + { + "name": "0.25mm STRUCTURAL @COREONE0.6 + MMU3", + "sub_path": "process/0.25mm STRUCTURAL @COREONE0.6 + MMU3.json" + }, + { + "name": "0.32mm STRUCTURAL @COREONE0.6 + MMU3", + "sub_path": "process/0.32mm STRUCTURAL @COREONE0.6 + MMU3.json" + }, + { + "name": "0.15mm STRUCTURAL @COREONE0.25 + MMU3", + "sub_path": "process/0.15mm STRUCTURAL @COREONE0.25 + MMU3.json" + }, + { + "name": "0.16mm SPEED @COREONE0.3 + MMU3", + "sub_path": "process/0.16mm SPEED @COREONE0.3 + MMU3.json" + }, { "name": "0.20mm SPEED @CORE One 0.3", "sub_path": "process/0.20mm SPEED @CORE One 0.3.json" @@ -1378,6 +1494,10 @@ "name": "0.20mm SPEED @CORE One L 0.3", "sub_path": "process/0.20mm SPEED @CORE One L 0.3.json" }, + { + "name": "0.20mm STRUCTURAL @COREONE0.3 + MMU3", + "sub_path": "process/0.20mm STRUCTURAL @COREONE0.3 + MMU3.json" + }, { "name": "0.32mm STRUCTURAL @CORE One HF 0.5", "sub_path": "process/0.32mm STRUCTURAL @CORE One HF 0.5.json" @@ -1393,6 +1513,10 @@ { "name": "0.32mm SPEED @CORE One L HF 0.5", "sub_path": "process/0.32mm SPEED @CORE One L HF 0.5.json" + }, + { + "name": "0.20mm SPEED @COREONE0.3 + MMU3", + "sub_path": "process/0.20mm SPEED @COREONE0.3 + MMU3.json" } ], "filament_list": [ @@ -1560,6 +1684,18 @@ "name": "Prusament ASA @CORE One", "sub_path": "filament/Prusament ASA @CORE One.json" }, + { + "name": "Prusament ASA @MK3S", + "sub_path": "filament/Prusament ASA @MK3S.json" + }, + { + "name": "Prusament ASA @MK4", + "sub_path": "filament/Prusament ASA @MK4.json" + }, + { + "name": "Prusament ASA @MK4S", + "sub_path": "filament/Prusament ASA @MK4S.json" + }, { "name": "Prusament ASA @XL", "sub_path": "filament/Prusament ASA @XL.json" @@ -1632,6 +1768,18 @@ "name": "Prusament PA-CF @XL 5T", "sub_path": "filament/Prusament PA-CF @XL 5T.json" }, + { + "name": "Prusament PA11 Carbon Fiber @MK3S", + "sub_path": "filament/Prusament PA11 Carbon Fiber @MK3S.json" + }, + { + "name": "Prusament PA11 Carbon Fiber @MK4", + "sub_path": "filament/Prusament PA11 Carbon Fiber @MK4.json" + }, + { + "name": "Prusament PA11 Carbon Fiber @MK4S", + "sub_path": "filament/Prusament PA11 Carbon Fiber @MK4S.json" + }, { "name": "Generic PC @Prusa", "sub_path": "filament/Generic PC @Prusa.json" @@ -1688,6 +1836,18 @@ "name": "Prusament PC Blend @CORE One", "sub_path": "filament/Prusament PC Blend @CORE One.json" }, + { + "name": "Prusament PC Blend @MK3S", + "sub_path": "filament/Prusament PC Blend @MK3S.json" + }, + { + "name": "Prusament PC Blend @MK4", + "sub_path": "filament/Prusament PC Blend @MK4.json" + }, + { + "name": "Prusament PC Blend @MK4S", + "sub_path": "filament/Prusament PC Blend @MK4S.json" + }, { "name": "Prusament PC Blend @XL", "sub_path": "filament/Prusament PC Blend @XL.json" @@ -1700,6 +1860,18 @@ "name": "Prusament PC-CF @CORE One", "sub_path": "filament/Prusament PC-CF @CORE One.json" }, + { + "name": "Prusament PC Blend Carbon Fiber @MK3S", + "sub_path": "filament/Prusament PC Blend Carbon Fiber @MK3S.json" + }, + { + "name": "Prusament PC Blend Carbon Fiber @MK4", + "sub_path": "filament/Prusament PC Blend Carbon Fiber @MK4.json" + }, + { + "name": "Prusament PC Blend Carbon Fiber @MK4S", + "sub_path": "filament/Prusament PC Blend Carbon Fiber @MK4S.json" + }, { "name": "Prusament PC-CF @XL", "sub_path": "filament/Prusament PC-CF @XL.json" @@ -1756,6 +1928,18 @@ "name": "Prusament PETG @CORE One", "sub_path": "filament/Prusament PETG @CORE One.json" }, + { + "name": "Prusament PETG @MK3S", + "sub_path": "filament/Prusament PETG @MK3S.json" + }, + { + "name": "Prusament PETG @MK4", + "sub_path": "filament/Prusament PETG @MK4.json" + }, + { + "name": "Prusament PETG @MK4S", + "sub_path": "filament/Prusament PETG @MK4S.json" + }, { "name": "Prusament PETG @base", "sub_path": "filament/Prusament PETG @base.json" @@ -1832,6 +2016,18 @@ "name": "Prusament PLA @CORE One", "sub_path": "filament/Prusament PLA @CORE One.json" }, + { + "name": "Prusament PLA @MK3S", + "sub_path": "filament/Prusament PLA @MK3S.json" + }, + { + "name": "Prusament PLA @MK4", + "sub_path": "filament/Prusament PLA @MK4.json" + }, + { + "name": "Prusament PLA @MK4S", + "sub_path": "filament/Prusament PLA @MK4S.json" + }, { "name": "Prusament PLA @base", "sub_path": "filament/Prusament PLA @base.json" @@ -1840,6 +2036,18 @@ "name": "Prusament rPLA @CORE One", "sub_path": "filament/Prusament rPLA @CORE One.json" }, + { + "name": "Prusament rPLA @MK3S", + "sub_path": "filament/Prusament rPLA @MK3S.json" + }, + { + "name": "Prusament rPLA @MK4", + "sub_path": "filament/Prusament rPLA @MK4.json" + }, + { + "name": "Prusament rPLA @MK4S", + "sub_path": "filament/Prusament rPLA @MK4S.json" + }, { "name": "Prusament rPLA @base", "sub_path": "filament/Prusament rPLA @base.json" @@ -1884,6 +2092,18 @@ "name": "Prusament PVB @CORE One", "sub_path": "filament/Prusament PVB @CORE One.json" }, + { + "name": "Prusament PVB @MK3S", + "sub_path": "filament/Prusament PVB @MK3S.json" + }, + { + "name": "Prusament PVB @MK4", + "sub_path": "filament/Prusament PVB @MK4.json" + }, + { + "name": "Prusament PVB @MK4S", + "sub_path": "filament/Prusament PVB @MK4S.json" + }, { "name": "Prusament PVB @XL", "sub_path": "filament/Prusament PVB @XL.json" @@ -1936,6 +2156,10 @@ "name": "Generic ABS @Prusa CORE One HF 0.8", "sub_path": "filament/Generic ABS @Prusa CORE One HF 0.8.json" }, + { + "name": "Generic ABS @Prusa CORE One MMU3", + "sub_path": "filament/Generic ABS @Prusa CORE One MMU3.json" + }, { "name": "Generic ABS @Prusa MK4S 0.6", "sub_path": "filament/Generic ABS @Prusa MK4S 0.6.json" @@ -2016,6 +2240,10 @@ "name": "Generic ASA @Prusa CORE One HF 0.8", "sub_path": "filament/Generic ASA @Prusa CORE One HF 0.8.json" }, + { + "name": "Generic ASA @Prusa CORE One MMU3", + "sub_path": "filament/Generic ASA @Prusa CORE One MMU3.json" + }, { "name": "Generic ASA @Prusa MK4S 0.6", "sub_path": "filament/Generic ASA @Prusa MK4S 0.6.json" @@ -2064,6 +2292,34 @@ "name": "Prusament ASA @CORE One HF 0.8", "sub_path": "filament/Prusament ASA @CORE One HF 0.8.json" }, + { + "name": "Prusament ASA @CORE One MMU3", + "sub_path": "filament/Prusament ASA @CORE One MMU3.json" + }, + { + "name": "Prusament ASA @MK4S 0.6", + "sub_path": "filament/Prusament ASA @MK4S 0.6.json" + }, + { + "name": "Prusament ASA @MK4S 0.8", + "sub_path": "filament/Prusament ASA @MK4S 0.8.json" + }, + { + "name": "Prusament ASA @MK4S HF0.4", + "sub_path": "filament/Prusament ASA @MK4S HF0.4.json" + }, + { + "name": "Prusament ASA @MK4S HF0.5", + "sub_path": "filament/Prusament ASA @MK4S HF0.5.json" + }, + { + "name": "Prusament ASA @MK4S HF0.6", + "sub_path": "filament/Prusament ASA @MK4S HF0.6.json" + }, + { + "name": "Prusament ASA @MK4S HF0.8", + "sub_path": "filament/Prusament ASA @MK4S HF0.8.json" + }, { "name": "Generic TPU @Prusa CORE One 0.6", "sub_path": "filament/Generic TPU @Prusa CORE One 0.6.json" @@ -2072,6 +2328,10 @@ "name": "Generic TPU @Prusa CORE One 0.8", "sub_path": "filament/Generic TPU @Prusa CORE One 0.8.json" }, + { + "name": "Generic TPU @Prusa CORE One MMU3", + "sub_path": "filament/Generic TPU @Prusa CORE One MMU3.json" + }, { "name": "Generic PA @Prusa", "sub_path": "filament/Generic PA @Prusa.json" @@ -2120,6 +2380,34 @@ "name": "Prusament PA-CF @CORE One 0.8", "sub_path": "filament/Prusament PA-CF @CORE One 0.8.json" }, + { + "name": "Prusament PA-CF @CORE One MMU3", + "sub_path": "filament/Prusament PA-CF @CORE One MMU3.json" + }, + { + "name": "Prusament PA11 Carbon Fiber @MK4S 0.6", + "sub_path": "filament/Prusament PA11 Carbon Fiber @MK4S 0.6.json" + }, + { + "name": "Prusament PA11 Carbon Fiber @MK4S 0.8", + "sub_path": "filament/Prusament PA11 Carbon Fiber @MK4S 0.8.json" + }, + { + "name": "Prusament PA11 Carbon Fiber @MK4S HF0.4", + "sub_path": "filament/Prusament PA11 Carbon Fiber @MK4S HF0.4.json" + }, + { + "name": "Prusament PA11 Carbon Fiber @MK4S HF0.5", + "sub_path": "filament/Prusament PA11 Carbon Fiber @MK4S HF0.5.json" + }, + { + "name": "Prusament PA11 Carbon Fiber @MK4S HF0.6", + "sub_path": "filament/Prusament PA11 Carbon Fiber @MK4S HF0.6.json" + }, + { + "name": "Prusament PA11 Carbon Fiber @MK4S HF0.8", + "sub_path": "filament/Prusament PA11 Carbon Fiber @MK4S HF0.8.json" + }, { "name": "Generic PC HF @Prusa MINIIS", "sub_path": "filament/Generic PC HF @Prusa MINIIS.json" @@ -2156,6 +2444,34 @@ "name": "Prusament PC Blend @CORE One HF 0.8", "sub_path": "filament/Prusament PC Blend @CORE One HF 0.8.json" }, + { + "name": "Prusament PC Blend @CORE One MMU3", + "sub_path": "filament/Prusament PC Blend @CORE One MMU3.json" + }, + { + "name": "Prusament PC Blend @MK4S 0.6", + "sub_path": "filament/Prusament PC Blend @MK4S 0.6.json" + }, + { + "name": "Prusament PC Blend @MK4S 0.8", + "sub_path": "filament/Prusament PC Blend @MK4S 0.8.json" + }, + { + "name": "Prusament PC Blend @MK4S HF0.4", + "sub_path": "filament/Prusament PC Blend @MK4S HF0.4.json" + }, + { + "name": "Prusament PC Blend @MK4S HF0.5", + "sub_path": "filament/Prusament PC Blend @MK4S HF0.5.json" + }, + { + "name": "Prusament PC Blend @MK4S HF0.6", + "sub_path": "filament/Prusament PC Blend @MK4S HF0.6.json" + }, + { + "name": "Prusament PC Blend @MK4S HF0.8", + "sub_path": "filament/Prusament PC Blend @MK4S HF0.8.json" + }, { "name": "Prusament PC-CF @CORE One 0.6", "sub_path": "filament/Prusament PC-CF @CORE One 0.6.json" @@ -2164,6 +2480,34 @@ "name": "Prusament PC-CF @CORE One 0.8", "sub_path": "filament/Prusament PC-CF @CORE One 0.8.json" }, + { + "name": "Prusament PC-CF @CORE One MMU3", + "sub_path": "filament/Prusament PC-CF @CORE One MMU3.json" + }, + { + "name": "Prusament PC Blend Carbon Fiber @MK4S 0.6", + "sub_path": "filament/Prusament PC Blend Carbon Fiber @MK4S 0.6.json" + }, + { + "name": "Prusament PC Blend Carbon Fiber @MK4S 0.8", + "sub_path": "filament/Prusament PC Blend Carbon Fiber @MK4S 0.8.json" + }, + { + "name": "Prusament PC Blend Carbon Fiber @MK4S HF0.4", + "sub_path": "filament/Prusament PC Blend Carbon Fiber @MK4S HF0.4.json" + }, + { + "name": "Prusament PC Blend Carbon Fiber @MK4S HF0.5", + "sub_path": "filament/Prusament PC Blend Carbon Fiber @MK4S HF0.5.json" + }, + { + "name": "Prusament PC Blend Carbon Fiber @MK4S HF0.6", + "sub_path": "filament/Prusament PC Blend Carbon Fiber @MK4S HF0.6.json" + }, + { + "name": "Prusament PC Blend Carbon Fiber @MK4S HF0.8", + "sub_path": "filament/Prusament PC Blend Carbon Fiber @MK4S HF0.8.json" + }, { "name": "Generic PETG @Prusa CORE One 0.6", "sub_path": "filament/Generic PETG @Prusa CORE One 0.6.json" @@ -2188,6 +2532,10 @@ "name": "Generic PETG @Prusa CORE One HF 0.8", "sub_path": "filament/Generic PETG @Prusa CORE One HF 0.8.json" }, + { + "name": "Generic PETG @Prusa CORE One MMU3", + "sub_path": "filament/Generic PETG @Prusa CORE One MMU3.json" + }, { "name": "Generic PETG @Prusa MK4S 0.6", "sub_path": "filament/Generic PETG @Prusa MK4S 0.6.json" @@ -2268,6 +2616,34 @@ "name": "Prusament PETG @CORE One HF 0.8", "sub_path": "filament/Prusament PETG @CORE One HF 0.8.json" }, + { + "name": "Prusament PETG @CORE One MMU3", + "sub_path": "filament/Prusament PETG @CORE One MMU3.json" + }, + { + "name": "Prusament PETG @MK4S 0.6", + "sub_path": "filament/Prusament PETG @MK4S 0.6.json" + }, + { + "name": "Prusament PETG @MK4S 0.8", + "sub_path": "filament/Prusament PETG @MK4S 0.8.json" + }, + { + "name": "Prusament PETG @MK4S HF0.4", + "sub_path": "filament/Prusament PETG @MK4S HF0.4.json" + }, + { + "name": "Prusament PETG @MK4S HF0.5", + "sub_path": "filament/Prusament PETG @MK4S HF0.5.json" + }, + { + "name": "Prusament PETG @MK4S HF0.6", + "sub_path": "filament/Prusament PETG @MK4S HF0.6.json" + }, + { + "name": "Prusament PETG @MK4S HF0.8", + "sub_path": "filament/Prusament PETG @MK4S HF0.8.json" + }, { "name": "Prusament PETG @XL", "sub_path": "filament/Prusament PETG @XL.json" @@ -2300,6 +2676,10 @@ "name": "Generic PLA @Prusa CORE One HF 0.8", "sub_path": "filament/Generic PLA @Prusa CORE One HF 0.8.json" }, + { + "name": "Generic PLA @Prusa CORE One MMU3", + "sub_path": "filament/Generic PLA @Prusa CORE One MMU3.json" + }, { "name": "Generic PLA @Prusa MK4S 0.6", "sub_path": "filament/Generic PLA @Prusa MK4S 0.6.json" @@ -2368,6 +2748,10 @@ "name": "Generic PLA Silk @Prusa CORE One 0.8", "sub_path": "filament/Generic PLA Silk @Prusa CORE One 0.8.json" }, + { + "name": "Generic PLA Silk @Prusa CORE One MMU3", + "sub_path": "filament/Generic PLA Silk @Prusa CORE One MMU3.json" + }, { "name": "Generic PLA-CF @Prusa", "sub_path": "filament/Generic PLA-CF @Prusa.json" @@ -2412,6 +2796,34 @@ "name": "Prusament PLA @CORE One HF 0.8", "sub_path": "filament/Prusament PLA @CORE One HF 0.8.json" }, + { + "name": "Prusament PLA @CORE One MMU3", + "sub_path": "filament/Prusament PLA @CORE One MMU3.json" + }, + { + "name": "Prusament PLA @MK4S 0.6", + "sub_path": "filament/Prusament PLA @MK4S 0.6.json" + }, + { + "name": "Prusament PLA @MK4S 0.8", + "sub_path": "filament/Prusament PLA @MK4S 0.8.json" + }, + { + "name": "Prusament PLA @MK4S HF0.4", + "sub_path": "filament/Prusament PLA @MK4S HF0.4.json" + }, + { + "name": "Prusament PLA @MK4S HF0.5", + "sub_path": "filament/Prusament PLA @MK4S HF0.5.json" + }, + { + "name": "Prusament PLA @MK4S HF0.6", + "sub_path": "filament/Prusament PLA @MK4S HF0.6.json" + }, + { + "name": "Prusament PLA @MK4S HF0.8", + "sub_path": "filament/Prusament PLA @MK4S HF0.8.json" + }, { "name": "Prusament PLA @XL", "sub_path": "filament/Prusament PLA @XL.json" @@ -2428,6 +2840,34 @@ "name": "Prusament rPLA @CORE One 0.8", "sub_path": "filament/Prusament rPLA @CORE One 0.8.json" }, + { + "name": "Prusament rPLA @CORE One MMU3", + "sub_path": "filament/Prusament rPLA @CORE One MMU3.json" + }, + { + "name": "Prusament rPLA @MK4S 0.6", + "sub_path": "filament/Prusament rPLA @MK4S 0.6.json" + }, + { + "name": "Prusament rPLA @MK4S 0.8", + "sub_path": "filament/Prusament rPLA @MK4S 0.8.json" + }, + { + "name": "Prusament rPLA @MK4S HF0.4", + "sub_path": "filament/Prusament rPLA @MK4S HF0.4.json" + }, + { + "name": "Prusament rPLA @MK4S HF0.5", + "sub_path": "filament/Prusament rPLA @MK4S HF0.5.json" + }, + { + "name": "Prusament rPLA @MK4S HF0.6", + "sub_path": "filament/Prusament rPLA @MK4S HF0.6.json" + }, + { + "name": "Prusament rPLA @MK4S HF0.8", + "sub_path": "filament/Prusament rPLA @MK4S HF0.8.json" + }, { "name": "Prusament rPLA @XL", "sub_path": "filament/Prusament rPLA @XL.json" @@ -2476,6 +2916,34 @@ "name": "Prusament PVB @CORE One 0.8", "sub_path": "filament/Prusament PVB @CORE One 0.8.json" }, + { + "name": "Prusament PVB @CORE One MMU3", + "sub_path": "filament/Prusament PVB @CORE One MMU3.json" + }, + { + "name": "Prusament PVB @MK4S 0.6", + "sub_path": "filament/Prusament PVB @MK4S 0.6.json" + }, + { + "name": "Prusament PVB @MK4S 0.8", + "sub_path": "filament/Prusament PVB @MK4S 0.8.json" + }, + { + "name": "Prusament PVB @MK4S HF0.4", + "sub_path": "filament/Prusament PVB @MK4S HF0.4.json" + }, + { + "name": "Prusament PVB @MK4S HF0.5", + "sub_path": "filament/Prusament PVB @MK4S HF0.5.json" + }, + { + "name": "Prusament PVB @MK4S HF0.6", + "sub_path": "filament/Prusament PVB @MK4S HF0.6.json" + }, + { + "name": "Prusament PVB @MK4S HF0.8", + "sub_path": "filament/Prusament PVB @MK4S HF0.8.json" + }, { "name": "Generic TPU @Prusa MK4S 0.6", "sub_path": "filament/Generic TPU @Prusa MK4S 0.6.json" @@ -2730,6 +3198,10 @@ "name": "fdm_machine_common_xl_5t", "sub_path": "machine/fdm_machine_common_xl_5t.json" }, + { + "name": "Prusa CORE One MMU3 0.4 nozzle", + "sub_path": "machine/Prusa CORE One MMU3 0.4 nozzle.json" + }, { "name": "Prusa CORE One 0.5 nozzle", "sub_path": "machine/Prusa CORE One 0.5 nozzle.json" @@ -2802,6 +3274,18 @@ "name": "Prusa XL 5T 0.8 nozzle", "sub_path": "machine/Prusa XL 5T 0.8 nozzle.json" }, + { + "name": "Prusa CORE One MMU3 0.25 nozzle", + "sub_path": "machine/Prusa CORE One MMU3 0.25 nozzle.json" + }, + { + "name": "Prusa CORE One MMU3 0.3 nozzle", + "sub_path": "machine/Prusa CORE One MMU3 0.3 nozzle.json" + }, + { + "name": "Prusa CORE One MMU3 0.6 nozzle", + "sub_path": "machine/Prusa CORE One MMU3 0.6 nozzle.json" + }, { "name": "Prusa MK4S HF0.5 nozzle", "sub_path": "machine/Prusa MK4S HF0.5 nozzle.json" diff --git a/resources/profiles/Prusa/Prusa CORE One MMU3_cover.png b/resources/profiles/Prusa/Prusa CORE One MMU3_cover.png new file mode 100644 index 0000000000..be841d654b Binary files /dev/null and b/resources/profiles/Prusa/Prusa CORE One MMU3_cover.png differ diff --git a/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One MMU3.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One MMU3.json new file mode 100644 index 0000000000..b909758269 --- /dev/null +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One MMU3.json @@ -0,0 +1,53 @@ +{ + "type": "filament", + "name": "Generic ABS @Prusa CORE One MMU3", + "inherits": "Generic ABS @Prusa CORE One", + "from": "system", + "setting_id": "TM5fcvhbo1lgzsU6", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.4 nozzle", + "Prusa CORE One MMU3 0.25 nozzle", + "Prusa CORE One MMU3 0.3 nozzle", + "Prusa CORE One MMU3 0.6 nozzle" + ], + "filament_cooling_final_speed": [ + "2.5" + ], + "filament_cooling_initial_speed": [ + "5" + ], + "filament_cooling_moves": [ + "3" + ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], + "filament_loading_speed": [ + "10" + ], + "filament_loading_speed_start": [ + "50" + ], + "filament_ramming_parameters": [ + "250 100 42.4194 42.4194 42.4194 42.4194 42.4194| 0.05 42.4387 0.45 42.4387 0.95 42.4387 1.45 42.4387 1.95 42.4387 2.45 42.4387 2.95 42.4387 3.45 42.4387 3.95 42.4387 4.45 42.4387 4.95 42.4387" + ], + "filament_stamping_distance": [ + "45" + ], + "filament_stamping_loading_speed": [ + "26.5" + ], + "filament_start_gcode": [ + "M572 S{if nozzle_diameter[filament_extruder_id]==0.4}0.02{elsif nozzle_diameter[filament_extruder_id]==0.5}0.018{elsif nozzle_diameter[filament_extruder_id]==0.6}0.012{elsif nozzle_diameter[filament_extruder_id]==0.8}0.01{elsif nozzle_diameter[filament_extruder_id]==0.25}0.09{elsif nozzle_diameter[filament_extruder_id]==0.3}0.065{else}0{endif} ; Filament gcode\n\nM142 S40 ; set heatbreak target temp" + ], + "filament_unloading_speed": [ + "60" + ], + "filament_unloading_speed_start": [ + "60" + ], + "idle_temperature": [ + "130" + ] +} diff --git a/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One MMU3.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One MMU3.json new file mode 100644 index 0000000000..4461d30750 --- /dev/null +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One MMU3.json @@ -0,0 +1,53 @@ +{ + "type": "filament", + "name": "Generic ASA @Prusa CORE One MMU3", + "inherits": "Generic ASA @Prusa CORE One", + "from": "system", + "setting_id": "0uAHoCupgHmVYVEx", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.4 nozzle", + "Prusa CORE One MMU3 0.25 nozzle", + "Prusa CORE One MMU3 0.3 nozzle", + "Prusa CORE One MMU3 0.6 nozzle" + ], + "filament_cooling_final_speed": [ + "2.5" + ], + "filament_cooling_initial_speed": [ + "5" + ], + "filament_cooling_moves": [ + "3" + ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], + "filament_loading_speed": [ + "10" + ], + "filament_loading_speed_start": [ + "50" + ], + "filament_ramming_parameters": [ + "250 100 42.4194 42.4194 42.4194 42.4194 42.4194| 0.05 42.4387 0.45 42.4387 0.95 42.4387 1.45 42.4387 1.95 42.4387 2.45 42.4387 2.95 42.4387 3.45 42.4387 3.95 42.4387 4.45 42.4387 4.95 42.4387" + ], + "filament_stamping_distance": [ + "45" + ], + "filament_stamping_loading_speed": [ + "26.5" + ], + "filament_start_gcode": [ + "M572 S{if nozzle_diameter[filament_extruder_id]==0.4}0.02{elsif nozzle_diameter[filament_extruder_id]==0.5}0.018{elsif nozzle_diameter[filament_extruder_id]==0.6}0.012{elsif nozzle_diameter[filament_extruder_id]==0.8}0.01{elsif nozzle_diameter[filament_extruder_id]==0.25}0.09{elsif nozzle_diameter[filament_extruder_id]==0.3}0.065{else}0{endif} ; Filament gcode\n\nM142 S40 ; set heatbreak target temp" + ], + "filament_unloading_speed": [ + "60" + ], + "filament_unloading_speed_start": [ + "60" + ], + "idle_temperature": [ + "130" + ] +} diff --git a/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One MMU3.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One MMU3.json new file mode 100644 index 0000000000..c026e6d770 --- /dev/null +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One MMU3.json @@ -0,0 +1,53 @@ +{ + "type": "filament", + "name": "Generic PETG @Prusa CORE One MMU3", + "inherits": "Generic PETG @Prusa CORE One", + "from": "system", + "setting_id": "JutuB6ct5A1l2Biz", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.4 nozzle", + "Prusa CORE One MMU3 0.25 nozzle", + "Prusa CORE One MMU3 0.3 nozzle", + "Prusa CORE One MMU3 0.6 nozzle" + ], + "filament_cooling_final_speed": [ + "2.5" + ], + "filament_cooling_initial_speed": [ + "5" + ], + "filament_cooling_moves": [ + "3" + ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], + "filament_loading_speed": [ + "10" + ], + "filament_loading_speed_start": [ + "50" + ], + "filament_ramming_parameters": [ + "250 100 42.4194 42.4194 42.4194 42.4194 42.4194| 0.05 42.4387 0.45 42.4387 0.95 42.4387 1.45 42.4387 1.95 42.4387 2.45 42.4387 2.95 42.4387 3.45 42.4387 3.95 42.4387 4.45 42.4387 4.95 42.4387" + ], + "filament_stamping_distance": [ + "45" + ], + "filament_stamping_loading_speed": [ + "26.5" + ], + "filament_start_gcode": [ + "M572 S{if nozzle_diameter[filament_extruder_id]==0.4}0.053{elsif nozzle_diameter[filament_extruder_id]==0.5}0.042{elsif nozzle_diameter[filament_extruder_id]==0.6}0.032{elsif nozzle_diameter[filament_extruder_id]==0.8}0.018{elsif nozzle_diameter[filament_extruder_id]==0.25}0.18{elsif nozzle_diameter[filament_extruder_id]==0.3}0.1{else}0{endif} ; Filament gcode\n\nM142 S36 ; set heatbreak target temp" + ], + "filament_unloading_speed": [ + "60" + ], + "filament_unloading_speed_start": [ + "60" + ], + "idle_temperature": [ + "130" + ] +} diff --git a/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One MMU3.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One MMU3.json new file mode 100644 index 0000000000..32498fb8a9 --- /dev/null +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One MMU3.json @@ -0,0 +1,53 @@ +{ + "type": "filament", + "name": "Generic PLA @Prusa CORE One MMU3", + "inherits": "Generic PLA @Prusa CORE One", + "from": "system", + "setting_id": "haNaA1KFlYeqtfIg", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.4 nozzle", + "Prusa CORE One MMU3 0.25 nozzle", + "Prusa CORE One MMU3 0.3 nozzle", + "Prusa CORE One MMU3 0.6 nozzle" + ], + "filament_cooling_final_speed": [ + "3.5" + ], + "filament_cooling_initial_speed": [ + "10" + ], + "filament_cooling_moves": [ + "2" + ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], + "filament_loading_speed": [ + "10" + ], + "filament_loading_speed_start": [ + "50" + ], + "filament_ramming_parameters": [ + "250 100 40.1613 40.3548 40.4516 40.3548 40.2581| 0.05 40.1483 0.45 40.3419 0.95 40.3419 1.45 40.3419 1.95 40.3419 2.45 40.3419 2.95 40.3419 3.45 40.3419 3.95 40.3419 4.45 40.3419 4.95 40.3419" + ], + "filament_stamping_distance": [ + "45" + ], + "filament_stamping_loading_speed": [ + "29" + ], + "filament_start_gcode": [ + "M572 S{if nozzle_diameter[filament_extruder_id]==0.4}0.03{elsif nozzle_diameter[filament_extruder_id]==0.5}0.022{elsif nozzle_diameter[filament_extruder_id]==0.6}0.019{elsif nozzle_diameter[filament_extruder_id]==0.8}0.013{elsif nozzle_diameter[filament_extruder_id]==0.25}0.1{elsif nozzle_diameter[filament_extruder_id]==0.3}0.07{else}0{endif} ; Filament gcode\n\nM142 S36 ; set heatbreak target temp" + ], + "filament_unloading_speed": [ + "40" + ], + "filament_unloading_speed_start": [ + "30" + ], + "idle_temperature": [ + "170" + ] +} diff --git a/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa CORE One MMU3.json b/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa CORE One MMU3.json new file mode 100644 index 0000000000..d45bd3cd90 --- /dev/null +++ b/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa CORE One MMU3.json @@ -0,0 +1,53 @@ +{ + "type": "filament", + "name": "Generic PLA Silk @Prusa CORE One MMU3", + "inherits": "Generic PLA Silk @Prusa CORE One", + "from": "system", + "setting_id": "MMarDGtK4f7u78gA", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.4 nozzle", + "Prusa CORE One MMU3 0.25 nozzle", + "Prusa CORE One MMU3 0.3 nozzle", + "Prusa CORE One MMU3 0.6 nozzle" + ], + "filament_cooling_final_speed": [ + "3.5" + ], + "filament_cooling_initial_speed": [ + "10" + ], + "filament_cooling_moves": [ + "2" + ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], + "filament_loading_speed": [ + "10" + ], + "filament_loading_speed_start": [ + "50" + ], + "filament_ramming_parameters": [ + "250 100 40.1613 40.3548 40.4516 40.3548 40.2581| 0.05 40.1483 0.45 40.3419 0.95 40.3419 1.45 40.3419 1.95 40.3419 2.45 40.3419 2.95 40.3419 3.45 40.3419 3.95 40.3419 4.45 40.3419 4.95 40.3419" + ], + "filament_stamping_distance": [ + "45" + ], + "filament_stamping_loading_speed": [ + "29" + ], + "filament_start_gcode": [ + "M572 S{if nozzle_diameter[0]==0.4}0.03{elsif nozzle_diameter[0]==0.5}0.022{elsif nozzle_diameter[0]==0.6}0.018{elsif nozzle_diameter[0]==0.8}0.012{elsif nozzle_diameter[0]==0.25}0.12{elsif nozzle_diameter[0]==0.3}0.075{else}0{endif} ; Filament gcode\n\nM142 S36 ; set heatbreak target temp" + ], + "filament_unloading_speed": [ + "40" + ], + "filament_unloading_speed_start": [ + "30" + ], + "idle_temperature": [ + "170" + ] +} diff --git a/resources/profiles/Prusa/filament/Generic TPU @Prusa CORE One MMU3.json b/resources/profiles/Prusa/filament/Generic TPU @Prusa CORE One MMU3.json new file mode 100644 index 0000000000..7aa75a058f --- /dev/null +++ b/resources/profiles/Prusa/filament/Generic TPU @Prusa CORE One MMU3.json @@ -0,0 +1,53 @@ +{ + "type": "filament", + "name": "Generic TPU @Prusa CORE One MMU3", + "inherits": "Generic TPU @Prusa CORE One", + "from": "system", + "setting_id": "pYEUfg7uqu2LGw2n", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.4 nozzle", + "Prusa CORE One MMU3 0.25 nozzle", + "Prusa CORE One MMU3 0.3 nozzle", + "Prusa CORE One MMU3 0.6 nozzle" + ], + "filament_cooling_final_speed": [ + "3.4" + ], + "filament_cooling_initial_speed": [ + "2.2" + ], + "filament_cooling_moves": [ + "4" + ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], + "filament_loading_speed": [ + "28" + ], + "filament_loading_speed_start": [ + "3" + ], + "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_stamping_distance": [ + "0" + ], + "filament_stamping_loading_speed": [ + "0" + ], + "filament_start_gcode": [ + "M900 K0 ; Filament gcode\n\nM142 S36 ; set heatbreak target temp" + ], + "filament_unloading_speed": [ + "90" + ], + "filament_unloading_speed_start": [ + "100" + ], + "idle_temperature": [ + "150" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament ASA @CORE One MMU3.json b/resources/profiles/Prusa/filament/Prusament ASA @CORE One MMU3.json new file mode 100644 index 0000000000..6f415ba213 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament ASA @CORE One MMU3.json @@ -0,0 +1,54 @@ +{ + "type": "filament", + "name": "Prusament ASA @CORE One MMU3", + "inherits": "Prusament ASA @CORE One", + "from": "system", + "setting_id": "pESQ8XminojyIGyw", + "filament_id": "OFmFwUWM", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.4 nozzle", + "Prusa CORE One MMU3 0.25 nozzle", + "Prusa CORE One MMU3 0.3 nozzle", + "Prusa CORE One MMU3 0.6 nozzle" + ], + "filament_cooling_final_speed": [ + "2.5" + ], + "filament_cooling_initial_speed": [ + "5" + ], + "filament_cooling_moves": [ + "3" + ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], + "filament_loading_speed": [ + "10" + ], + "filament_loading_speed_start": [ + "50" + ], + "filament_ramming_parameters": [ + "250 100 42.4194 42.4194 42.4194 42.4194 42.4194| 0.05 42.4387 0.45 42.4387 0.95 42.4387 1.45 42.4387 1.95 42.4387 2.45 42.4387 2.95 42.4387 3.45 42.4387 3.95 42.4387 4.45 42.4387 4.95 42.4387" + ], + "filament_stamping_distance": [ + "45" + ], + "filament_stamping_loading_speed": [ + "26.5" + ], + "filament_start_gcode": [ + "M572 S{if nozzle_diameter[filament_extruder_id]==0.4}0.02{elsif nozzle_diameter[filament_extruder_id]==0.5}0.018{elsif nozzle_diameter[filament_extruder_id]==0.6}0.012{elsif nozzle_diameter[filament_extruder_id]==0.8}0.01{elsif nozzle_diameter[filament_extruder_id]==0.25}0.09{elsif nozzle_diameter[filament_extruder_id]==0.3}0.065{else}0{endif} ; Filament gcode\n\nM142 S40 ; set heatbreak target temp" + ], + "filament_unloading_speed": [ + "60" + ], + "filament_unloading_speed_start": [ + "60" + ], + "idle_temperature": [ + "130" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament ASA @MK3S.json b/resources/profiles/Prusa/filament/Prusament ASA @MK3S.json new file mode 100644 index 0000000000..c8d17cbd59 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament ASA @MK3S.json @@ -0,0 +1,39 @@ +{ + "type": "filament", + "name": "Prusament ASA @MK3S", + "inherits": "fdm_filament_asa", + "from": "system", + "setting_id": "6axLRDqyMzSKivpv", + "filament_id": "OFmFwUWM", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK3S 0.25 nozzle", + "Prusa MK3S 0.4 nozzle", + "Prusa MK3S 0.6 nozzle", + "Prusa MK3S 0.8 nozzle" + ], + "filament_cost": [ + "35.28" + ], + "filament_density": [ + "1.07" + ], + "filament_flow_ratio": [ + "0.93" + ], + "filament_max_volumetric_speed": [ + "11" + ], + "filament_spool_weight": [ + "278" + ], + "filament_start_gcode": [ + "; Filament gcode\nM900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.6}0.02{else}0.04{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K12{elsif nozzle_diameter[0]==0.8};{else}M900 K20{endif} ; Filament gcode LA 1.0" + ], + "filament_type": [ + "ASA" + ], + "filament_vendor": [ + "Prusa Polymers" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament ASA @MK4.json b/resources/profiles/Prusa/filament/Prusament ASA @MK4.json new file mode 100644 index 0000000000..10f5a90ebf --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament ASA @MK4.json @@ -0,0 +1,39 @@ +{ + "type": "filament", + "name": "Prusament ASA @MK4", + "inherits": "fdm_filament_asa", + "from": "system", + "setting_id": "S4liaSXDqOT1o64k", + "filament_id": "OFmFwUWM", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4 0.25 nozzle", + "Prusa MK4 0.4 nozzle", + "Prusa MK4 0.6 nozzle", + "Prusa MK4 0.8 nozzle" + ], + "filament_cost": [ + "35.28" + ], + "filament_density": [ + "1.07" + ], + "filament_flow_ratio": [ + "0.93" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "filament_spool_weight": [ + "278" + ], + "filament_start_gcode": [ + "; Filament gcode\nM900 K{if nozzle_diameter[0]==0.4}0.03{elsif nozzle_diameter[0]==0.25}0.1{elsif nozzle_diameter[0]==0.3}0.06{elsif nozzle_diameter[0]==0.35}0.05{elsif nozzle_diameter[0]==0.5}0.03{elsif nozzle_diameter[0]==0.6}0.02{elsif nozzle_diameter[0]==0.8}0.01{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*PRINTER_MODEL_MK4IS.*/}\nM572 S{if nozzle_diameter[0]==0.4}0.02{elsif nozzle_diameter[0]==0.5}0.018{elsif nozzle_diameter[0]==0.6}0.012{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.25}0.09{elsif nozzle_diameter[0]==0.3}0.065{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S40 ; set heatbreak target temp" + ], + "filament_type": [ + "ASA" + ], + "filament_vendor": [ + "Prusa Polymers" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament ASA @MK4S 0.6.json b/resources/profiles/Prusa/filament/Prusament ASA @MK4S 0.6.json new file mode 100644 index 0000000000..20372c4e3d --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament ASA @MK4S 0.6.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "Prusament ASA @MK4S 0.6", + "inherits": "Prusament ASA @MK4S", + "from": "system", + "setting_id": "NjWtcE6qB6wUa6pc", + "filament_id": "OFmFwUWM", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S 0.6 nozzle" + ], + "nozzle_temperature": "255", + "slow_down_layer_time": "15" +} diff --git a/resources/profiles/Prusa/filament/Prusament ASA @MK4S 0.8.json b/resources/profiles/Prusa/filament/Prusament ASA @MK4S 0.8.json new file mode 100644 index 0000000000..8960cd8cdd --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament ASA @MK4S 0.8.json @@ -0,0 +1,15 @@ +{ + "type": "filament", + "name": "Prusament ASA @MK4S 0.8", + "inherits": "Prusament ASA @MK4S", + "from": "system", + "setting_id": "Xeqlb6XMZBWZtRkd", + "filament_id": "OFmFwUWM", + "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/Prusament ASA @MK4S HF0.4.json b/resources/profiles/Prusa/filament/Prusament ASA @MK4S HF0.4.json new file mode 100644 index 0000000000..85bb74a8a9 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament ASA @MK4S HF0.4.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Prusament ASA @MK4S HF0.4", + "inherits": "Prusament ASA @MK4S", + "from": "system", + "setting_id": "1N3BqmbZKCKh8v9N", + "filament_id": "OFmFwUWM", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.4 nozzle" + ], + "filament_max_volumetric_speed": [ + "26" + ], + "filament_start_gcode": [ + "M572 S{if nozzle_diameter[0]==0.4}0.02{elsif nozzle_diameter[0]==0.5}0.018{elsif nozzle_diameter[0]==0.6}0.015{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.25}0.09{elsif nozzle_diameter[0]==0.3}0.065{else}0{endif} ; Filament gcode\nM142 S40 ; set heatbreak target temp" + ], + "nozzle_temperature": "265", + "nozzle_temperature_initial_layer": "265", + "slow_down_layer_time": "15" +} diff --git a/resources/profiles/Prusa/filament/Prusament ASA @MK4S HF0.5.json b/resources/profiles/Prusa/filament/Prusament ASA @MK4S HF0.5.json new file mode 100644 index 0000000000..451f4c4fe0 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament ASA @MK4S HF0.5.json @@ -0,0 +1,15 @@ +{ + "type": "filament", + "name": "Prusament ASA @MK4S HF0.5", + "inherits": "Prusament ASA @MK4S", + "from": "system", + "setting_id": "Se12CQUzRlCv6pHb", + "filament_id": "OFmFwUWM", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.5 nozzle" + ], + "filament_max_volumetric_speed": [ + "27" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament ASA @MK4S HF0.6.json b/resources/profiles/Prusa/filament/Prusament ASA @MK4S HF0.6.json new file mode 100644 index 0000000000..d2903f606a --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament ASA @MK4S HF0.6.json @@ -0,0 +1,17 @@ +{ + "type": "filament", + "name": "Prusament ASA @MK4S HF0.6", + "inherits": "Prusament ASA @MK4S", + "from": "system", + "setting_id": "ejFx8rfOt0hqS3kG", + "filament_id": "OFmFwUWM", + "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/Prusament ASA @MK4S HF0.8.json b/resources/profiles/Prusa/filament/Prusament ASA @MK4S HF0.8.json new file mode 100644 index 0000000000..49536b1aeb --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament ASA @MK4S HF0.8.json @@ -0,0 +1,20 @@ +{ + "type": "filament", + "name": "Prusament ASA @MK4S HF0.8", + "inherits": "Prusament ASA @MK4S", + "from": "system", + "setting_id": "fEVn3NwNrLU1NeWg", + "filament_id": "OFmFwUWM", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.8 nozzle" + ], + "fan_max_speed": "15", + "fan_min_speed": "15", + "filament_max_volumetric_speed": [ + "36" + ], + "nozzle_temperature": "270", + "nozzle_temperature_initial_layer": "270", + "slow_down_layer_time": "20" +} diff --git a/resources/profiles/Prusa/filament/Prusament ASA @MK4S.json b/resources/profiles/Prusa/filament/Prusament ASA @MK4S.json new file mode 100644 index 0000000000..1d04b9b114 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament ASA @MK4S.json @@ -0,0 +1,52 @@ +{ + "type": "filament", + "name": "Prusament ASA @MK4S", + "inherits": "fdm_filament_asa", + "from": "system", + "setting_id": "Gciz1m8uMxV9wogi", + "filament_id": "OFmFwUWM", + "instantiation": "true", + "close_fan_the_first_x_layers": "4", + "compatible_printers": [ + "Prusa MK4S 0.25 nozzle", + "Prusa MK4S 0.3 nozzle", + "Prusa MK4S 0.4 nozzle", + "Prusa MK4S 0.5 nozzle" + ], + "default_filament_colour": "#FFF2EC", + "fan_cooling_layer_time": "20", + "fan_max_speed": "12", + "fan_min_speed": "12", + "filament_cost": [ + "35.28" + ], + "filament_density": [ + "1.07" + ], + "filament_end_gcode": [ + "; Filament-specific end gcode" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_minimal_purge_on_wipe_tower": "35", + "filament_notes": [ + "" + ], + "filament_spool_weight": [ + "278" + ], + "filament_start_gcode": [ + "M900 K{if nozzle_diameter[filament_extruder_id]==0.4}0.04{elsif nozzle_diameter[filament_extruder_id]==0.25}0.1{elsif nozzle_diameter[filament_extruder_id]==0.3}0.06{elsif nozzle_diameter[filament_extruder_id]==0.35}0.05{elsif nozzle_diameter[filament_extruder_id]==0.5}0.03{elsif nozzle_diameter[filament_extruder_id]==0.6}0.02{elsif nozzle_diameter[filament_extruder_id]==0.8}0.01{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*(MK4IS|XLIS|MK4S|MK3.9S).*/}\nM572 S{if nozzle_diameter[filament_extruder_id]==0.4}0.02{elsif nozzle_diameter[filament_extruder_id]==0.5}0.018{elsif nozzle_diameter[filament_extruder_id]==0.6}0.012{elsif nozzle_diameter[filament_extruder_id]==0.8}0.01{elsif nozzle_diameter[filament_extruder_id]==0.25}0.09{elsif nozzle_diameter[filament_extruder_id]==0.3}0.065{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S40 ; set heatbreak target temp" + ], + "filament_type": [ + "ASA" + ], + "filament_vendor": [ + "Prusa Polymers" + ], + "hot_plate_temp": "110", + "overhang_fan_speed": "20", + "slow_down_layer_time": "10", + "slow_down_min_speed": "15" +} diff --git a/resources/profiles/Prusa/filament/Prusament PA-CF @CORE One MMU3.json b/resources/profiles/Prusa/filament/Prusament PA-CF @CORE One MMU3.json new file mode 100644 index 0000000000..cfdc1c5412 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PA-CF @CORE One MMU3.json @@ -0,0 +1,54 @@ +{ + "type": "filament", + "name": "Prusament PA-CF @CORE One MMU3", + "inherits": "Prusament PA-CF @CORE One", + "from": "system", + "setting_id": "DsvJLtFStnmOCm1m", + "filament_id": "OF54SvEe", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.4 nozzle", + "Prusa CORE One MMU3 0.25 nozzle", + "Prusa CORE One MMU3 0.3 nozzle", + "Prusa CORE One MMU3 0.6 nozzle" + ], + "filament_cooling_final_speed": [ + "2.5" + ], + "filament_cooling_initial_speed": [ + "5" + ], + "filament_cooling_moves": [ + "3" + ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], + "filament_loading_speed": [ + "10" + ], + "filament_loading_speed_start": [ + "50" + ], + "filament_ramming_parameters": [ + "250 100 42.4194 42.4194 42.4194 42.4194 42.4194| 0.05 42.4387 0.45 42.4387 0.95 42.4387 1.45 42.4387 1.95 42.4387 2.45 42.4387 2.95 42.4387 3.45 42.4387 3.95 42.4387 4.45 42.4387 4.95 42.4387" + ], + "filament_stamping_distance": [ + "45" + ], + "filament_stamping_loading_speed": [ + "26.5" + ], + "filament_start_gcode": [ + "M572 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\nM142 S45 ; set heatbreak target temp" + ], + "filament_unloading_speed": [ + "60" + ], + "filament_unloading_speed_start": [ + "60" + ], + "idle_temperature": [ + "130" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament PA11 Carbon Fiber @MK3S.json b/resources/profiles/Prusa/filament/Prusament PA11 Carbon Fiber @MK3S.json new file mode 100644 index 0000000000..3a791d2d61 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PA11 Carbon Fiber @MK3S.json @@ -0,0 +1,48 @@ +{ + "type": "filament", + "name": "Prusament PA11 Carbon Fiber @MK3S", + "inherits": "fdm_filament_pa11cf", + "from": "system", + "setting_id": "NwYUwfN9nhSfE2C1", + "filament_id": "OF4MZtnE", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK3S 0.25 nozzle", + "Prusa MK3S 0.4 nozzle", + "Prusa MK3S 0.6 nozzle", + "Prusa MK3S 0.8 nozzle" + ], + "filament_cost": [ + "124.99" + ], + "filament_density": [ + "1.11" + ], + "filament_max_volumetric_speed": [ + "6.5" + ], + "filament_spool_weight": [ + "197" + ], + "filament_start_gcode": [ + "; Filament gcode\nM900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.6}0.02{else}0.04{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K12{elsif nozzle_diameter[0]==0.8};{else}M900 K20{endif} ; Filament gcode LA 1.0" + ], + "filament_type": [ + "PA11-CF" + ], + "filament_vendor": [ + "Prusa Polymers" + ], + "hot_plate_temp": [ + "115" + ], + "hot_plate_temp_initial_layer": [ + "90" + ], + "nozzle_temperature": [ + "285" + ], + "nozzle_temperature_initial_layer": [ + "275" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament PA11 Carbon Fiber @MK4.json b/resources/profiles/Prusa/filament/Prusament PA11 Carbon Fiber @MK4.json new file mode 100644 index 0000000000..aa9b5edef1 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PA11 Carbon Fiber @MK4.json @@ -0,0 +1,48 @@ +{ + "type": "filament", + "name": "Prusament PA11 Carbon Fiber @MK4", + "inherits": "fdm_filament_pa11cf", + "from": "system", + "setting_id": "a7kxY0dJGsGZn47w", + "filament_id": "OF4MZtnE", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4 0.25 nozzle", + "Prusa MK4 0.4 nozzle", + "Prusa MK4 0.6 nozzle", + "Prusa MK4 0.8 nozzle" + ], + "filament_cost": [ + "124.99" + ], + "filament_density": [ + "1.11" + ], + "filament_max_volumetric_speed": [ + "6.5" + ], + "filament_spool_weight": [ + "197" + ], + "filament_start_gcode": [ + "; Filament gcode\nM900 K{if nozzle_diameter[0]==0.4}0.03{elsif nozzle_diameter[0]==0.25}0.1{elsif nozzle_diameter[0]==0.3}0.06{elsif nozzle_diameter[0]==0.35}0.05{elsif nozzle_diameter[0]==0.5}0.03{elsif nozzle_diameter[0]==0.6}0.02{elsif nozzle_diameter[0]==0.8}0.01{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*PRINTER_MODEL_MK4IS.*/}\nM572 S{if nozzle_diameter[0]==0.4}0.02{elsif nozzle_diameter[0]==0.5}0.018{elsif nozzle_diameter[0]==0.6}0.012{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.25}0.09{elsif nozzle_diameter[0]==0.3}0.065{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S40 ; set heatbreak target temp" + ], + "filament_type": [ + "PA11-CF" + ], + "filament_vendor": [ + "Prusa Polymers" + ], + "hot_plate_temp": [ + "115" + ], + "hot_plate_temp_initial_layer": [ + "90" + ], + "nozzle_temperature": [ + "285" + ], + "nozzle_temperature_initial_layer": [ + "275" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament PA11 Carbon Fiber @MK4S 0.6.json b/resources/profiles/Prusa/filament/Prusament PA11 Carbon Fiber @MK4S 0.6.json new file mode 100644 index 0000000000..167a3300a6 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PA11 Carbon Fiber @MK4S 0.6.json @@ -0,0 +1,13 @@ +{ + "type": "filament", + "name": "Prusament PA11 Carbon Fiber @MK4S 0.6", + "inherits": "Prusament PA11 Carbon Fiber @MK4S", + "from": "system", + "setting_id": "FBlyfsI1Ma2iAPNK", + "filament_id": "OF4MZtnE", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S 0.6 nozzle" + ], + "slow_down_layer_time": "15" +} diff --git a/resources/profiles/Prusa/filament/Prusament PA11 Carbon Fiber @MK4S 0.8.json b/resources/profiles/Prusa/filament/Prusament PA11 Carbon Fiber @MK4S 0.8.json new file mode 100644 index 0000000000..0689785966 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PA11 Carbon Fiber @MK4S 0.8.json @@ -0,0 +1,15 @@ +{ + "type": "filament", + "name": "Prusament PA11 Carbon Fiber @MK4S 0.8", + "inherits": "Prusament PA11 Carbon Fiber @MK4S", + "from": "system", + "setting_id": "0NFWsNglK5k71qTn", + "filament_id": "OF4MZtnE", + "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/Prusament PA11 Carbon Fiber @MK4S HF0.4.json b/resources/profiles/Prusa/filament/Prusament PA11 Carbon Fiber @MK4S HF0.4.json new file mode 100644 index 0000000000..9e0ff77a60 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PA11 Carbon Fiber @MK4S HF0.4.json @@ -0,0 +1,16 @@ +{ + "type": "filament", + "name": "Prusament PA11 Carbon Fiber @MK4S HF0.4", + "inherits": "Prusament PA11 Carbon Fiber @MK4S", + "from": "system", + "setting_id": "aye0FxF8I7iBveqa", + "filament_id": "OF4MZtnE", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.4 nozzle" + ], + "filament_start_gcode": [ + "M572 S{if nozzle_diameter[0]==0.4}0.02{elsif nozzle_diameter[0]==0.5}0.018{elsif nozzle_diameter[0]==0.6}0.015{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.25}0.09{elsif nozzle_diameter[0]==0.3}0.065{else}0{endif} ; Filament gcode\nM142 S40 ; set heatbreak target temp" + ], + "slow_down_layer_time": "15" +} diff --git a/resources/profiles/Prusa/filament/Prusament PA11 Carbon Fiber @MK4S HF0.5.json b/resources/profiles/Prusa/filament/Prusament PA11 Carbon Fiber @MK4S HF0.5.json new file mode 100644 index 0000000000..7e1c46f294 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PA11 Carbon Fiber @MK4S HF0.5.json @@ -0,0 +1,12 @@ +{ + "type": "filament", + "name": "Prusament PA11 Carbon Fiber @MK4S HF0.5", + "inherits": "Prusament PA11 Carbon Fiber @MK4S", + "from": "system", + "setting_id": "dKNDJrwKoWYdTM5u", + "filament_id": "OF4MZtnE", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.5 nozzle" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament PA11 Carbon Fiber @MK4S HF0.6.json b/resources/profiles/Prusa/filament/Prusament PA11 Carbon Fiber @MK4S HF0.6.json new file mode 100644 index 0000000000..6eeed2e00c --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PA11 Carbon Fiber @MK4S HF0.6.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "Prusament PA11 Carbon Fiber @MK4S HF0.6", + "inherits": "Prusament PA11 Carbon Fiber @MK4S", + "from": "system", + "setting_id": "CwGIOx1Nds9lAZ2V", + "filament_id": "OF4MZtnE", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.6 nozzle" + ], + "fan_max_speed": "15", + "fan_min_speed": "15" +} diff --git a/resources/profiles/Prusa/filament/Prusament PA11 Carbon Fiber @MK4S HF0.8.json b/resources/profiles/Prusa/filament/Prusament PA11 Carbon Fiber @MK4S HF0.8.json new file mode 100644 index 0000000000..deaf23f371 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PA11 Carbon Fiber @MK4S HF0.8.json @@ -0,0 +1,15 @@ +{ + "type": "filament", + "name": "Prusament PA11 Carbon Fiber @MK4S HF0.8", + "inherits": "Prusament PA11 Carbon Fiber @MK4S", + "from": "system", + "setting_id": "GXVNLqFRsWlDtQzZ", + "filament_id": "OF4MZtnE", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.8 nozzle" + ], + "fan_max_speed": "15", + "fan_min_speed": "15", + "slow_down_layer_time": "20" +} diff --git a/resources/profiles/Prusa/filament/Prusament PA11 Carbon Fiber @MK4S.json b/resources/profiles/Prusa/filament/Prusament PA11 Carbon Fiber @MK4S.json new file mode 100644 index 0000000000..39c52f2ae9 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PA11 Carbon Fiber @MK4S.json @@ -0,0 +1,62 @@ +{ + "type": "filament", + "name": "Prusament PA11 Carbon Fiber @MK4S", + "inherits": "fdm_filament_pa11cf", + "from": "system", + "setting_id": "bUXItT9R8S8cC0zq", + "filament_id": "OF4MZtnE", + "instantiation": "true", + "close_fan_the_first_x_layers": "4", + "compatible_printers": [ + "Prusa MK4S 0.25 nozzle", + "Prusa MK4S 0.3 nozzle", + "Prusa MK4S 0.4 nozzle", + "Prusa MK4S 0.5 nozzle" + ], + "fan_cooling_layer_time": "20", + "fan_max_speed": "12", + "fan_min_speed": "12", + "filament_cost": [ + "124.99" + ], + "filament_density": [ + "1.11" + ], + "filament_end_gcode": [ + "; Filament-specific end gcode" + ], + "filament_max_volumetric_speed": [ + "6.5" + ], + "filament_minimal_purge_on_wipe_tower": "35", + "filament_notes": [ + "" + ], + "filament_spool_weight": [ + "197" + ], + "filament_start_gcode": [ + "M900 K{if nozzle_diameter[filament_extruder_id]==0.4}0.04{elsif nozzle_diameter[filament_extruder_id]==0.25}0.1{elsif nozzle_diameter[filament_extruder_id]==0.3}0.06{elsif nozzle_diameter[filament_extruder_id]==0.35}0.05{elsif nozzle_diameter[filament_extruder_id]==0.5}0.03{elsif nozzle_diameter[filament_extruder_id]==0.6}0.02{elsif nozzle_diameter[filament_extruder_id]==0.8}0.01{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*(MK4IS|XLIS|MK4S|MK3.9S).*/}\nM572 S{if nozzle_diameter[filament_extruder_id]==0.4}0.02{elsif nozzle_diameter[filament_extruder_id]==0.5}0.018{elsif nozzle_diameter[filament_extruder_id]==0.6}0.012{elsif nozzle_diameter[filament_extruder_id]==0.8}0.01{elsif nozzle_diameter[filament_extruder_id]==0.25}0.09{elsif nozzle_diameter[filament_extruder_id]==0.3}0.065{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S40 ; set heatbreak target temp" + ], + "filament_type": [ + "PA11-CF" + ], + "filament_vendor": [ + "Prusa Polymers" + ], + "hot_plate_temp": [ + "115" + ], + "hot_plate_temp_initial_layer": [ + "90" + ], + "nozzle_temperature": [ + "285" + ], + "nozzle_temperature_initial_layer": [ + "275" + ], + "overhang_fan_speed": "20", + "slow_down_layer_time": "10", + "slow_down_min_speed": "15" +} diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One MMU3.json b/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One MMU3.json new file mode 100644 index 0000000000..ac1e31b8a5 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One MMU3.json @@ -0,0 +1,54 @@ +{ + "type": "filament", + "name": "Prusament PC Blend @CORE One MMU3", + "inherits": "Prusament PC Blend @CORE One", + "from": "system", + "setting_id": "VjMN8MwtU3BG5cA9", + "filament_id": "OFvDbkFq", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.4 nozzle", + "Prusa CORE One MMU3 0.25 nozzle", + "Prusa CORE One MMU3 0.3 nozzle", + "Prusa CORE One MMU3 0.6 nozzle" + ], + "filament_cooling_final_speed": [ + "2.5" + ], + "filament_cooling_initial_speed": [ + "5" + ], + "filament_cooling_moves": [ + "3" + ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], + "filament_loading_speed": [ + "10" + ], + "filament_loading_speed_start": [ + "50" + ], + "filament_ramming_parameters": [ + "250 100 42.4194 42.4194 42.4194 42.4194 42.4194| 0.05 42.4387 0.45 42.4387 0.95 42.4387 1.45 42.4387 1.95 42.4387 2.45 42.4387 2.95 42.4387 3.45 42.4387 3.95 42.4387 4.45 42.4387 4.95 42.4387" + ], + "filament_stamping_distance": [ + "45" + ], + "filament_stamping_loading_speed": [ + "26.5" + ], + "filament_start_gcode": [ + "M572 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\nM142 S45 ; set heatbreak target temp" + ], + "filament_unloading_speed": [ + "60" + ], + "filament_unloading_speed_start": [ + "60" + ], + "idle_temperature": [ + "150" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend @MK3S.json b/resources/profiles/Prusa/filament/Prusament PC Blend @MK3S.json new file mode 100644 index 0000000000..ee01d9be96 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PC Blend @MK3S.json @@ -0,0 +1,48 @@ +{ + "type": "filament", + "name": "Prusament PC Blend @MK3S", + "inherits": "fdm_filament_pc", + "from": "system", + "setting_id": "CXCOX0SxF2ayfzJq", + "filament_id": "OFvDbkFq", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK3S 0.25 nozzle", + "Prusa MK3S 0.4 nozzle", + "Prusa MK3S 0.6 nozzle", + "Prusa MK3S 0.8 nozzle" + ], + "filament_cost": [ + "51.53" + ], + "filament_density": [ + "1.22" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "filament_spool_weight": [ + "278" + ], + "filament_start_gcode": [ + "; Filament gcode\nM900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.6}0.02{else}0.04{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K12{elsif nozzle_diameter[0]==0.8};{else}M900 K20{endif} ; Filament gcode LA 1.0" + ], + "filament_type": [ + "PC" + ], + "filament_vendor": [ + "Prusa Polymers" + ], + "hot_plate_temp": [ + "115" + ], + "hot_plate_temp_initial_layer": [ + "110" + ], + "nozzle_temperature": [ + "275" + ], + "nozzle_temperature_initial_layer": [ + "275" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend @MK4.json b/resources/profiles/Prusa/filament/Prusament PC Blend @MK4.json new file mode 100644 index 0000000000..dfd02df48b --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PC Blend @MK4.json @@ -0,0 +1,48 @@ +{ + "type": "filament", + "name": "Prusament PC Blend @MK4", + "inherits": "fdm_filament_pc", + "from": "system", + "setting_id": "ZGYW1dcpquZnrAvh", + "filament_id": "OFvDbkFq", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4 0.25 nozzle", + "Prusa MK4 0.4 nozzle", + "Prusa MK4 0.6 nozzle", + "Prusa MK4 0.8 nozzle" + ], + "filament_cost": [ + "51.53" + ], + "filament_density": [ + "1.22" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "filament_spool_weight": [ + "278" + ], + "filament_start_gcode": [ + "; Filament gcode\nM900 K{if nozzle_diameter[0]==0.4}0.03{elsif nozzle_diameter[0]==0.25}0.1{elsif nozzle_diameter[0]==0.3}0.06{elsif nozzle_diameter[0]==0.35}0.05{elsif nozzle_diameter[0]==0.5}0.03{elsif nozzle_diameter[0]==0.6}0.02{elsif nozzle_diameter[0]==0.8}0.01{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*PRINTER_MODEL_MK4IS.*/}\nM572 S{if nozzle_diameter[0]==0.4}0.02{elsif nozzle_diameter[0]==0.5}0.018{elsif nozzle_diameter[0]==0.6}0.012{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.25}0.09{elsif nozzle_diameter[0]==0.3}0.065{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S40 ; set heatbreak target temp" + ], + "filament_type": [ + "PC" + ], + "filament_vendor": [ + "Prusa Polymers" + ], + "hot_plate_temp": [ + "115" + ], + "hot_plate_temp_initial_layer": [ + "110" + ], + "nozzle_temperature": [ + "275" + ], + "nozzle_temperature_initial_layer": [ + "275" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend @MK4S 0.6.json b/resources/profiles/Prusa/filament/Prusament PC Blend @MK4S 0.6.json new file mode 100644 index 0000000000..003ab80372 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PC Blend @MK4S 0.6.json @@ -0,0 +1,13 @@ +{ + "type": "filament", + "name": "Prusament PC Blend @MK4S 0.6", + "inherits": "Prusament PC Blend @MK4S", + "from": "system", + "setting_id": "xDACbSXabUy8mLgz", + "filament_id": "OFvDbkFq", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S 0.6 nozzle" + ], + "slow_down_layer_time": "15" +} diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend @MK4S 0.8.json b/resources/profiles/Prusa/filament/Prusament PC Blend @MK4S 0.8.json new file mode 100644 index 0000000000..64f31dff07 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PC Blend @MK4S 0.8.json @@ -0,0 +1,15 @@ +{ + "type": "filament", + "name": "Prusament PC Blend @MK4S 0.8", + "inherits": "Prusament PC Blend @MK4S", + "from": "system", + "setting_id": "D9aLjfFHsSeQKmCN", + "filament_id": "OFvDbkFq", + "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/Prusament PC Blend @MK4S HF0.4.json b/resources/profiles/Prusa/filament/Prusament PC Blend @MK4S HF0.4.json new file mode 100644 index 0000000000..1fa33516f1 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PC Blend @MK4S HF0.4.json @@ -0,0 +1,16 @@ +{ + "type": "filament", + "name": "Prusament PC Blend @MK4S HF0.4", + "inherits": "Prusament PC Blend @MK4S", + "from": "system", + "setting_id": "F9ojwwNwOFimrvA7", + "filament_id": "OFvDbkFq", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.4 nozzle" + ], + "filament_start_gcode": [ + "M572 S{if nozzle_diameter[0]==0.4}0.02{elsif nozzle_diameter[0]==0.5}0.018{elsif nozzle_diameter[0]==0.6}0.015{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.25}0.09{elsif nozzle_diameter[0]==0.3}0.065{else}0{endif} ; Filament gcode\nM142 S40 ; set heatbreak target temp" + ], + "slow_down_layer_time": "15" +} diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend @MK4S HF0.5.json b/resources/profiles/Prusa/filament/Prusament PC Blend @MK4S HF0.5.json new file mode 100644 index 0000000000..3a6ca6f5b2 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PC Blend @MK4S HF0.5.json @@ -0,0 +1,12 @@ +{ + "type": "filament", + "name": "Prusament PC Blend @MK4S HF0.5", + "inherits": "Prusament PC Blend @MK4S", + "from": "system", + "setting_id": "rnFCKXWalTbb1kCq", + "filament_id": "OFvDbkFq", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.5 nozzle" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend @MK4S HF0.6.json b/resources/profiles/Prusa/filament/Prusament PC Blend @MK4S HF0.6.json new file mode 100644 index 0000000000..569fbb3be2 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PC Blend @MK4S HF0.6.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "Prusament PC Blend @MK4S HF0.6", + "inherits": "Prusament PC Blend @MK4S", + "from": "system", + "setting_id": "dCBGHyldKgJPtI58", + "filament_id": "OFvDbkFq", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.6 nozzle" + ], + "fan_max_speed": "15", + "fan_min_speed": "15" +} diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend @MK4S HF0.8.json b/resources/profiles/Prusa/filament/Prusament PC Blend @MK4S HF0.8.json new file mode 100644 index 0000000000..b108d00335 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PC Blend @MK4S HF0.8.json @@ -0,0 +1,15 @@ +{ + "type": "filament", + "name": "Prusament PC Blend @MK4S HF0.8", + "inherits": "Prusament PC Blend @MK4S", + "from": "system", + "setting_id": "7gGAWA0q7ZbcUg9l", + "filament_id": "OFvDbkFq", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.8 nozzle" + ], + "fan_max_speed": "15", + "fan_min_speed": "15", + "slow_down_layer_time": "20" +} diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend @MK4S.json b/resources/profiles/Prusa/filament/Prusament PC Blend @MK4S.json new file mode 100644 index 0000000000..28329e96e8 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PC Blend @MK4S.json @@ -0,0 +1,62 @@ +{ + "type": "filament", + "name": "Prusament PC Blend @MK4S", + "inherits": "fdm_filament_pc", + "from": "system", + "setting_id": "PnkaoPoBRavoeMJm", + "filament_id": "OFvDbkFq", + "instantiation": "true", + "close_fan_the_first_x_layers": "4", + "compatible_printers": [ + "Prusa MK4S 0.25 nozzle", + "Prusa MK4S 0.3 nozzle", + "Prusa MK4S 0.4 nozzle", + "Prusa MK4S 0.5 nozzle" + ], + "fan_cooling_layer_time": "20", + "fan_max_speed": "12", + "fan_min_speed": "12", + "filament_cost": [ + "51.53" + ], + "filament_density": [ + "1.22" + ], + "filament_end_gcode": [ + "; Filament-specific end gcode" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "filament_minimal_purge_on_wipe_tower": "35", + "filament_notes": [ + "" + ], + "filament_spool_weight": [ + "278" + ], + "filament_start_gcode": [ + "M900 K{if nozzle_diameter[filament_extruder_id]==0.4}0.04{elsif nozzle_diameter[filament_extruder_id]==0.25}0.1{elsif nozzle_diameter[filament_extruder_id]==0.3}0.06{elsif nozzle_diameter[filament_extruder_id]==0.35}0.05{elsif nozzle_diameter[filament_extruder_id]==0.5}0.03{elsif nozzle_diameter[filament_extruder_id]==0.6}0.02{elsif nozzle_diameter[filament_extruder_id]==0.8}0.01{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*(MK4IS|XLIS|MK4S|MK3.9S).*/}\nM572 S{if nozzle_diameter[filament_extruder_id]==0.4}0.02{elsif nozzle_diameter[filament_extruder_id]==0.5}0.018{elsif nozzle_diameter[filament_extruder_id]==0.6}0.012{elsif nozzle_diameter[filament_extruder_id]==0.8}0.01{elsif nozzle_diameter[filament_extruder_id]==0.25}0.09{elsif nozzle_diameter[filament_extruder_id]==0.3}0.065{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S40 ; set heatbreak target temp" + ], + "filament_type": [ + "PC" + ], + "filament_vendor": [ + "Prusa Polymers" + ], + "hot_plate_temp": [ + "115" + ], + "hot_plate_temp_initial_layer": [ + "110" + ], + "nozzle_temperature": [ + "275" + ], + "nozzle_temperature_initial_layer": [ + "275" + ], + "overhang_fan_speed": "20", + "slow_down_layer_time": "10", + "slow_down_min_speed": "15" +} diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend Carbon Fiber @MK3S.json b/resources/profiles/Prusa/filament/Prusament PC Blend Carbon Fiber @MK3S.json new file mode 100644 index 0000000000..623a3b40c4 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PC Blend Carbon Fiber @MK3S.json @@ -0,0 +1,48 @@ +{ + "type": "filament", + "name": "Prusament PC Blend Carbon Fiber @MK3S", + "inherits": "fdm_filament_pccf", + "from": "system", + "setting_id": "d9bHnNlPCrWYi9qR", + "filament_id": "OFdO6vpt", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK3S 0.25 nozzle", + "Prusa MK3S 0.4 nozzle", + "Prusa MK3S 0.6 nozzle", + "Prusa MK3S 0.8 nozzle" + ], + "filament_cost": [ + "74.99" + ], + "filament_density": [ + "1.22" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "filament_spool_weight": [ + "278" + ], + "filament_start_gcode": [ + "; Filament gcode\nM900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.6}0.02{else}0.04{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K12{elsif nozzle_diameter[0]==0.8};{else}M900 K20{endif} ; Filament gcode LA 1.0" + ], + "filament_type": [ + "PC-CF" + ], + "filament_vendor": [ + "Prusa Polymers" + ], + "hot_plate_temp": [ + "115" + ], + "hot_plate_temp_initial_layer": [ + "110" + ], + "nozzle_temperature": [ + "285" + ], + "nozzle_temperature_initial_layer": [ + "285" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend Carbon Fiber @MK4.json b/resources/profiles/Prusa/filament/Prusament PC Blend Carbon Fiber @MK4.json new file mode 100644 index 0000000000..631adc3d61 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PC Blend Carbon Fiber @MK4.json @@ -0,0 +1,48 @@ +{ + "type": "filament", + "name": "Prusament PC Blend Carbon Fiber @MK4", + "inherits": "fdm_filament_pccf", + "from": "system", + "setting_id": "AmzsXSosYtRhIQ4G", + "filament_id": "OFdO6vpt", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4 0.25 nozzle", + "Prusa MK4 0.4 nozzle", + "Prusa MK4 0.6 nozzle", + "Prusa MK4 0.8 nozzle" + ], + "filament_cost": [ + "74.99" + ], + "filament_density": [ + "1.22" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "filament_spool_weight": [ + "278" + ], + "filament_start_gcode": [ + "; Filament gcode\nM900 K{if nozzle_diameter[0]==0.4}0.03{elsif nozzle_diameter[0]==0.25}0.1{elsif nozzle_diameter[0]==0.3}0.06{elsif nozzle_diameter[0]==0.35}0.05{elsif nozzle_diameter[0]==0.5}0.03{elsif nozzle_diameter[0]==0.6}0.02{elsif nozzle_diameter[0]==0.8}0.01{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*PRINTER_MODEL_MK4IS.*/}\nM572 S{if nozzle_diameter[0]==0.4}0.02{elsif nozzle_diameter[0]==0.5}0.018{elsif nozzle_diameter[0]==0.6}0.012{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.25}0.09{elsif nozzle_diameter[0]==0.3}0.065{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S40 ; set heatbreak target temp" + ], + "filament_type": [ + "PC-CF" + ], + "filament_vendor": [ + "Prusa Polymers" + ], + "hot_plate_temp": [ + "115" + ], + "hot_plate_temp_initial_layer": [ + "110" + ], + "nozzle_temperature": [ + "285" + ], + "nozzle_temperature_initial_layer": [ + "285" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend Carbon Fiber @MK4S 0.6.json b/resources/profiles/Prusa/filament/Prusament PC Blend Carbon Fiber @MK4S 0.6.json new file mode 100644 index 0000000000..2a79f39297 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PC Blend Carbon Fiber @MK4S 0.6.json @@ -0,0 +1,13 @@ +{ + "type": "filament", + "name": "Prusament PC Blend Carbon Fiber @MK4S 0.6", + "inherits": "Prusament PC Blend Carbon Fiber @MK4S", + "from": "system", + "setting_id": "cWC8gJcldfVtxPX6", + "filament_id": "OFdO6vpt", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S 0.6 nozzle" + ], + "slow_down_layer_time": "15" +} diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend Carbon Fiber @MK4S 0.8.json b/resources/profiles/Prusa/filament/Prusament PC Blend Carbon Fiber @MK4S 0.8.json new file mode 100644 index 0000000000..434c32c4da --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PC Blend Carbon Fiber @MK4S 0.8.json @@ -0,0 +1,15 @@ +{ + "type": "filament", + "name": "Prusament PC Blend Carbon Fiber @MK4S 0.8", + "inherits": "Prusament PC Blend Carbon Fiber @MK4S", + "from": "system", + "setting_id": "00MDpPdEKLFIKRaD", + "filament_id": "OFdO6vpt", + "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/Prusament PC Blend Carbon Fiber @MK4S HF0.4.json b/resources/profiles/Prusa/filament/Prusament PC Blend Carbon Fiber @MK4S HF0.4.json new file mode 100644 index 0000000000..804974ffbd --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PC Blend Carbon Fiber @MK4S HF0.4.json @@ -0,0 +1,16 @@ +{ + "type": "filament", + "name": "Prusament PC Blend Carbon Fiber @MK4S HF0.4", + "inherits": "Prusament PC Blend Carbon Fiber @MK4S", + "from": "system", + "setting_id": "KGuzaSeGZHauDImP", + "filament_id": "OFdO6vpt", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.4 nozzle" + ], + "filament_start_gcode": [ + "M572 S{if nozzle_diameter[0]==0.4}0.02{elsif nozzle_diameter[0]==0.5}0.018{elsif nozzle_diameter[0]==0.6}0.015{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.25}0.09{elsif nozzle_diameter[0]==0.3}0.065{else}0{endif} ; Filament gcode\nM142 S40 ; set heatbreak target temp" + ], + "slow_down_layer_time": "15" +} diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend Carbon Fiber @MK4S HF0.5.json b/resources/profiles/Prusa/filament/Prusament PC Blend Carbon Fiber @MK4S HF0.5.json new file mode 100644 index 0000000000..c726b71c77 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PC Blend Carbon Fiber @MK4S HF0.5.json @@ -0,0 +1,12 @@ +{ + "type": "filament", + "name": "Prusament PC Blend Carbon Fiber @MK4S HF0.5", + "inherits": "Prusament PC Blend Carbon Fiber @MK4S", + "from": "system", + "setting_id": "OaosyMTYopgexb4a", + "filament_id": "OFdO6vpt", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.5 nozzle" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend Carbon Fiber @MK4S HF0.6.json b/resources/profiles/Prusa/filament/Prusament PC Blend Carbon Fiber @MK4S HF0.6.json new file mode 100644 index 0000000000..2f6ce1cfe4 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PC Blend Carbon Fiber @MK4S HF0.6.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "Prusament PC Blend Carbon Fiber @MK4S HF0.6", + "inherits": "Prusament PC Blend Carbon Fiber @MK4S", + "from": "system", + "setting_id": "6Y8rtcvi7pHhZZWc", + "filament_id": "OFdO6vpt", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.6 nozzle" + ], + "fan_max_speed": "15", + "fan_min_speed": "15" +} diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend Carbon Fiber @MK4S HF0.8.json b/resources/profiles/Prusa/filament/Prusament PC Blend Carbon Fiber @MK4S HF0.8.json new file mode 100644 index 0000000000..3d4752b6e4 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PC Blend Carbon Fiber @MK4S HF0.8.json @@ -0,0 +1,15 @@ +{ + "type": "filament", + "name": "Prusament PC Blend Carbon Fiber @MK4S HF0.8", + "inherits": "Prusament PC Blend Carbon Fiber @MK4S", + "from": "system", + "setting_id": "ZV1h1rvEia2iAtzD", + "filament_id": "OFdO6vpt", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.8 nozzle" + ], + "fan_max_speed": "15", + "fan_min_speed": "15", + "slow_down_layer_time": "20" +} diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend Carbon Fiber @MK4S.json b/resources/profiles/Prusa/filament/Prusament PC Blend Carbon Fiber @MK4S.json new file mode 100644 index 0000000000..2176620a50 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PC Blend Carbon Fiber @MK4S.json @@ -0,0 +1,62 @@ +{ + "type": "filament", + "name": "Prusament PC Blend Carbon Fiber @MK4S", + "inherits": "fdm_filament_pccf", + "from": "system", + "setting_id": "hsgqC40IgFV1nBFs", + "filament_id": "OFdO6vpt", + "instantiation": "true", + "close_fan_the_first_x_layers": "4", + "compatible_printers": [ + "Prusa MK4S 0.25 nozzle", + "Prusa MK4S 0.3 nozzle", + "Prusa MK4S 0.4 nozzle", + "Prusa MK4S 0.5 nozzle" + ], + "fan_cooling_layer_time": "20", + "fan_max_speed": "12", + "fan_min_speed": "12", + "filament_cost": [ + "74.99" + ], + "filament_density": [ + "1.22" + ], + "filament_end_gcode": [ + "; Filament-specific end gcode" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "filament_minimal_purge_on_wipe_tower": "35", + "filament_notes": [ + "" + ], + "filament_spool_weight": [ + "278" + ], + "filament_start_gcode": [ + "M900 K{if nozzle_diameter[filament_extruder_id]==0.4}0.04{elsif nozzle_diameter[filament_extruder_id]==0.25}0.1{elsif nozzle_diameter[filament_extruder_id]==0.3}0.06{elsif nozzle_diameter[filament_extruder_id]==0.35}0.05{elsif nozzle_diameter[filament_extruder_id]==0.5}0.03{elsif nozzle_diameter[filament_extruder_id]==0.6}0.02{elsif nozzle_diameter[filament_extruder_id]==0.8}0.01{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*(MK4IS|XLIS|MK4S|MK3.9S).*/}\nM572 S{if nozzle_diameter[filament_extruder_id]==0.4}0.02{elsif nozzle_diameter[filament_extruder_id]==0.5}0.018{elsif nozzle_diameter[filament_extruder_id]==0.6}0.012{elsif nozzle_diameter[filament_extruder_id]==0.8}0.01{elsif nozzle_diameter[filament_extruder_id]==0.25}0.09{elsif nozzle_diameter[filament_extruder_id]==0.3}0.065{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S40 ; set heatbreak target temp" + ], + "filament_type": [ + "PC-CF" + ], + "filament_vendor": [ + "Prusa Polymers" + ], + "hot_plate_temp": [ + "115" + ], + "hot_plate_temp_initial_layer": [ + "110" + ], + "nozzle_temperature": [ + "285" + ], + "nozzle_temperature_initial_layer": [ + "285" + ], + "overhang_fan_speed": "20", + "slow_down_layer_time": "10", + "slow_down_min_speed": "15" +} diff --git a/resources/profiles/Prusa/filament/Prusament PC-CF @CORE One MMU3.json b/resources/profiles/Prusa/filament/Prusament PC-CF @CORE One MMU3.json new file mode 100644 index 0000000000..fc73ddf3b4 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PC-CF @CORE One MMU3.json @@ -0,0 +1,54 @@ +{ + "type": "filament", + "name": "Prusament PC-CF @CORE One MMU3", + "inherits": "Prusament PC-CF @CORE One", + "from": "system", + "setting_id": "hTcuccoINAUJ4PfR", + "filament_id": "OFjz0a3m", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.4 nozzle", + "Prusa CORE One MMU3 0.25 nozzle", + "Prusa CORE One MMU3 0.3 nozzle", + "Prusa CORE One MMU3 0.6 nozzle" + ], + "filament_cooling_final_speed": [ + "2.5" + ], + "filament_cooling_initial_speed": [ + "5" + ], + "filament_cooling_moves": [ + "3" + ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], + "filament_loading_speed": [ + "10" + ], + "filament_loading_speed_start": [ + "50" + ], + "filament_ramming_parameters": [ + "250 100 42.4194 42.4194 42.4194 42.4194 42.4194| 0.05 42.4387 0.45 42.4387 0.95 42.4387 1.45 42.4387 1.95 42.4387 2.45 42.4387 2.95 42.4387 3.45 42.4387 3.95 42.4387 4.45 42.4387 4.95 42.4387" + ], + "filament_stamping_distance": [ + "45" + ], + "filament_stamping_loading_speed": [ + "26.5" + ], + "filament_start_gcode": [ + "M572 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\nM142 S45 ; set heatbreak target temp" + ], + "filament_unloading_speed": [ + "60" + ], + "filament_unloading_speed_start": [ + "60" + ], + "idle_temperature": [ + "150" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament PETG @CORE One MMU3.json b/resources/profiles/Prusa/filament/Prusament PETG @CORE One MMU3.json new file mode 100644 index 0000000000..70d19cc0d1 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PETG @CORE One MMU3.json @@ -0,0 +1,54 @@ +{ + "type": "filament", + "name": "Prusament PETG @CORE One MMU3", + "inherits": "Prusament PETG @CORE One", + "from": "system", + "setting_id": "ypQNV38FrfRu9QSd", + "filament_id": "OFkR8E2c", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.4 nozzle", + "Prusa CORE One MMU3 0.25 nozzle", + "Prusa CORE One MMU3 0.3 nozzle", + "Prusa CORE One MMU3 0.6 nozzle" + ], + "filament_cooling_final_speed": [ + "2.5" + ], + "filament_cooling_initial_speed": [ + "5" + ], + "filament_cooling_moves": [ + "3" + ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], + "filament_loading_speed": [ + "10" + ], + "filament_loading_speed_start": [ + "50" + ], + "filament_ramming_parameters": [ + "250 100 42.4194 42.4194 42.4194 42.4194 42.4194| 0.05 42.4387 0.45 42.4387 0.95 42.4387 1.45 42.4387 1.95 42.4387 2.45 42.4387 2.95 42.4387 3.45 42.4387 3.95 42.4387 4.45 42.4387 4.95 42.4387" + ], + "filament_stamping_distance": [ + "45" + ], + "filament_stamping_loading_speed": [ + "26.5" + ], + "filament_start_gcode": [ + "M572 S{if nozzle_diameter[filament_extruder_id]==0.4}0.053{elsif nozzle_diameter[filament_extruder_id]==0.5}0.042{elsif nozzle_diameter[filament_extruder_id]==0.6}0.032{elsif nozzle_diameter[filament_extruder_id]==0.8}0.018{elsif nozzle_diameter[filament_extruder_id]==0.25}0.18{elsif nozzle_diameter[filament_extruder_id]==0.3}0.1{else}0{endif} ; Filament gcode\n\nM142 S36 ; set heatbreak target temp" + ], + "filament_unloading_speed": [ + "60" + ], + "filament_unloading_speed_start": [ + "60" + ], + "idle_temperature": [ + "130" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament PETG @MK3S.json b/resources/profiles/Prusa/filament/Prusament PETG @MK3S.json new file mode 100644 index 0000000000..20fe2653da --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PETG @MK3S.json @@ -0,0 +1,78 @@ +{ + "type": "filament", + "name": "Prusament PETG @MK3S", + "inherits": "fdm_filament_pet", + "from": "system", + "setting_id": "1Lq1vO0EjKGK7JnD", + "filament_id": "OFkR8E2c", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK3S 0.25 nozzle", + "Prusa MK3S 0.4 nozzle", + "Prusa MK3S 0.6 nozzle", + "Prusa MK3S 0.8 nozzle" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "90" + ], + "fan_min_speed": [ + "40" + ], + "filament_cost": [ + "29.99" + ], + "filament_density": [ + "1.27" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "filament_spool_weight": [ + "278" + ], + "filament_start_gcode": [ + "; filament start gcode\nM900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.02{elsif nozzle_diameter[0]==0.6}0.04{else}0.08{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K24{elsif nozzle_diameter[0]==0.8};{else}M900 K45{endif} ; Filament gcode LA 1.0" + ], + "filament_type": [ + "PETG" + ], + "filament_vendor": [ + "Prusa Polymers" + ], + "hot_plate_temp": [ + "85" + ], + "hot_plate_temp_initial_layer": [ + "85" + ], + "nozzle_temperature": [ + "240" + ], + "nozzle_temperature_initial_layer": [ + "230" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "25%" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_min_speed": [ + "10" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament PETG @MK4.json b/resources/profiles/Prusa/filament/Prusament PETG @MK4.json new file mode 100644 index 0000000000..af10c5cfc9 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PETG @MK4.json @@ -0,0 +1,69 @@ +{ + "type": "filament", + "name": "Prusament PETG @MK4", + "inherits": "fdm_filament_pet", + "from": "system", + "setting_id": "YB1aMpM57M1Wrhnw", + "filament_id": "OFkR8E2c", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4 0.25 nozzle", + "Prusa MK4 0.4 nozzle", + "Prusa MK4 0.6 nozzle", + "Prusa MK4 0.8 nozzle" + ], + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "90" + ], + "fan_min_speed": [ + "40" + ], + "filament_cost": [ + "29.99" + ], + "filament_density": [ + "1.27" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "10" + ], + "filament_ramming_parameters": [ + "250 100 42.4 42.4 42.4 42.4 42.4 | 0.05 42.4 0.45 42.4 0.95 42.4 1.45 42.4 1.95 42.4 2.45 42.4 2.95 42.4 3.45 42.4 3.95 42.4 4.45 42.4 4.95 42.4" + ], + "filament_spool_weight": [ + "278" + ], + "filament_start_gcode": [ + "; filament start gcode\nM900 K{if nozzle_diameter[0]==0.4}0.035{elsif nozzle_diameter[0]==0.25}0.12{elsif nozzle_diameter[0]==0.3}0.09{elsif nozzle_diameter[0]==0.35}0.08{elsif nozzle_diameter[0]==0.6}0.04{elsif nozzle_diameter[0]==0.5}0.05{elsif nozzle_diameter[0]==0.8}0.02{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*PRINTER_MODEL_MK4IS.*/}\nM572 S{if nozzle_diameter[0]==0.4}0.055{elsif nozzle_diameter[0]==0.5}0.042{elsif nozzle_diameter[0]==0.6}0.025{elsif nozzle_diameter[0]==0.8}0.018{elsif nozzle_diameter[0]==0.25}0.18{elsif nozzle_diameter[0]==0.3}0.1{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S36 ; set heatbreak target temp" + ], + "filament_type": [ + "PETG" + ], + "filament_vendor": [ + "Prusa Polymers" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "25%" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_min_speed": [ + "10" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament PETG @MK4S 0.6.json b/resources/profiles/Prusa/filament/Prusament PETG @MK4S 0.6.json new file mode 100644 index 0000000000..a2b467d4cb --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PETG @MK4S 0.6.json @@ -0,0 +1,18 @@ +{ + "type": "filament", + "name": "Prusament PETG @MK4S 0.6", + "inherits": "Prusament PETG @MK4S", + "from": "system", + "setting_id": "4IeTOEFPCTCEBwU1", + "filament_id": "OFkR8E2c", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S 0.6 nozzle" + ], + "fan_cooling_layer_time": "22", + "filament_max_volumetric_speed": [ + "17" + ], + "overhang_fan_speed": "45", + "slow_down_layer_time": "10" +} diff --git a/resources/profiles/Prusa/filament/Prusament PETG @MK4S 0.8.json b/resources/profiles/Prusa/filament/Prusament PETG @MK4S 0.8.json new file mode 100644 index 0000000000..af75f27433 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PETG @MK4S 0.8.json @@ -0,0 +1,23 @@ +{ + "type": "filament", + "name": "Prusament PETG @MK4S 0.8", + "inherits": "Prusament PETG @MK4S", + "from": "system", + "setting_id": "bbyfFv8Lm1scbO48", + "filament_id": "OFkR8E2c", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S 0.8 nozzle" + ], + "fan_cooling_layer_time": "25", + "fan_max_speed": "45", + "fan_min_speed": "25", + "filament_max_volumetric_speed": [ + "22" + ], + "filament_retract_before_wipe": "50", + "nozzle_temperature": "245", + "nozzle_temperature_initial_layer": "240", + "overhang_fan_speed": "45", + "slow_down_layer_time": "18" +} diff --git a/resources/profiles/Prusa/filament/Prusament PETG @MK4S HF0.4.json b/resources/profiles/Prusa/filament/Prusament PETG @MK4S HF0.4.json new file mode 100644 index 0000000000..74303e85bd --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PETG @MK4S HF0.4.json @@ -0,0 +1,23 @@ +{ + "type": "filament", + "name": "Prusament PETG @MK4S HF0.4", + "inherits": "Prusament PETG @MK4S", + "from": "system", + "setting_id": "PCkfLeCKekadlalX", + "filament_id": "OFkR8E2c", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.4 nozzle" + ], + "filament_max_volumetric_speed": [ + "24" + ], + "filament_ramming_parameters": [ + "250 100 42.4 42.4 | 0.05 42.4 0.45 42.4 0.95 42.4 1.45 42.4 1.95 42.4 2.45 42.4 2.95 42.4 3.45 42.4 3.95 42.4 4.45 42.4 4.95 42.4" + ], + "filament_start_gcode": [ + "M572 S{if nozzle_diameter[0]==0.4}0.05{elsif nozzle_diameter[0]==0.5}0.044{elsif nozzle_diameter[0]==0.6}0.035{elsif nozzle_diameter[0]==0.8}0.022{elsif nozzle_diameter[0]==0.25}0.18{elsif nozzle_diameter[0]==0.3}0.1{else}0{endif} ; Filament gcode\n\nM142 S36 ; set heatbreak target temp" + ], + "nozzle_temperature": "245", + "nozzle_temperature_initial_layer": "235" +} diff --git a/resources/profiles/Prusa/filament/Prusament PETG @MK4S HF0.5.json b/resources/profiles/Prusa/filament/Prusament PETG @MK4S HF0.5.json new file mode 100644 index 0000000000..2ab13c26fb --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PETG @MK4S HF0.5.json @@ -0,0 +1,15 @@ +{ + "type": "filament", + "name": "Prusament PETG @MK4S HF0.5", + "inherits": "Prusament PETG @MK4S", + "from": "system", + "setting_id": "HayDpO5Htl0tfaym", + "filament_id": "OFkR8E2c", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.5 nozzle" + ], + "filament_max_volumetric_speed": [ + "29" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament PETG @MK4S HF0.6.json b/resources/profiles/Prusa/filament/Prusament PETG @MK4S HF0.6.json new file mode 100644 index 0000000000..370f8a3a2e --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PETG @MK4S HF0.6.json @@ -0,0 +1,20 @@ +{ + "type": "filament", + "name": "Prusament PETG @MK4S HF0.6", + "inherits": "Prusament PETG @MK4S", + "from": "system", + "setting_id": "WtNF07X5vNklj181", + "filament_id": "OFkR8E2c", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.6 nozzle" + ], + "fan_cooling_layer_time": "22", + "filament_max_volumetric_speed": [ + "33" + ], + "nozzle_temperature": "240", + "nozzle_temperature_initial_layer": "230", + "overhang_fan_speed": "45", + "slow_down_layer_time": "10" +} diff --git a/resources/profiles/Prusa/filament/Prusament PETG @MK4S HF0.8.json b/resources/profiles/Prusa/filament/Prusament PETG @MK4S HF0.8.json new file mode 100644 index 0000000000..d9ce144cd2 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PETG @MK4S HF0.8.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "name": "Prusament PETG @MK4S HF0.8", + "inherits": "Prusament PETG @MK4S", + "from": "system", + "setting_id": "wQHkNi9PUdQBELEy", + "filament_id": "OFkR8E2c", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.8 nozzle" + ], + "fan_cooling_layer_time": "25", + "fan_max_speed": "45", + "filament_max_volumetric_speed": [ + "37" + ], + "filament_retract_before_wipe": "50", + "nozzle_temperature_initial_layer": "240", + "overhang_fan_speed": "45", + "slow_down_layer_time": "18" +} diff --git a/resources/profiles/Prusa/filament/Prusament PETG @MK4S.json b/resources/profiles/Prusa/filament/Prusament PETG @MK4S.json new file mode 100644 index 0000000000..9196845a27 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PETG @MK4S.json @@ -0,0 +1,60 @@ +{ + "type": "filament", + "name": "Prusament PETG @MK4S", + "inherits": "fdm_filament_pet", + "from": "system", + "setting_id": "J83RtTwoqDdTBPW2", + "filament_id": "OFkR8E2c", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S 0.25 nozzle", + "Prusa MK4S 0.3 nozzle", + "Prusa MK4S 0.4 nozzle", + "Prusa MK4S 0.5 nozzle" + ], + "default_filament_colour": "#FF8000", + "fan_max_speed": "40", + "filament_cost": [ + "29.99" + ], + "filament_density": [ + "1.27" + ], + "filament_end_gcode": [ + "; Filament-specific end gcode" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "filament_minimal_purge_on_wipe_tower": "35", + "filament_notes": [ + "" + ], + "filament_ramming_parameters": [ + "250 100 42.4 42.4 42.4 42.4 42.4 | 0.05 42.4 0.45 42.4 0.95 42.4 1.45 42.4 1.95 42.4 2.45 42.4 2.95 42.4 3.45 42.4 3.95 42.4 4.45 42.4 4.95 42.4" + ], + "filament_retract_before_wipe": "20", + "filament_retraction_length": "0.8", + "filament_spool_weight": [ + "278" + ], + "filament_start_gcode": [ + "M900 K{if nozzle_diameter[filament_extruder_id]==0.4}0.07{elsif nozzle_diameter[filament_extruder_id]==0.25}0.12{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).*/}\nM572 S{if nozzle_diameter[filament_extruder_id]==0.4}0.053{elsif nozzle_diameter[filament_extruder_id]==0.5}0.042{elsif nozzle_diameter[filament_extruder_id]==0.6}0.032{elsif nozzle_diameter[filament_extruder_id]==0.8}0.018{elsif nozzle_diameter[filament_extruder_id]==0.25}0.18{elsif nozzle_diameter[filament_extruder_id]==0.3}0.1{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S36 ; set heatbreak target temp" + ], + "filament_type": [ + "PETG" + ], + "filament_vendor": [ + "Prusa Polymers" + ], + "filament_wipe": "1", + "filament_z_hop": "0.15", + "full_fan_speed_layer": "5", + "hot_plate_temp": "90", + "hot_plate_temp_initial_layer": "85", + "nozzle_temperature": "240", + "nozzle_temperature_initial_layer": "230", + "overhang_fan_speed": "40", + "slow_down_layer_time": "7", + "slow_down_min_speed": "15" +} diff --git a/resources/profiles/Prusa/filament/Prusament PLA @CORE One MMU3.json b/resources/profiles/Prusa/filament/Prusament PLA @CORE One MMU3.json new file mode 100644 index 0000000000..df0112ed8f --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PLA @CORE One MMU3.json @@ -0,0 +1,54 @@ +{ + "type": "filament", + "name": "Prusament PLA @CORE One MMU3", + "inherits": "Prusament PLA @CORE One", + "from": "system", + "setting_id": "HSqoQhcjRqpny2g2", + "filament_id": "OFnO4wnf", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.4 nozzle", + "Prusa CORE One MMU3 0.25 nozzle", + "Prusa CORE One MMU3 0.3 nozzle", + "Prusa CORE One MMU3 0.6 nozzle" + ], + "filament_cooling_final_speed": [ + "3.5" + ], + "filament_cooling_initial_speed": [ + "10" + ], + "filament_cooling_moves": [ + "2" + ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], + "filament_loading_speed": [ + "10" + ], + "filament_loading_speed_start": [ + "50" + ], + "filament_ramming_parameters": [ + "250 100 40.1613 40.3548 40.4516 40.3548 40.2581| 0.05 40.1483 0.45 40.3419 0.95 40.3419 1.45 40.3419 1.95 40.3419 2.45 40.3419 2.95 40.3419 3.45 40.3419 3.95 40.3419 4.45 40.3419 4.95 40.3419" + ], + "filament_stamping_distance": [ + "45" + ], + "filament_stamping_loading_speed": [ + "29" + ], + "filament_start_gcode": [ + "M572 S{if nozzle_diameter[filament_extruder_id]==0.4}0.036{elsif nozzle_diameter[filament_extruder_id]==0.5}0.025{elsif nozzle_diameter[filament_extruder_id]==0.6}0.022{elsif nozzle_diameter[filament_extruder_id]==0.8}0.014{elsif nozzle_diameter[filament_extruder_id]==0.25}0.12{elsif nozzle_diameter[filament_extruder_id]==0.3}0.08{else}0{endif} ; Filament gcode\n\nM142 S36 ; set heatbreak target temp" + ], + "filament_unloading_speed": [ + "40" + ], + "filament_unloading_speed_start": [ + "30" + ], + "idle_temperature": [ + "170" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament PLA @MK3S.json b/resources/profiles/Prusa/filament/Prusament PLA @MK3S.json new file mode 100644 index 0000000000..ccb4b54b63 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PLA @MK3S.json @@ -0,0 +1,42 @@ +{ + "type": "filament", + "name": "Prusament PLA @MK3S", + "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "jd5bJxkA2tV0xWMh", + "filament_id": "OFnO4wnf", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK3S 0.25 nozzle", + "Prusa MK3S 0.4 nozzle", + "Prusa MK3S 0.6 nozzle", + "Prusa MK3S 0.8 nozzle" + ], + "filament_cost": [ + "27.99" + ], + "filament_density": [ + "1.24" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "filament_spool_weight": [ + "278" + ], + "filament_start_gcode": [ + "; filament start gcode\nM900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.6}0.04{else}0.05{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K18{elsif nozzle_diameter[0]==0.8};{else}M900 K30{endif} ; Filament gcode LA 1.0" + ], + "filament_type": [ + "PLA" + ], + "filament_vendor": [ + "Prusa Polymers" + ], + "slow_down_layer_time": [ + "8" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament PLA @MK4.json b/resources/profiles/Prusa/filament/Prusament PLA @MK4.json new file mode 100644 index 0000000000..7433816590 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PLA @MK4.json @@ -0,0 +1,45 @@ +{ + "type": "filament", + "name": "Prusament PLA @MK4", + "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "NcoTSmHCXFp32Loh", + "filament_id": "OFnO4wnf", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4 0.25 nozzle", + "Prusa MK4 0.4 nozzle", + "Prusa MK4 0.6 nozzle", + "Prusa MK4 0.8 nozzle" + ], + "filament_cost": [ + "27.99" + ], + "filament_density": [ + "1.24" + ], + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "filament_ramming_parameters": [ + "250 100 40 40 40 40 40 | 0.05 40 0.45 40 0.95 40 1.45 40 1.95 40 2.45 40 2.95 40 3.45 40 3.95 40 4.45 40 4.95 40" + ], + "filament_spool_weight": [ + "278" + ], + "filament_start_gcode": [ + "; filament start gcode\nM900 K{if nozzle_diameter[0]==0.4}0.026{elsif nozzle_diameter[0]==0.25}0.14{elsif nozzle_diameter[0]==0.3}0.07{elsif nozzle_diameter[0]==0.35}0.06{elsif nozzle_diameter[0]==0.6}0.03{elsif nozzle_diameter[0]==0.5}0.035{elsif nozzle_diameter[0]==0.8}0.015{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*PRINTER_MODEL_MK4IS.*/}\nM572 S{if nozzle_diameter[0]==0.4}0.026{elsif nozzle_diameter[0]==0.5}0.025{elsif nozzle_diameter[0]==0.6}0.02{elsif nozzle_diameter[0]==0.8}0.014{elsif nozzle_diameter[0]==0.25}0.12{elsif nozzle_diameter[0]==0.3}0.08{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S36 ; set heatbreak target temp" + ], + "filament_type": [ + "PLA" + ], + "filament_vendor": [ + "Prusa Polymers" + ], + "slow_down_layer_time": [ + "8" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament PLA @MK4S 0.6.json b/resources/profiles/Prusa/filament/Prusament PLA @MK4S 0.6.json new file mode 100644 index 0000000000..7d85e6a598 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PLA @MK4S 0.6.json @@ -0,0 +1,15 @@ +{ + "type": "filament", + "name": "Prusament PLA @MK4S 0.6", + "inherits": "Prusament PLA @MK4S", + "from": "system", + "setting_id": "ZEBOwRtl5qpCb9IG", + "filament_id": "OFnO4wnf", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S 0.6 nozzle" + ], + "fan_cooling_layer_time": "22", + "nozzle_temperature": "210", + "slow_down_layer_time": "10" +} diff --git a/resources/profiles/Prusa/filament/Prusament PLA @MK4S 0.8.json b/resources/profiles/Prusa/filament/Prusament PLA @MK4S 0.8.json new file mode 100644 index 0000000000..55fb31d409 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PLA @MK4S 0.8.json @@ -0,0 +1,19 @@ +{ + "type": "filament", + "name": "Prusament PLA @MK4S 0.8", + "inherits": "Prusament PLA @MK4S", + "from": "system", + "setting_id": "CzKCsSyqjLn2UfXr", + "filament_id": "OFnO4wnf", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S 0.8 nozzle" + ], + "fan_cooling_layer_time": "25", + "fan_min_speed": "80", + "filament_max_volumetric_speed": [ + "19" + ], + "nozzle_temperature": "225", + "slow_down_layer_time": "15" +} diff --git a/resources/profiles/Prusa/filament/Prusament PLA @MK4S HF0.4.json b/resources/profiles/Prusa/filament/Prusament PLA @MK4S HF0.4.json new file mode 100644 index 0000000000..e1f7978ec4 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PLA @MK4S HF0.4.json @@ -0,0 +1,22 @@ +{ + "type": "filament", + "name": "Prusament PLA @MK4S HF0.4", + "inherits": "Prusament PLA @MK4S", + "from": "system", + "setting_id": "LnduHI0DPjZ5GUrI", + "filament_id": "OFnO4wnf", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.4 nozzle" + ], + "filament_max_volumetric_speed": [ + "22" + ], + "filament_ramming_parameters": [ + "250 100 40 40| 0.05 40 0.45 40 0.95 40 1.45 40 1.95 40 2.45 40 2.95 40 3.45 40 3.95 40 4.45 40 4.95 40" + ], + "filament_start_gcode": [ + "M572 S{if nozzle_diameter[0]==0.4}0.036{elsif nozzle_diameter[0]==0.5}0.026{elsif nozzle_diameter[0]==0.6}0.02{elsif nozzle_diameter[0]==0.8}0.015{elsif nozzle_diameter[0]==0.25}0.12{elsif nozzle_diameter[0]==0.3}0.08{else}0{endif} ; Filament gcode\n\nM142 S36 ; set heatbreak target temp" + ], + "nozzle_temperature": "225" +} diff --git a/resources/profiles/Prusa/filament/Prusament PLA @MK4S HF0.5.json b/resources/profiles/Prusa/filament/Prusament PLA @MK4S HF0.5.json new file mode 100644 index 0000000000..116642f6e6 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PLA @MK4S HF0.5.json @@ -0,0 +1,17 @@ +{ + "type": "filament", + "name": "Prusament PLA @MK4S HF0.5", + "inherits": "Prusament PLA @MK4S", + "from": "system", + "setting_id": "3NoQEhv9aaqhuZkV", + "filament_id": "OFnO4wnf", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.5 nozzle" + ], + "fan_cooling_layer_time": "20", + "filament_max_volumetric_speed": [ + "24" + ], + "slow_down_layer_time": "8" +} diff --git a/resources/profiles/Prusa/filament/Prusament PLA @MK4S HF0.6.json b/resources/profiles/Prusa/filament/Prusament PLA @MK4S HF0.6.json new file mode 100644 index 0000000000..1553aad04f --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PLA @MK4S HF0.6.json @@ -0,0 +1,18 @@ +{ + "type": "filament", + "name": "Prusament PLA @MK4S HF0.6", + "inherits": "Prusament PLA @MK4S", + "from": "system", + "setting_id": "gc7etYK4E5aNlE8r", + "filament_id": "OFnO4wnf", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.6 nozzle" + ], + "fan_cooling_layer_time": "22", + "filament_max_volumetric_speed": [ + "30" + ], + "slow_down_layer_time": "10", + "slow_down_min_speed": "15" +} diff --git a/resources/profiles/Prusa/filament/Prusament PLA @MK4S HF0.8.json b/resources/profiles/Prusa/filament/Prusament PLA @MK4S HF0.8.json new file mode 100644 index 0000000000..f971be6375 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PLA @MK4S HF0.8.json @@ -0,0 +1,19 @@ +{ + "type": "filament", + "name": "Prusament PLA @MK4S HF0.8", + "inherits": "Prusament PLA @MK4S", + "from": "system", + "setting_id": "7RNQ9AxcL9zZVpqX", + "filament_id": "OFnO4wnf", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.8 nozzle" + ], + "fan_cooling_layer_time": "25", + "fan_min_speed": "80", + "filament_max_volumetric_speed": [ + "35" + ], + "slow_down_layer_time": "15", + "slow_down_min_speed": "15" +} diff --git a/resources/profiles/Prusa/filament/Prusament PLA @MK4S.json b/resources/profiles/Prusa/filament/Prusament PLA @MK4S.json new file mode 100644 index 0000000000..24df5df2a6 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PLA @MK4S.json @@ -0,0 +1,52 @@ +{ + "type": "filament", + "name": "Prusament PLA @MK4S", + "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "Zhgox3YIOqKlJpI7", + "filament_id": "OFnO4wnf", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S 0.25 nozzle", + "Prusa MK4S 0.3 nozzle", + "Prusa MK4S 0.4 nozzle", + "Prusa MK4S 0.5 nozzle" + ], + "default_filament_colour": "#FF8000", + "fan_cooling_layer_time": "17", + "fan_min_speed": "70", + "filament_cost": [ + "27.99" + ], + "filament_density": [ + "1.24" + ], + "filament_end_gcode": [ + "; Filament-specific end gcode" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_notes": [ + "" + ], + "filament_ramming_parameters": [ + "250 100 40 40 40 40 40 | 0.05 40 0.45 40 0.95 40 1.45 40 1.95 40 2.45 40 2.95 40 3.45 40 3.95 40 4.45 40 4.95 40" + ], + "filament_spool_weight": [ + "278" + ], + "filament_start_gcode": [ + "M900 K{if nozzle_diameter[filament_extruder_id]==0.4}0.05{elsif nozzle_diameter[filament_extruder_id]==0.25}0.14{elsif nozzle_diameter[filament_extruder_id]==0.3}0.07{elsif nozzle_diameter[filament_extruder_id]==0.35}0.06{elsif nozzle_diameter[filament_extruder_id]==0.6}0.03{elsif nozzle_diameter[filament_extruder_id]==0.5}0.035{elsif nozzle_diameter[filament_extruder_id]==0.8}0.015{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*(MK4IS|XLIS|MK4S|MK3.9S).*/}\nM572 S{if nozzle_diameter[filament_extruder_id]==0.4}0.036{elsif nozzle_diameter[filament_extruder_id]==0.5}0.025{elsif nozzle_diameter[filament_extruder_id]==0.6}0.02{elsif nozzle_diameter[filament_extruder_id]==0.8}0.014{elsif nozzle_diameter[filament_extruder_id]==0.25}0.12{elsif nozzle_diameter[filament_extruder_id]==0.3}0.08{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S36 ; set heatbreak target temp" + ], + "filament_type": [ + "PLA" + ], + "filament_vendor": [ + "Prusa Polymers" + ], + "full_fan_speed_layer": "3", + "nozzle_temperature_initial_layer": "230", + "slow_down_layer_time": "6", + "slow_down_min_speed": "20" +} diff --git a/resources/profiles/Prusa/filament/Prusament PVB @CORE One MMU3.json b/resources/profiles/Prusa/filament/Prusament PVB @CORE One MMU3.json new file mode 100644 index 0000000000..992b9ebd58 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PVB @CORE One MMU3.json @@ -0,0 +1,57 @@ +{ + "type": "filament", + "name": "Prusament PVB @CORE One MMU3", + "inherits": "Prusament PVB @CORE One", + "from": "system", + "setting_id": "IXUO4uCgUY1p5jIo", + "filament_id": "OFh7mvPO", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.4 nozzle", + "Prusa CORE One MMU3 0.25 nozzle", + "Prusa CORE One MMU3 0.3 nozzle", + "Prusa CORE One MMU3 0.6 nozzle" + ], + "filament_cooling_final_speed": [ + "3.5" + ], + "filament_cooling_initial_speed": [ + "10" + ], + "filament_cooling_moves": [ + "2" + ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], + "filament_loading_speed": [ + "10" + ], + "filament_loading_speed_start": [ + "50" + ], + "filament_minimal_purge_on_wipe_tower": [ + "15" + ], + "filament_ramming_parameters": [ + "250 100 40.1613 40.3548 40.4516 40.3548 40.2581| 0.05 40.1483 0.45 40.3419 0.95 40.3419 1.45 40.3419 1.95 40.3419 2.45 40.3419 2.95 40.3419 3.45 40.3419 3.95 40.3419 4.45 40.3419 4.95 40.3419" + ], + "filament_stamping_distance": [ + "45" + ], + "filament_stamping_loading_speed": [ + "29" + ], + "filament_start_gcode": [ + "M572 S{if nozzle_diameter[filament_extruder_id]==0.4}0.036{elsif nozzle_diameter[filament_extruder_id]==0.5}0.025{elsif nozzle_diameter[filament_extruder_id]==0.6}0.022{elsif nozzle_diameter[filament_extruder_id]==0.8}0.014{elsif nozzle_diameter[filament_extruder_id]==0.25}0.12{elsif nozzle_diameter[filament_extruder_id]==0.3}0.08{else}0{endif} ; Filament gcode\n\nM142 S36 ; set heatbreak target temp" + ], + "filament_unloading_speed": [ + "40" + ], + "filament_unloading_speed_start": [ + "30" + ], + "idle_temperature": [ + "170" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament PVB @MK3S.json b/resources/profiles/Prusa/filament/Prusament PVB @MK3S.json new file mode 100644 index 0000000000..13a6aa761a --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PVB @MK3S.json @@ -0,0 +1,51 @@ +{ + "type": "filament", + "name": "Prusament PVB @MK3S", + "inherits": "fdm_filament_pvb", + "from": "system", + "setting_id": "kO3wM0M7J1PagKmj", + "filament_id": "OFh7mvPO", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK3S 0.25 nozzle", + "Prusa MK3S 0.4 nozzle", + "Prusa MK3S 0.6 nozzle", + "Prusa MK3S 0.8 nozzle" + ], + "filament_cost": [ + "49.98" + ], + "filament_density": [ + "1.09" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "filament_spool_weight": [ + "278" + ], + "filament_start_gcode": [ + "; filament start gcode\nM900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.6}0.04{else}0.05{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K18{elsif nozzle_diameter[0]==0.8};{else}M900 K30{endif} ; Filament gcode LA 1.0" + ], + "filament_type": [ + "PVB" + ], + "filament_vendor": [ + "Prusa Polymers" + ], + "hot_plate_temp": [ + "75" + ], + "hot_plate_temp_initial_layer": [ + "75" + ], + "nozzle_temperature": [ + "215" + ], + "nozzle_temperature_initial_layer": [ + "215" + ], + "slow_down_layer_time": [ + "8" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament PVB @MK4.json b/resources/profiles/Prusa/filament/Prusament PVB @MK4.json new file mode 100644 index 0000000000..bce92b05ef --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PVB @MK4.json @@ -0,0 +1,54 @@ +{ + "type": "filament", + "name": "Prusament PVB @MK4", + "inherits": "fdm_filament_pvb", + "from": "system", + "setting_id": "Ef8S7ZBjRdBICgMN", + "filament_id": "OFh7mvPO", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4 0.25 nozzle", + "Prusa MK4 0.4 nozzle", + "Prusa MK4 0.6 nozzle", + "Prusa MK4 0.8 nozzle" + ], + "filament_cost": [ + "49.98" + ], + "filament_density": [ + "1.09" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "filament_ramming_parameters": [ + "250 100 40 40 40 40 40 | 0.05 40 0.45 40 0.95 40 1.45 40 1.95 40 2.45 40 2.95 40 3.45 40 3.95 40 4.45 40 4.95 40" + ], + "filament_spool_weight": [ + "278" + ], + "filament_start_gcode": [ + "; filament start gcode\nM900 K{if nozzle_diameter[0]==0.4}0.026{elsif nozzle_diameter[0]==0.25}0.14{elsif nozzle_diameter[0]==0.3}0.07{elsif nozzle_diameter[0]==0.35}0.06{elsif nozzle_diameter[0]==0.6}0.03{elsif nozzle_diameter[0]==0.5}0.035{elsif nozzle_diameter[0]==0.8}0.015{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*PRINTER_MODEL_MK4IS.*/}\nM572 S{if nozzle_diameter[0]==0.4}0.026{elsif nozzle_diameter[0]==0.5}0.025{elsif nozzle_diameter[0]==0.6}0.02{elsif nozzle_diameter[0]==0.8}0.014{elsif nozzle_diameter[0]==0.25}0.12{elsif nozzle_diameter[0]==0.3}0.08{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S36 ; set heatbreak target temp" + ], + "filament_type": [ + "PVB" + ], + "filament_vendor": [ + "Prusa Polymers" + ], + "hot_plate_temp": [ + "75" + ], + "hot_plate_temp_initial_layer": [ + "75" + ], + "nozzle_temperature": [ + "215" + ], + "nozzle_temperature_initial_layer": [ + "215" + ], + "slow_down_layer_time": [ + "8" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament PVB @MK4S 0.6.json b/resources/profiles/Prusa/filament/Prusament PVB @MK4S 0.6.json new file mode 100644 index 0000000000..10b24342b8 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PVB @MK4S 0.6.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "Prusament PVB @MK4S 0.6", + "inherits": "Prusament PVB @MK4S", + "from": "system", + "setting_id": "d3jPKsT0pNyA81gj", + "filament_id": "OFh7mvPO", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S 0.6 nozzle" + ], + "fan_cooling_layer_time": "22", + "slow_down_layer_time": "10" +} diff --git a/resources/profiles/Prusa/filament/Prusament PVB @MK4S 0.8.json b/resources/profiles/Prusa/filament/Prusament PVB @MK4S 0.8.json new file mode 100644 index 0000000000..9456ebc3c5 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PVB @MK4S 0.8.json @@ -0,0 +1,15 @@ +{ + "type": "filament", + "name": "Prusament PVB @MK4S 0.8", + "inherits": "Prusament PVB @MK4S", + "from": "system", + "setting_id": "YHoqMYnFgw3tp4uV", + "filament_id": "OFh7mvPO", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S 0.8 nozzle" + ], + "fan_cooling_layer_time": "25", + "fan_min_speed": "80", + "slow_down_layer_time": "15" +} diff --git a/resources/profiles/Prusa/filament/Prusament PVB @MK4S HF0.4.json b/resources/profiles/Prusa/filament/Prusament PVB @MK4S HF0.4.json new file mode 100644 index 0000000000..f18231e31c --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PVB @MK4S HF0.4.json @@ -0,0 +1,18 @@ +{ + "type": "filament", + "name": "Prusament PVB @MK4S HF0.4", + "inherits": "Prusament PVB @MK4S", + "from": "system", + "setting_id": "Sds69fscdMiTlHlX", + "filament_id": "OFh7mvPO", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.4 nozzle" + ], + "filament_ramming_parameters": [ + "250 100 40 40| 0.05 40 0.45 40 0.95 40 1.45 40 1.95 40 2.45 40 2.95 40 3.45 40 3.95 40 4.45 40 4.95 40" + ], + "filament_start_gcode": [ + "M572 S{if nozzle_diameter[0]==0.4}0.036{elsif nozzle_diameter[0]==0.5}0.026{elsif nozzle_diameter[0]==0.6}0.02{elsif nozzle_diameter[0]==0.8}0.015{elsif nozzle_diameter[0]==0.25}0.12{elsif nozzle_diameter[0]==0.3}0.08{else}0{endif} ; Filament gcode\n\nM142 S36 ; set heatbreak target temp" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament PVB @MK4S HF0.5.json b/resources/profiles/Prusa/filament/Prusament PVB @MK4S HF0.5.json new file mode 100644 index 0000000000..843e9cc4b9 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PVB @MK4S HF0.5.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "Prusament PVB @MK4S HF0.5", + "inherits": "Prusament PVB @MK4S", + "from": "system", + "setting_id": "HRME1Zm3QWVNOM7D", + "filament_id": "OFh7mvPO", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.5 nozzle" + ], + "fan_cooling_layer_time": "20", + "slow_down_layer_time": "8" +} diff --git a/resources/profiles/Prusa/filament/Prusament PVB @MK4S HF0.6.json b/resources/profiles/Prusa/filament/Prusament PVB @MK4S HF0.6.json new file mode 100644 index 0000000000..4e88e536b3 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PVB @MK4S HF0.6.json @@ -0,0 +1,15 @@ +{ + "type": "filament", + "name": "Prusament PVB @MK4S HF0.6", + "inherits": "Prusament PVB @MK4S", + "from": "system", + "setting_id": "dMKhLR5eOYhQusUg", + "filament_id": "OFh7mvPO", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.6 nozzle" + ], + "fan_cooling_layer_time": "22", + "slow_down_layer_time": "10", + "slow_down_min_speed": "15" +} diff --git a/resources/profiles/Prusa/filament/Prusament PVB @MK4S HF0.8.json b/resources/profiles/Prusa/filament/Prusament PVB @MK4S HF0.8.json new file mode 100644 index 0000000000..c91839dfbc --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PVB @MK4S HF0.8.json @@ -0,0 +1,16 @@ +{ + "type": "filament", + "name": "Prusament PVB @MK4S HF0.8", + "inherits": "Prusament PVB @MK4S", + "from": "system", + "setting_id": "E41yKP1EQp91Dhbm", + "filament_id": "OFh7mvPO", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.8 nozzle" + ], + "fan_cooling_layer_time": "25", + "fan_min_speed": "80", + "slow_down_layer_time": "15", + "slow_down_min_speed": "15" +} diff --git a/resources/profiles/Prusa/filament/Prusament PVB @MK4S.json b/resources/profiles/Prusa/filament/Prusament PVB @MK4S.json new file mode 100644 index 0000000000..18e28e7418 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament PVB @MK4S.json @@ -0,0 +1,62 @@ +{ + "type": "filament", + "name": "Prusament PVB @MK4S", + "inherits": "fdm_filament_pvb", + "from": "system", + "setting_id": "eIhnQsQrrCKHjCIy", + "filament_id": "OFh7mvPO", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S 0.25 nozzle", + "Prusa MK4S 0.3 nozzle", + "Prusa MK4S 0.4 nozzle", + "Prusa MK4S 0.5 nozzle" + ], + "fan_cooling_layer_time": "17", + "fan_min_speed": "70", + "filament_cost": [ + "49.98" + ], + "filament_density": [ + "1.09" + ], + "filament_end_gcode": [ + "; Filament-specific end gcode" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "filament_notes": [ + "" + ], + "filament_ramming_parameters": [ + "250 100 40 40 40 40 40 | 0.05 40 0.45 40 0.95 40 1.45 40 1.95 40 2.45 40 2.95 40 3.45 40 3.95 40 4.45 40 4.95 40" + ], + "filament_spool_weight": [ + "278" + ], + "filament_start_gcode": [ + "M900 K{if nozzle_diameter[filament_extruder_id]==0.4}0.05{elsif nozzle_diameter[filament_extruder_id]==0.25}0.14{elsif nozzle_diameter[filament_extruder_id]==0.3}0.07{elsif nozzle_diameter[filament_extruder_id]==0.35}0.06{elsif nozzle_diameter[filament_extruder_id]==0.6}0.03{elsif nozzle_diameter[filament_extruder_id]==0.5}0.035{elsif nozzle_diameter[filament_extruder_id]==0.8}0.015{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*(MK4IS|XLIS|MK4S|MK3.9S).*/}\nM572 S{if nozzle_diameter[filament_extruder_id]==0.4}0.036{elsif nozzle_diameter[filament_extruder_id]==0.5}0.025{elsif nozzle_diameter[filament_extruder_id]==0.6}0.02{elsif nozzle_diameter[filament_extruder_id]==0.8}0.014{elsif nozzle_diameter[filament_extruder_id]==0.25}0.12{elsif nozzle_diameter[filament_extruder_id]==0.3}0.08{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S36 ; set heatbreak target temp" + ], + "filament_type": [ + "PVB" + ], + "filament_vendor": [ + "Prusa Polymers" + ], + "full_fan_speed_layer": "3", + "hot_plate_temp": [ + "75" + ], + "hot_plate_temp_initial_layer": [ + "75" + ], + "nozzle_temperature": [ + "215" + ], + "nozzle_temperature_initial_layer": [ + "215" + ], + "slow_down_layer_time": "6", + "slow_down_min_speed": "20" +} diff --git a/resources/profiles/Prusa/filament/Prusament rPLA @CORE One MMU3.json b/resources/profiles/Prusa/filament/Prusament rPLA @CORE One MMU3.json new file mode 100644 index 0000000000..282449b194 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament rPLA @CORE One MMU3.json @@ -0,0 +1,54 @@ +{ + "type": "filament", + "name": "Prusament rPLA @CORE One MMU3", + "inherits": "Prusament rPLA @CORE One", + "from": "system", + "setting_id": "n0gSFPBaa7PQ1Y1x", + "filament_id": "OFWRITFw", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.4 nozzle", + "Prusa CORE One MMU3 0.25 nozzle", + "Prusa CORE One MMU3 0.3 nozzle", + "Prusa CORE One MMU3 0.6 nozzle" + ], + "filament_cooling_final_speed": [ + "3.5" + ], + "filament_cooling_initial_speed": [ + "10" + ], + "filament_cooling_moves": [ + "2" + ], + "filament_extruder_variant": [ + "Direct Drive Standard" + ], + "filament_loading_speed": [ + "10" + ], + "filament_loading_speed_start": [ + "50" + ], + "filament_ramming_parameters": [ + "250 100 40.1613 40.3548 40.4516 40.3548 40.2581| 0.05 40.1483 0.45 40.3419 0.95 40.3419 1.45 40.3419 1.95 40.3419 2.45 40.3419 2.95 40.3419 3.45 40.3419 3.95 40.3419 4.45 40.3419 4.95 40.3419" + ], + "filament_stamping_distance": [ + "45" + ], + "filament_stamping_loading_speed": [ + "29" + ], + "filament_start_gcode": [ + "M572 S{if nozzle_diameter[filament_extruder_id]==0.4}0.036{elsif nozzle_diameter[filament_extruder_id]==0.5}0.025{elsif nozzle_diameter[filament_extruder_id]==0.6}0.022{elsif nozzle_diameter[filament_extruder_id]==0.8}0.014{elsif nozzle_diameter[filament_extruder_id]==0.25}0.12{elsif nozzle_diameter[filament_extruder_id]==0.3}0.08{else}0{endif} ; Filament gcode\n\nM142 S36 ; set heatbreak target temp" + ], + "filament_unloading_speed": [ + "40" + ], + "filament_unloading_speed_start": [ + "30" + ], + "idle_temperature": [ + "170" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament rPLA @MK3S.json b/resources/profiles/Prusa/filament/Prusament rPLA @MK3S.json new file mode 100644 index 0000000000..26edf0dcd5 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament rPLA @MK3S.json @@ -0,0 +1,51 @@ +{ + "type": "filament", + "name": "Prusament rPLA @MK3S", + "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "DvZ1JFdQmxSvwekh", + "filament_id": "OFWRITFw", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK3S 0.25 nozzle", + "Prusa MK3S 0.4 nozzle", + "Prusa MK3S 0.6 nozzle", + "Prusa MK3S 0.8 nozzle" + ], + "filament_cost": [ + "37.49" + ], + "filament_density": [ + "1.24" + ], + "filament_max_volumetric_speed": [ + "10" + ], + "filament_spool_weight": [ + "278" + ], + "filament_start_gcode": [ + "; filament start gcode\nM900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.6}0.04{else}0.05{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K18{elsif nozzle_diameter[0]==0.8};{else}M900 K30{endif} ; Filament gcode LA 1.0" + ], + "filament_type": [ + "PLA" + ], + "filament_vendor": [ + "Prusa Polymers" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature": [ + "205" + ], + "nozzle_temperature_initial_layer": [ + "205" + ], + "slow_down_layer_time": [ + "8" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament rPLA @MK4.json b/resources/profiles/Prusa/filament/Prusament rPLA @MK4.json new file mode 100644 index 0000000000..f5a1e0a766 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament rPLA @MK4.json @@ -0,0 +1,54 @@ +{ + "type": "filament", + "name": "Prusament rPLA @MK4", + "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "SnMLCgJupdA5BURx", + "filament_id": "OFWRITFw", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4 0.25 nozzle", + "Prusa MK4 0.4 nozzle", + "Prusa MK4 0.6 nozzle", + "Prusa MK4 0.8 nozzle" + ], + "filament_cost": [ + "37.49" + ], + "filament_density": [ + "1.24" + ], + "filament_max_volumetric_speed": [ + "10" + ], + "filament_ramming_parameters": [ + "250 100 40 40 40 40 40 | 0.05 40 0.45 40 0.95 40 1.45 40 1.95 40 2.45 40 2.95 40 3.45 40 3.95 40 4.45 40 4.95 40" + ], + "filament_spool_weight": [ + "278" + ], + "filament_start_gcode": [ + "; filament start gcode\nM900 K{if nozzle_diameter[0]==0.4}0.026{elsif nozzle_diameter[0]==0.25}0.14{elsif nozzle_diameter[0]==0.3}0.07{elsif nozzle_diameter[0]==0.35}0.06{elsif nozzle_diameter[0]==0.6}0.03{elsif nozzle_diameter[0]==0.5}0.035{elsif nozzle_diameter[0]==0.8}0.015{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*PRINTER_MODEL_MK4IS.*/}\nM572 S{if nozzle_diameter[0]==0.4}0.026{elsif nozzle_diameter[0]==0.5}0.025{elsif nozzle_diameter[0]==0.6}0.02{elsif nozzle_diameter[0]==0.8}0.014{elsif nozzle_diameter[0]==0.25}0.12{elsif nozzle_diameter[0]==0.3}0.08{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S36 ; set heatbreak target temp" + ], + "filament_type": [ + "PLA" + ], + "filament_vendor": [ + "Prusa Polymers" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature": [ + "205" + ], + "nozzle_temperature_initial_layer": [ + "205" + ], + "slow_down_layer_time": [ + "8" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament rPLA @MK4S 0.6.json b/resources/profiles/Prusa/filament/Prusament rPLA @MK4S 0.6.json new file mode 100644 index 0000000000..c973329486 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament rPLA @MK4S 0.6.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "Prusament rPLA @MK4S 0.6", + "inherits": "Prusament rPLA @MK4S", + "from": "system", + "setting_id": "Jsb4d55uh5AiilFy", + "filament_id": "OFWRITFw", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S 0.6 nozzle" + ], + "fan_cooling_layer_time": "22", + "slow_down_layer_time": "10" +} diff --git a/resources/profiles/Prusa/filament/Prusament rPLA @MK4S 0.8.json b/resources/profiles/Prusa/filament/Prusament rPLA @MK4S 0.8.json new file mode 100644 index 0000000000..7ed563d0ee --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament rPLA @MK4S 0.8.json @@ -0,0 +1,15 @@ +{ + "type": "filament", + "name": "Prusament rPLA @MK4S 0.8", + "inherits": "Prusament rPLA @MK4S", + "from": "system", + "setting_id": "ETHdABOm1ngNTAwE", + "filament_id": "OFWRITFw", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S 0.8 nozzle" + ], + "fan_cooling_layer_time": "25", + "fan_min_speed": "80", + "slow_down_layer_time": "15" +} diff --git a/resources/profiles/Prusa/filament/Prusament rPLA @MK4S HF0.4.json b/resources/profiles/Prusa/filament/Prusament rPLA @MK4S HF0.4.json new file mode 100644 index 0000000000..118d9eeac3 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament rPLA @MK4S HF0.4.json @@ -0,0 +1,18 @@ +{ + "type": "filament", + "name": "Prusament rPLA @MK4S HF0.4", + "inherits": "Prusament rPLA @MK4S", + "from": "system", + "setting_id": "KqG308Vq6NlSFvBq", + "filament_id": "OFWRITFw", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.4 nozzle" + ], + "filament_ramming_parameters": [ + "250 100 40 40| 0.05 40 0.45 40 0.95 40 1.45 40 1.95 40 2.45 40 2.95 40 3.45 40 3.95 40 4.45 40 4.95 40" + ], + "filament_start_gcode": [ + "M572 S{if nozzle_diameter[0]==0.4}0.036{elsif nozzle_diameter[0]==0.5}0.026{elsif nozzle_diameter[0]==0.6}0.02{elsif nozzle_diameter[0]==0.8}0.015{elsif nozzle_diameter[0]==0.25}0.12{elsif nozzle_diameter[0]==0.3}0.08{else}0{endif} ; Filament gcode\n\nM142 S36 ; set heatbreak target temp" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusament rPLA @MK4S HF0.5.json b/resources/profiles/Prusa/filament/Prusament rPLA @MK4S HF0.5.json new file mode 100644 index 0000000000..8cadd83f2a --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament rPLA @MK4S HF0.5.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "Prusament rPLA @MK4S HF0.5", + "inherits": "Prusament rPLA @MK4S", + "from": "system", + "setting_id": "yWMgM2m6Vhmgcz3o", + "filament_id": "OFWRITFw", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.5 nozzle" + ], + "fan_cooling_layer_time": "20", + "slow_down_layer_time": "8" +} diff --git a/resources/profiles/Prusa/filament/Prusament rPLA @MK4S HF0.6.json b/resources/profiles/Prusa/filament/Prusament rPLA @MK4S HF0.6.json new file mode 100644 index 0000000000..cf1721197b --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament rPLA @MK4S HF0.6.json @@ -0,0 +1,15 @@ +{ + "type": "filament", + "name": "Prusament rPLA @MK4S HF0.6", + "inherits": "Prusament rPLA @MK4S", + "from": "system", + "setting_id": "rG5LhqOyuhtVsJA5", + "filament_id": "OFWRITFw", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.6 nozzle" + ], + "fan_cooling_layer_time": "22", + "slow_down_layer_time": "10", + "slow_down_min_speed": "15" +} diff --git a/resources/profiles/Prusa/filament/Prusament rPLA @MK4S HF0.8.json b/resources/profiles/Prusa/filament/Prusament rPLA @MK4S HF0.8.json new file mode 100644 index 0000000000..a0368f1f76 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament rPLA @MK4S HF0.8.json @@ -0,0 +1,16 @@ +{ + "type": "filament", + "name": "Prusament rPLA @MK4S HF0.8", + "inherits": "Prusament rPLA @MK4S", + "from": "system", + "setting_id": "4aW3ShLVlu345ILy", + "filament_id": "OFWRITFw", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S HF0.8 nozzle" + ], + "fan_cooling_layer_time": "25", + "fan_min_speed": "80", + "slow_down_layer_time": "15", + "slow_down_min_speed": "15" +} diff --git a/resources/profiles/Prusa/filament/Prusament rPLA @MK4S.json b/resources/profiles/Prusa/filament/Prusament rPLA @MK4S.json new file mode 100644 index 0000000000..7ad6c20567 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusament rPLA @MK4S.json @@ -0,0 +1,62 @@ +{ + "type": "filament", + "name": "Prusament rPLA @MK4S", + "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "RT3cyjS4ZsddCiM9", + "filament_id": "OFWRITFw", + "instantiation": "true", + "compatible_printers": [ + "Prusa MK4S 0.25 nozzle", + "Prusa MK4S 0.3 nozzle", + "Prusa MK4S 0.4 nozzle", + "Prusa MK4S 0.5 nozzle" + ], + "fan_cooling_layer_time": "17", + "fan_min_speed": "70", + "filament_cost": [ + "37.49" + ], + "filament_density": [ + "1.24" + ], + "filament_end_gcode": [ + "; Filament-specific end gcode" + ], + "filament_max_volumetric_speed": [ + "10" + ], + "filament_notes": [ + "" + ], + "filament_ramming_parameters": [ + "250 100 40 40 40 40 40 | 0.05 40 0.45 40 0.95 40 1.45 40 1.95 40 2.45 40 2.95 40 3.45 40 3.95 40 4.45 40 4.95 40" + ], + "filament_spool_weight": [ + "278" + ], + "filament_start_gcode": [ + "M900 K{if nozzle_diameter[filament_extruder_id]==0.4}0.05{elsif nozzle_diameter[filament_extruder_id]==0.25}0.14{elsif nozzle_diameter[filament_extruder_id]==0.3}0.07{elsif nozzle_diameter[filament_extruder_id]==0.35}0.06{elsif nozzle_diameter[filament_extruder_id]==0.6}0.03{elsif nozzle_diameter[filament_extruder_id]==0.5}0.035{elsif nozzle_diameter[filament_extruder_id]==0.8}0.015{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*(MK4IS|XLIS|MK4S|MK3.9S).*/}\nM572 S{if nozzle_diameter[filament_extruder_id]==0.4}0.036{elsif nozzle_diameter[filament_extruder_id]==0.5}0.025{elsif nozzle_diameter[filament_extruder_id]==0.6}0.02{elsif nozzle_diameter[filament_extruder_id]==0.8}0.014{elsif nozzle_diameter[filament_extruder_id]==0.25}0.12{elsif nozzle_diameter[filament_extruder_id]==0.3}0.08{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S36 ; set heatbreak target temp" + ], + "filament_type": [ + "PLA" + ], + "filament_vendor": [ + "Prusa Polymers" + ], + "full_fan_speed_layer": "3", + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature": [ + "205" + ], + "nozzle_temperature_initial_layer": [ + "205" + ], + "slow_down_layer_time": "6", + "slow_down_min_speed": "20" +} diff --git a/resources/profiles/Prusa/machine/Prusa CORE One MMU3 0.25 nozzle.json b/resources/profiles/Prusa/machine/Prusa CORE One MMU3 0.25 nozzle.json new file mode 100644 index 0000000000..2a862a9a73 --- /dev/null +++ b/resources/profiles/Prusa/machine/Prusa CORE One MMU3 0.25 nozzle.json @@ -0,0 +1,18 @@ +{ + "type": "machine", + "name": "Prusa CORE One MMU3 0.25 nozzle", + "inherits": "Prusa CORE One MMU3 0.4 nozzle", + "from": "system", + "setting_id": "8VtAsgGqtUUBmaxH", + "instantiation": "true", + "default_print_profile": "0.12mm SPEED @COREONE0.25 + MMU3", + "max_layer_height": "0.15", + "min_layer_height": "0.05", + "nozzle_diameter": [ + "0.25" + ], + "printer_model": "Prusa CORE One MMU3", + "printer_variant": "0.25", + "retraction_length": "0.8", + "z_hop": "0.15" +} diff --git a/resources/profiles/Prusa/machine/Prusa CORE One MMU3 0.3 nozzle.json b/resources/profiles/Prusa/machine/Prusa CORE One MMU3 0.3 nozzle.json new file mode 100644 index 0000000000..3396a41a8d --- /dev/null +++ b/resources/profiles/Prusa/machine/Prusa CORE One MMU3 0.3 nozzle.json @@ -0,0 +1,18 @@ +{ + "type": "machine", + "name": "Prusa CORE One MMU3 0.3 nozzle", + "inherits": "Prusa CORE One MMU3 0.4 nozzle", + "from": "system", + "setting_id": "EiPXZjRoFcw95gWA", + "instantiation": "true", + "default_print_profile": "0.16mm STRUCTURAL @COREONE0.3 + MMU3", + "max_layer_height": "0.22", + "min_layer_height": "0.05", + "nozzle_diameter": [ + "0.3" + ], + "printer_model": "Prusa CORE One MMU3", + "printer_variant": "0.3", + "retraction_length": "0.7", + "z_hop": "0.15" +} diff --git a/resources/profiles/Prusa/machine/Prusa CORE One MMU3 0.4 nozzle.json b/resources/profiles/Prusa/machine/Prusa CORE One MMU3 0.4 nozzle.json new file mode 100644 index 0000000000..83a6a95ca5 --- /dev/null +++ b/resources/profiles/Prusa/machine/Prusa CORE One MMU3 0.4 nozzle.json @@ -0,0 +1,40 @@ +{ + "type": "machine", + "name": "Prusa CORE One MMU3 0.4 nozzle", + "inherits": "Prusa CORE One 0.4 nozzle", + "from": "system", + "setting_id": "7NzvROXEkMpOMzJ5", + "instantiation": "true", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\nG92 E0.0\n;[layer_z]", + "change_filament_gcode": "", + "cooling_tube_length": "20", + "cooling_tube_retraction": "45", + "default_filament_profile": "Prusament PLA @CORE One MMU3", + "default_print_profile": "0.20mm SPEED @COREONE0.4 + MMU3", + "extra_loading_move": "-52", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\n", + "machine_end_gcode": "{if layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+1, max_print_height)} F720 ; Move print head up{endif}\nM140 S0 ; turn off heatbed\nM141 S0 ; disable chamber control\nM107 ; turn off fan\nG1 X242 Y211 F10200 ; park\n{if layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+50, max_print_height)} F720 ; Move bed down{endif}\nM702 ; unload the current filament\nM104 S0 ; turn off temperature\nG4 ; wait\nM572 S0 ; reset PA\nM84 X Y E ; disable motors\n; max_layer_z = [max_layer_z]", + "machine_load_filament_time": "10.9", + "machine_max_speed_z": [ + "12", + "40" + ], + "machine_start_gcode": "M17 ; enable steppers\nM862.1 P[nozzle_diameter] A{(printer_notes=~/.*ABRASIVE_NOZZLE.*/ ? 1 : 0)} F{(printer_notes=~/.*HF_NOZZLE.*/ ? 1 : 0)} ; nozzle check\nM862.3 P \"COREONE\" ; printer model check\nM862.5 P2 ; g-code level check\nM862.6 P \"Input shaper\" ; FW feature check\nM862.6 P \"MMU3\" ; FW feature check\nM115 U6.4.0+11974\n\n; setup MMU\nM708 A0x0b X5 ; extra load distance\nM708 A0x0d X140 ; unload feedrate\nM708 A0x11 X140 ; load feedrate\nM708 A0x14 X50 ; slow feedrate\nM708 A0x1e X12 ; Pulley current to ~200mA\nM708 A0x12 X90 ; selector feedrate mm/s\nM708 A0x13 X400 ; idler feedrate deg/s\nM708 A0x0f X400 ; selector acceleration mm/s2\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))} ; define print area\n\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\n\n{if chamber_temperature[initial_tool] > 35} \n; we need to preheat the chamber\nM140 S115 ; set bed temp for chamber heating\n{else} \n; just set the selected bed temp otherwise\nM140 S[first_layer_bed_temperature] ; set bed temp\n{endif}\nM109 R{((filament_notes[initial_tool]=~/.*HT_MBL10.*/) ? (first_layer_temperature[initial_tool] - 10) : (filament_type[initial_tool] == \"PC\" or filament_type[initial_tool] == \"PA\") ? (first_layer_temperature[initial_tool] - 25) : (filament_type[initial_tool] == \"FLEX\") ? 210 : (filament_type[initial_tool]=~/.*PET.*/) ? 175 : 170)} ; wait for temp\n\nM84 E ; turn off E motor\n\nG28 ; home all without mesh bed level\n\n; -- Chamber Temperature Control --\n{if chamber_temperature[initial_tool] > 35} ; if we need to heat the chamber\n; min chamber temp section\nM104 T{initial_tool} S{if idle_temperature[initial_tool] == 0}100{else}{idle_temperature[initial_tool]}{endif} ; set idle temp\nG1 Z10 F720 ; set bed position\nG1 X242 Y-9 F4800 ; set print head position\nM191 S{chamber_temperature[initial_tool]} ; wait for minimal chamber temp\nM141 S0 ; set nominal chamber temp\nM107\nM140 S[first_layer_bed_temperature] ; set bed temp\n\n{else}\nM141 S{if chamber_temperature[initial_tool] == 0}20{else}{chamber_temperature[initial_tool]}{endif} ; set nominal chamber temp\n{endif}\n\n{if first_layer_bed_temperature[initial_tool]<=60}M106 S70{endif}\nG0 Z40 F10000\nM104 T{initial_tool} S{if idle_temperature[initial_tool] == 0}100{else}{idle_temperature[initial_tool]}{endif}\nM190 R[first_layer_bed_temperature] ; wait for bed temp\nM107\n\nG29 G ; absorb heat\n\nM109 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 : 170)} ; wait for MBL temp\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\n; --- Mesh Bed Leveling (MBL) ---\n\nG29 P9 X208 Y-2.5 W32 H4 ; limited MBL\nM84 E ; turn off E motor\n\nG29 P1 ; invalidate MBL and probe print area\nG29 P1 X150 Y0 W100 H20 C ; probe near purge area\nG29 P3.2 ; MBL interpolation\nG29 P3.13 ; MBL extrapolation outside probe area\nG29 A ; activate MBL\n\n; prepare for purge\nM104 S{first_layer_temperature[initial_tool]}\nG0 X249 Y-2.5 Z15 F4800 ; move away and ready for the purge\nM109 S{first_layer_temperature[initial_tool]}\n\nG92 E0\nM569 S0 E ; set spreadcycle mode for extruder\n\nM591 S0 ; disable stuck detection\n\nT[initial_tool]\nG1 E{parking_pos_retraction + extra_loading_move - 15} F1000 ; load to the nozzle\n\n;\n; Extrude purge line\n;\nG92 E0 ; reset extruder position\nG1 E{(filament_type[initial_tool] == \"FLEX\" ? 4 : 2)} F2400 ; deretraction after the initial one before nozzle cleaning\nG0 E5 X235 Z0.2 F500 ; purge\nG0 X145 E36 F500 ; purge\nG0 X135 E4 F500 ; purge\nG0 X125 E4 F650 ; purge\nG0 X122 Z0.05 F8000 ; wipe, move close to the bed\nG0 X119 Z0.2 F8000 ; wipe, move quickly away from the bed\n\nM591 R ; restore stuck detection\n\nG92 E0\nM221 S100 ; set flow to 100%", + "machine_unload_filament_time": "8.9", + "nozzle_diameter": [ + "0.4" + ], + "nozzle_height": "4", + "parking_pos_retraction": "84", + "printer_extruder_id": [ + "1" + ], + "printer_extruder_variant": [ + "Direct Drive Standard" + ], + "printer_model": "Prusa CORE One MMU3", + "printer_notes": "Don't remove the following keywords! These keywords are used in the \"compatible printer\" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_MODEL_COREONEMMU3\nPRINTER_MODEL_MK4\nCOREMMU\nRAMMING_EXTRA\nPG\nNO_TEMPLATES\nThe MK4 marker enables WipeTower2 cold ramming and filament monitoring control for the CORE One MMU3.", + "printer_variant": "0.4", + "single_extruder_multi_material": "1", + "wipe_tower_type": "type2" +} diff --git a/resources/profiles/Prusa/machine/Prusa CORE One MMU3 0.6 nozzle.json b/resources/profiles/Prusa/machine/Prusa CORE One MMU3 0.6 nozzle.json new file mode 100644 index 0000000000..11de2e2eac --- /dev/null +++ b/resources/profiles/Prusa/machine/Prusa CORE One MMU3 0.6 nozzle.json @@ -0,0 +1,19 @@ +{ + "type": "machine", + "name": "Prusa CORE One MMU3 0.6 nozzle", + "inherits": "Prusa CORE One MMU3 0.4 nozzle", + "from": "system", + "setting_id": "rFDxiYXLDZVYHqe8", + "instantiation": "true", + "default_filament_profile": "Prusament PLA @CORE One MMU3", + "default_print_profile": "0.20mm SPEED @COREONE0.6 + MMU3", + "max_layer_height": "0.40", + "min_layer_height": "0.15", + "nozzle_diameter": [ + "0.6" + ], + "printer_model": "Prusa CORE One MMU3", + "printer_variant": "0.6", + "retraction_length": "0.7", + "wipe": "0" +} diff --git a/resources/profiles/Prusa/machine/Prusa CORE One MMU3.json b/resources/profiles/Prusa/machine/Prusa CORE One MMU3.json new file mode 100644 index 0000000000..a0e766e818 --- /dev/null +++ b/resources/profiles/Prusa/machine/Prusa CORE One MMU3.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "Prusa CORE One MMU3", + "bed_model": "coreone_bed.stl", + "bed_texture": "coreone.svg", + "default_materials": "Generic ABS @Prusa CORE One MMU3;Generic ASA @Prusa CORE One MMU3;Generic PETG @Prusa CORE One MMU3;Generic PLA @Prusa CORE One MMU3;Generic PLA Silk @Prusa CORE One MMU3;Generic TPU @Prusa CORE One MMU3", + "family": "Prusa", + "hotend_model": "", + "machine_tech": "FFF", + "model_id": "Prusa_CORE_One_MMU3", + "nozzle_diameter": "0.25;0.3;0.4;0.6" +} diff --git a/resources/profiles/Prusa/machine/Prusa MK3S.json b/resources/profiles/Prusa/machine/Prusa MK3S.json index ad27bb59f6..6ebf5b6651 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": "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" + "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;Prusament PLA @MK3S;Prusament rPLA @MK3S;Prusament PETG @MK3S;Prusament ASA @MK3S;Prusament PC Blend @MK3S;Prusament PVB @MK3S;Prusament PC Blend Carbon Fiber @MK3S;Prusament PA11 Carbon Fiber @MK3S" } diff --git a/resources/profiles/Prusa/machine/Prusa MK4.json b/resources/profiles/Prusa/machine/Prusa MK4.json index a5a01b2f2e..912987092c 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": "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;" + "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;Prusament PLA @MK4;Prusament rPLA @MK4;Prusament PETG @MK4;Prusament ASA @MK4;Prusament PC Blend @MK4;Prusament PVB @MK4;Prusament PC Blend Carbon Fiber @MK4;Prusament PA11 Carbon Fiber @MK4" } diff --git a/resources/profiles/Prusa/machine/Prusa MK4S.json b/resources/profiles/Prusa/machine/Prusa MK4S.json index e3f598023b..ae26c5aa27 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": "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;Generic PLA @Prusa MK4S 0.6;Generic PLA @Prusa MK4S 0.8", + "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;Generic PLA @Prusa MK4S 0.6;Generic PLA @Prusa MK4S 0.8;Prusament PLA @MK4S;Prusament rPLA @MK4S;Prusament PETG @MK4S;Prusament ASA @MK4S;Prusament PC Blend @MK4S;Prusament PVB @MK4S;Prusament PC Blend Carbon Fiber @MK4S;Prusament PA11 Carbon Fiber @MK4S", "family": "Prusa", "hotend_model": "", "machine_tech": "FFF", diff --git a/resources/profiles/Prusa/process/0.05mm DETAIL @COREONE0.25 + MMU3.json b/resources/profiles/Prusa/process/0.05mm DETAIL @COREONE0.25 + MMU3.json new file mode 100644 index 0000000000..123a51ea99 --- /dev/null +++ b/resources/profiles/Prusa/process/0.05mm DETAIL @COREONE0.25 + MMU3.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.05mm DETAIL @COREONE0.25 + MMU3", + "inherits": "0.05mm DETAIL @CORE One 0.25", + "from": "system", + "setting_id": "GZ9p7JXzPU3Widdg", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.25 nozzle" + ], + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[0]}-{filament_type[1]}-{filament_type[2]}-{filament_type[3]}-{filament_type[4]}_COREONE_MMU3_{print_time}.gcode", + "prime_tower_brim_width": "2", + "print_extruder_id": [ + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard" + ], + "wipe_tower_cone_angle": "25", + "wipe_tower_extra_flow": "250%", + "wipe_tower_extra_spacing": "110%", + "compatible_printers_condition": "" +} diff --git a/resources/profiles/Prusa/process/0.07mm DETAIL @COREONE0.25 + MMU3.json b/resources/profiles/Prusa/process/0.07mm DETAIL @COREONE0.25 + MMU3.json new file mode 100644 index 0000000000..97b0973c5c --- /dev/null +++ b/resources/profiles/Prusa/process/0.07mm DETAIL @COREONE0.25 + MMU3.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.07mm DETAIL @COREONE0.25 + MMU3", + "inherits": "0.07mm DETAIL @CORE One 0.25", + "from": "system", + "setting_id": "9ffM9tc7XMSNHnGB", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.25 nozzle" + ], + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[0]}-{filament_type[1]}-{filament_type[2]}-{filament_type[3]}-{filament_type[4]}_COREONE_MMU3_{print_time}.gcode", + "prime_tower_brim_width": "2", + "print_extruder_id": [ + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard" + ], + "wipe_tower_cone_angle": "25", + "wipe_tower_extra_flow": "250%", + "wipe_tower_extra_spacing": "110%", + "compatible_printers_condition": "" +} diff --git a/resources/profiles/Prusa/process/0.10mm FAST DETAIL @COREONE0.4 + MMU3.json b/resources/profiles/Prusa/process/0.10mm FAST DETAIL @COREONE0.4 + MMU3.json new file mode 100644 index 0000000000..2e7b0c7edb --- /dev/null +++ b/resources/profiles/Prusa/process/0.10mm FAST DETAIL @COREONE0.4 + MMU3.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.10mm FAST DETAIL @COREONE0.4 + MMU3", + "inherits": "0.10mm FAST DETAIL @CORE One 0.4", + "from": "system", + "setting_id": "5l28K1bE8lfuaXF1", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.4 nozzle" + ], + "compatible_printers_condition": "", + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[0]}-{filament_type[1]}-{filament_type[2]}-{filament_type[3]}-{filament_type[4]}_COREONE_MMU3_{print_time}.gcode", + "prime_tower_brim_width": "2", + "print_extruder_id": [ + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard" + ], + "wipe_tower_cone_angle": "25", + "wipe_tower_extra_flow": "250%", + "wipe_tower_extra_spacing": "110%" +} diff --git a/resources/profiles/Prusa/process/0.12mm SPEED @COREONE0.25 + MMU3.json b/resources/profiles/Prusa/process/0.12mm SPEED @COREONE0.25 + MMU3.json new file mode 100644 index 0000000000..e2d4ba94ca --- /dev/null +++ b/resources/profiles/Prusa/process/0.12mm SPEED @COREONE0.25 + MMU3.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.12mm SPEED @COREONE0.25 + MMU3", + "inherits": "0.12mm SPEED @CORE One 0.25", + "from": "system", + "setting_id": "YjbMEvZ8ALzK2qHf", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.25 nozzle" + ], + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[0]}-{filament_type[1]}-{filament_type[2]}-{filament_type[3]}-{filament_type[4]}_COREONE_MMU3_{print_time}.gcode", + "prime_tower_brim_width": "2", + "print_extruder_id": [ + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard" + ], + "wipe_tower_cone_angle": "25", + "wipe_tower_extra_flow": "250%", + "wipe_tower_extra_spacing": "110%", + "compatible_printers_condition": "" +} diff --git a/resources/profiles/Prusa/process/0.12mm STRUCTURAL @COREONE0.25 + MMU3.json b/resources/profiles/Prusa/process/0.12mm STRUCTURAL @COREONE0.25 + MMU3.json new file mode 100644 index 0000000000..551f6248f5 --- /dev/null +++ b/resources/profiles/Prusa/process/0.12mm STRUCTURAL @COREONE0.25 + MMU3.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.12mm STRUCTURAL @COREONE0.25 + MMU3", + "inherits": "0.12mm STRUCTURAL @CORE One 0.25", + "from": "system", + "setting_id": "g8Bp93DCAwTo5G0s", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.25 nozzle" + ], + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[0]}-{filament_type[1]}-{filament_type[2]}-{filament_type[3]}-{filament_type[4]}_COREONE_MMU3_{print_time}.gcode", + "prime_tower_brim_width": "2", + "print_extruder_id": [ + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard" + ], + "wipe_tower_cone_angle": "25", + "wipe_tower_extra_flow": "250%", + "wipe_tower_extra_spacing": "110%", + "compatible_printers_condition": "" +} diff --git a/resources/profiles/Prusa/process/0.12mm STRUCTURAL @COREONE0.3 + MMU3.json b/resources/profiles/Prusa/process/0.12mm STRUCTURAL @COREONE0.3 + MMU3.json new file mode 100644 index 0000000000..25efb09730 --- /dev/null +++ b/resources/profiles/Prusa/process/0.12mm STRUCTURAL @COREONE0.3 + MMU3.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.12mm STRUCTURAL @COREONE0.3 + MMU3", + "inherits": "0.12mm STRUCTURAL @CORE One 0.3", + "from": "system", + "setting_id": "XmhM0qI0mXLbBMwv", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.3 nozzle" + ], + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[0]}-{filament_type[1]}-{filament_type[2]}-{filament_type[3]}-{filament_type[4]}_COREONE_MMU3_{print_time}.gcode", + "prime_tower_brim_width": "2", + "print_extruder_id": [ + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard" + ], + "wipe_tower_cone_angle": "25", + "wipe_tower_extra_flow": "250%", + "wipe_tower_extra_spacing": "110%", + "compatible_printers_condition": "" +} diff --git a/resources/profiles/Prusa/process/0.15mm BALANCED @COREONE0.4 + MMU3.json b/resources/profiles/Prusa/process/0.15mm BALANCED @COREONE0.4 + MMU3.json new file mode 100644 index 0000000000..dd86f29945 --- /dev/null +++ b/resources/profiles/Prusa/process/0.15mm BALANCED @COREONE0.4 + MMU3.json @@ -0,0 +1,70 @@ +{ + "type": "process", + "name": "0.15mm BALANCED @COREONE0.4 + MMU3", + "inherits": "0.20mm Standard @MK4", + "from": "system", + "setting_id": "gU24xfFrPejGfV1D", + "instantiation": "true", + "bridge_acceleration": "1500", + "brim_type": "no_brim", + "default_acceleration": "3000", + "elefant_foot_compensation": "0.2", + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[0]}-{filament_type[1]}-{filament_type[2]}-{filament_type[3]}-{filament_type[4]}_COREONE_MMU3_{print_time}.gcode", + "initial_layer_acceleration": "500", + "initial_layer_infill_speed": "100", + "initial_layer_line_width": "0.5", + "inner_wall_line_width": "0.45", + "internal_solid_infill_line_width": "0.45", + "line_width": "0.45", + "outer_wall_line_width": "0.45", + "prime_tower_brim_width": "2", + "print_extruder_id": [ + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard" + ], + "raft_first_layer_expansion": "3", + "resolution": "0", + "seam_gap": "15%", + "sparse_infill_line_width": "0.45", + "sparse_infill_pattern": "grid", + "support_base_pattern_spacing": "2", + "support_bottom_interface_spacing": "0.2", + "support_interface_bottom_layers": "0", + "support_interface_spacing": "0.2", + "support_interface_top_layers": "3", + "support_line_width": "0.4", + "support_speed": "120", + "top_surface_acceleration": "2000", + "top_surface_line_width": "0.42", + "travel_acceleration": "7000", + "travel_speed": "350", + "wall_loops": "2", + "wipe_tower_cone_angle": "25", + "wipe_tower_extra_flow": "250%", + "wipe_tower_extra_spacing": "110%", + "bridge_speed": "45", + "bottom_shell_layers": "4", + "inner_wall_acceleration": "3000", + "inner_wall_speed": "150", + "internal_bridge_speed": "45", + "internal_solid_infill_acceleration": "6000", + "internal_solid_infill_speed": "150", + "layer_height": "0.15", + "outer_wall_acceleration": "2500", + "overhang_2_4_speed": "25", + "overhang_3_4_speed": "50", + "overhang_4_4_speed": "80%", + "small_perimeter_speed": "170", + "sparse_infill_acceleration": "5000", + "sparse_infill_speed": "150", + "support_bottom_z_distance": "0.17", + "support_interface_speed": "50", + "support_threshold_angle": "35", + "support_top_z_distance": "0.17", + "top_shell_layers": "6", + "compatible_printers": [ + "Prusa CORE One MMU3 0.4 nozzle" + ] +} diff --git a/resources/profiles/Prusa/process/0.15mm SPEED @COREONE0.25 + MMU3.json b/resources/profiles/Prusa/process/0.15mm SPEED @COREONE0.25 + MMU3.json new file mode 100644 index 0000000000..287579505b --- /dev/null +++ b/resources/profiles/Prusa/process/0.15mm SPEED @COREONE0.25 + MMU3.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.15mm SPEED @COREONE0.25 + MMU3", + "inherits": "0.15mm SPEED @CORE One 0.25", + "from": "system", + "setting_id": "mYSeGZQ0MykDNtXP", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.25 nozzle" + ], + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[0]}-{filament_type[1]}-{filament_type[2]}-{filament_type[3]}-{filament_type[4]}_COREONE_MMU3_{print_time}.gcode", + "prime_tower_brim_width": "2", + "print_extruder_id": [ + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard" + ], + "wipe_tower_cone_angle": "25", + "wipe_tower_extra_flow": "250%", + "wipe_tower_extra_spacing": "110%", + "compatible_printers_condition": "" +} diff --git a/resources/profiles/Prusa/process/0.15mm SPEED @COREONE0.4 + MMU3.json b/resources/profiles/Prusa/process/0.15mm SPEED @COREONE0.4 + MMU3.json new file mode 100644 index 0000000000..d9b2e4b903 --- /dev/null +++ b/resources/profiles/Prusa/process/0.15mm SPEED @COREONE0.4 + MMU3.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.15mm SPEED @COREONE0.4 + MMU3", + "inherits": "0.15mm SPEED @CORE One 0.4", + "from": "system", + "setting_id": "CdehEFlvnacxhU2H", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.4 nozzle" + ], + "compatible_printers_condition": "", + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[0]}-{filament_type[1]}-{filament_type[2]}-{filament_type[3]}-{filament_type[4]}_COREONE_MMU3_{print_time}.gcode", + "prime_tower_brim_width": "2", + "print_extruder_id": [ + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard" + ], + "wipe_tower_cone_angle": "25", + "wipe_tower_extra_flow": "250%", + "wipe_tower_extra_spacing": "110%" +} diff --git a/resources/profiles/Prusa/process/0.15mm STRUCTURAL @COREONE0.25 + MMU3.json b/resources/profiles/Prusa/process/0.15mm STRUCTURAL @COREONE0.25 + MMU3.json new file mode 100644 index 0000000000..b9082c332c --- /dev/null +++ b/resources/profiles/Prusa/process/0.15mm STRUCTURAL @COREONE0.25 + MMU3.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.15mm STRUCTURAL @COREONE0.25 + MMU3", + "inherits": "0.15mm STRUCTURAL @CORE One 0.25", + "from": "system", + "setting_id": "sUWaBUUy033BXEzk", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.25 nozzle" + ], + "compatible_printers_condition": "", + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[0]}-{filament_type[1]}-{filament_type[2]}-{filament_type[3]}-{filament_type[4]}_COREONE_MMU3_{print_time}.gcode", + "prime_tower_brim_width": "2", + "print_extruder_id": [ + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard" + ], + "wipe_tower_cone_angle": "25", + "wipe_tower_extra_flow": "250%", + "wipe_tower_extra_spacing": "110%" +} diff --git a/resources/profiles/Prusa/process/0.15mm STRUCTURAL @COREONE0.4 + MMU3.json b/resources/profiles/Prusa/process/0.15mm STRUCTURAL @COREONE0.4 + MMU3.json new file mode 100644 index 0000000000..dd1e847ee3 --- /dev/null +++ b/resources/profiles/Prusa/process/0.15mm STRUCTURAL @COREONE0.4 + MMU3.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.15mm STRUCTURAL @COREONE0.4 + MMU3", + "inherits": "0.15mm STRUCTURAL @CORE One 0.4", + "from": "system", + "setting_id": "kM9rtB6iLqcDNZZU", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.4 nozzle" + ], + "compatible_printers_condition": "", + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[0]}-{filament_type[1]}-{filament_type[2]}-{filament_type[3]}-{filament_type[4]}_COREONE_MMU3_{print_time}.gcode", + "prime_tower_brim_width": "2", + "print_extruder_id": [ + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard" + ], + "wipe_tower_cone_angle": "25", + "wipe_tower_extra_flow": "250%", + "wipe_tower_extra_spacing": "110%" +} diff --git a/resources/profiles/Prusa/process/0.15mm STRUCTURAL @COREONE0.6 + MMU3.json b/resources/profiles/Prusa/process/0.15mm STRUCTURAL @COREONE0.6 + MMU3.json new file mode 100644 index 0000000000..6e7adf72c0 --- /dev/null +++ b/resources/profiles/Prusa/process/0.15mm STRUCTURAL @COREONE0.6 + MMU3.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.15mm STRUCTURAL @COREONE0.6 + MMU3", + "inherits": "0.15mm STRUCTURAL @CORE One 0.6", + "from": "system", + "setting_id": "PTOVGYLNah28dKRr", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.6 nozzle" + ], + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[0]}-{filament_type[1]}-{filament_type[2]}-{filament_type[3]}-{filament_type[4]}_COREONE_MMU3_{print_time}.gcode", + "prime_tower_brim_width": "2", + "print_extruder_id": [ + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard" + ], + "wipe_tower_cone_angle": "25", + "wipe_tower_extra_flow": "250%", + "wipe_tower_extra_spacing": "110%", + "compatible_printers_condition": "" +} diff --git a/resources/profiles/Prusa/process/0.16mm SPEED @COREONE0.3 + MMU3.json b/resources/profiles/Prusa/process/0.16mm SPEED @COREONE0.3 + MMU3.json new file mode 100644 index 0000000000..30c6902ee7 --- /dev/null +++ b/resources/profiles/Prusa/process/0.16mm SPEED @COREONE0.3 + MMU3.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.16mm SPEED @COREONE0.3 + MMU3", + "inherits": "0.16mm SPEED @CORE One 0.3", + "from": "system", + "setting_id": "ByXT7JeCV0SWiSnt", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.3 nozzle" + ], + "compatible_printers_condition": "", + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[0]}-{filament_type[1]}-{filament_type[2]}-{filament_type[3]}-{filament_type[4]}_COREONE_MMU3_{print_time}.gcode", + "prime_tower_brim_width": "2", + "print_extruder_id": [ + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard" + ], + "wipe_tower_cone_angle": "25", + "wipe_tower_extra_flow": "250%", + "wipe_tower_extra_spacing": "110%" +} diff --git a/resources/profiles/Prusa/process/0.16mm STRUCTURAL @COREONE0.3 + MMU3.json b/resources/profiles/Prusa/process/0.16mm STRUCTURAL @COREONE0.3 + MMU3.json new file mode 100644 index 0000000000..946d22c3a5 --- /dev/null +++ b/resources/profiles/Prusa/process/0.16mm STRUCTURAL @COREONE0.3 + MMU3.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.16mm STRUCTURAL @COREONE0.3 + MMU3", + "inherits": "0.16mm STRUCTURAL @CORE One 0.3", + "from": "system", + "setting_id": "3XaKemYMM9AMLAIE", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.3 nozzle" + ], + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[0]}-{filament_type[1]}-{filament_type[2]}-{filament_type[3]}-{filament_type[4]}_COREONE_MMU3_{print_time}.gcode", + "prime_tower_brim_width": "2", + "print_extruder_id": [ + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard" + ], + "wipe_tower_cone_angle": "25", + "wipe_tower_extra_flow": "250%", + "wipe_tower_extra_spacing": "110%", + "compatible_printers_condition": "" +} diff --git a/resources/profiles/Prusa/process/0.20mm BALANCED @COREONE0.4 + MMU3.json b/resources/profiles/Prusa/process/0.20mm BALANCED @COREONE0.4 + MMU3.json new file mode 100644 index 0000000000..eba4b17a0e --- /dev/null +++ b/resources/profiles/Prusa/process/0.20mm BALANCED @COREONE0.4 + MMU3.json @@ -0,0 +1,66 @@ +{ + "type": "process", + "name": "0.20mm BALANCED @COREONE0.4 + MMU3", + "inherits": "0.20mm Standard @MK4", + "from": "system", + "setting_id": "ZhSjwXMEOWyeWIDd", + "instantiation": "true", + "bridge_acceleration": "1500", + "brim_type": "no_brim", + "default_acceleration": "3000", + "elefant_foot_compensation": "0.2", + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[0]}-{filament_type[1]}-{filament_type[2]}-{filament_type[3]}-{filament_type[4]}_COREONE_MMU3_{print_time}.gcode", + "initial_layer_acceleration": "500", + "initial_layer_infill_speed": "100", + "initial_layer_line_width": "0.5", + "inner_wall_line_width": "0.45", + "internal_solid_infill_line_width": "0.45", + "line_width": "0.45", + "outer_wall_line_width": "0.45", + "prime_tower_brim_width": "2", + "print_extruder_id": [ + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard" + ], + "raft_first_layer_expansion": "3", + "resolution": "0", + "seam_gap": "15%", + "sparse_infill_line_width": "0.45", + "sparse_infill_pattern": "grid", + "support_base_pattern_spacing": "2", + "support_bottom_interface_spacing": "0.2", + "support_interface_bottom_layers": "0", + "support_interface_spacing": "0.2", + "support_interface_top_layers": "3", + "support_line_width": "0.4", + "support_speed": "120", + "top_surface_acceleration": "2000", + "top_surface_line_width": "0.42", + "travel_acceleration": "7000", + "travel_speed": "350", + "wall_loops": "2", + "wipe_tower_cone_angle": "25", + "wipe_tower_extra_flow": "250%", + "wipe_tower_extra_spacing": "110%", + "bridge_speed": "50", + "inner_wall_acceleration": "3000", + "inner_wall_speed": "150", + "internal_solid_infill_acceleration": "6000", + "internal_solid_infill_speed": "150", + "outer_wall_acceleration": "2500", + "overhang_2_4_speed": "25", + "overhang_3_4_speed": "50", + "overhang_4_4_speed": "80%", + "small_perimeter_speed": "170", + "sparse_infill_acceleration": "5000", + "sparse_infill_speed": "150", + "support_interface_speed": "60", + "support_style": "snug", + "support_threshold_angle": "35", + "top_shell_layers": "5", + "compatible_printers": [ + "Prusa CORE One MMU3 0.4 nozzle" + ] +} diff --git a/resources/profiles/Prusa/process/0.20mm SOLUBLE FULL @COREONE0.4 + MMU3.json b/resources/profiles/Prusa/process/0.20mm SOLUBLE FULL @COREONE0.4 + MMU3.json new file mode 100644 index 0000000000..88860432a2 --- /dev/null +++ b/resources/profiles/Prusa/process/0.20mm SOLUBLE FULL @COREONE0.4 + MMU3.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.20mm SOLUBLE FULL @COREONE0.4 + MMU3", + "inherits": "0.20mm SOLUBLE FULL @CORE One 0.4", + "from": "system", + "setting_id": "F4GvezeeqYGgETx5", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.4 nozzle" + ], + "compatible_printers_condition": "", + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[0]}-{filament_type[1]}-{filament_type[2]}-{filament_type[3]}-{filament_type[4]}_COREONE_MMU3_{print_time}.gcode", + "prime_tower_brim_width": "2", + "print_extruder_id": [ + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard" + ], + "wipe_tower_cone_angle": "25", + "wipe_tower_extra_flow": "250%", + "wipe_tower_extra_spacing": "110%" +} diff --git a/resources/profiles/Prusa/process/0.20mm SOLUBLE INTERFACE @COREONE0.4 + MMU3.json b/resources/profiles/Prusa/process/0.20mm SOLUBLE INTERFACE @COREONE0.4 + MMU3.json new file mode 100644 index 0000000000..c74ace1163 --- /dev/null +++ b/resources/profiles/Prusa/process/0.20mm SOLUBLE INTERFACE @COREONE0.4 + MMU3.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.20mm SOLUBLE INTERFACE @COREONE0.4 + MMU3", + "inherits": "0.20mm SOLUBLE INTERFACE @CORE One 0.4", + "from": "system", + "setting_id": "hrh6ZS8cMrp6Fput", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.4 nozzle" + ], + "compatible_printers_condition": "", + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[0]}-{filament_type[1]}-{filament_type[2]}-{filament_type[3]}-{filament_type[4]}_COREONE_MMU3_{print_time}.gcode", + "prime_tower_brim_width": "2", + "print_extruder_id": [ + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard" + ], + "wipe_tower_cone_angle": "25", + "wipe_tower_extra_flow": "250%", + "wipe_tower_extra_spacing": "110%" +} diff --git a/resources/profiles/Prusa/process/0.20mm SPEED @COREONE0.3 + MMU3.json b/resources/profiles/Prusa/process/0.20mm SPEED @COREONE0.3 + MMU3.json new file mode 100644 index 0000000000..660170520b --- /dev/null +++ b/resources/profiles/Prusa/process/0.20mm SPEED @COREONE0.3 + MMU3.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.20mm SPEED @COREONE0.3 + MMU3", + "inherits": "0.20mm SPEED @CORE One 0.3", + "from": "system", + "setting_id": "a8MnMQB4PuzlCBkv", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.3 nozzle" + ], + "compatible_printers_condition": "", + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[0]}-{filament_type[1]}-{filament_type[2]}-{filament_type[3]}-{filament_type[4]}_COREONE_MMU3_{print_time}.gcode", + "prime_tower_brim_width": "2", + "print_extruder_id": [ + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard" + ], + "wipe_tower_cone_angle": "25", + "wipe_tower_extra_flow": "250%", + "wipe_tower_extra_spacing": "110%" +} diff --git a/resources/profiles/Prusa/process/0.20mm SPEED @COREONE0.4 + MMU3.json b/resources/profiles/Prusa/process/0.20mm SPEED @COREONE0.4 + MMU3.json new file mode 100644 index 0000000000..66ac63af73 --- /dev/null +++ b/resources/profiles/Prusa/process/0.20mm SPEED @COREONE0.4 + MMU3.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.20mm SPEED @COREONE0.4 + MMU3", + "inherits": "0.20mm SPEED @CORE One 0.4", + "from": "system", + "setting_id": "gFegVTUTnp12IurN", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.4 nozzle" + ], + "compatible_printers_condition": "", + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[0]}-{filament_type[1]}-{filament_type[2]}-{filament_type[3]}-{filament_type[4]}_COREONE_MMU3_{print_time}.gcode", + "prime_tower_brim_width": "2", + "print_extruder_id": [ + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard" + ], + "wipe_tower_cone_angle": "25", + "wipe_tower_extra_flow": "250%", + "wipe_tower_extra_spacing": "110%" +} diff --git a/resources/profiles/Prusa/process/0.20mm SPEED @COREONE0.6 + MMU3.json b/resources/profiles/Prusa/process/0.20mm SPEED @COREONE0.6 + MMU3.json new file mode 100644 index 0000000000..fa6fcb0a90 --- /dev/null +++ b/resources/profiles/Prusa/process/0.20mm SPEED @COREONE0.6 + MMU3.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.20mm SPEED @COREONE0.6 + MMU3", + "inherits": "0.20mm SPEED @CORE One 0.6", + "from": "system", + "setting_id": "b5DuLDBbPOrc3QUB", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.6 nozzle" + ], + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[0]}-{filament_type[1]}-{filament_type[2]}-{filament_type[3]}-{filament_type[4]}_COREONE_MMU3_{print_time}.gcode", + "prime_tower_brim_width": "2", + "print_extruder_id": [ + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard" + ], + "wipe_tower_cone_angle": "25", + "wipe_tower_extra_flow": "250%", + "wipe_tower_extra_spacing": "110%", + "compatible_printers_condition": "" +} diff --git a/resources/profiles/Prusa/process/0.20mm STRUCTURAL @COREONE0.3 + MMU3.json b/resources/profiles/Prusa/process/0.20mm STRUCTURAL @COREONE0.3 + MMU3.json new file mode 100644 index 0000000000..d1fe101fb0 --- /dev/null +++ b/resources/profiles/Prusa/process/0.20mm STRUCTURAL @COREONE0.3 + MMU3.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.20mm STRUCTURAL @COREONE0.3 + MMU3", + "inherits": "0.20mm STRUCTURAL @CORE One 0.3", + "from": "system", + "setting_id": "3GXAe0t8hNMloSsA", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.3 nozzle" + ], + "compatible_printers_condition": "", + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[0]}-{filament_type[1]}-{filament_type[2]}-{filament_type[3]}-{filament_type[4]}_COREONE_MMU3_{print_time}.gcode", + "prime_tower_brim_width": "2", + "print_extruder_id": [ + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard" + ], + "wipe_tower_cone_angle": "25", + "wipe_tower_extra_flow": "250%", + "wipe_tower_extra_spacing": "110%" +} diff --git a/resources/profiles/Prusa/process/0.20mm STRUCTURAL @COREONE0.4 + MMU3.json b/resources/profiles/Prusa/process/0.20mm STRUCTURAL @COREONE0.4 + MMU3.json new file mode 100644 index 0000000000..cdb41c0ac6 --- /dev/null +++ b/resources/profiles/Prusa/process/0.20mm STRUCTURAL @COREONE0.4 + MMU3.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.20mm STRUCTURAL @COREONE0.4 + MMU3", + "inherits": "0.20mm STRUCTURAL @CORE One 0.4", + "from": "system", + "setting_id": "elSJkPZlFi4sWveY", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.4 nozzle" + ], + "compatible_printers_condition": "", + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[0]}-{filament_type[1]}-{filament_type[2]}-{filament_type[3]}-{filament_type[4]}_COREONE_MMU3_{print_time}.gcode", + "prime_tower_brim_width": "2", + "print_extruder_id": [ + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard" + ], + "wipe_tower_cone_angle": "25", + "wipe_tower_extra_flow": "250%", + "wipe_tower_extra_spacing": "110%" +} diff --git a/resources/profiles/Prusa/process/0.20mm STRUCTURAL @COREONE0.6 + MMU3.json b/resources/profiles/Prusa/process/0.20mm STRUCTURAL @COREONE0.6 + MMU3.json new file mode 100644 index 0000000000..1a5cad323a --- /dev/null +++ b/resources/profiles/Prusa/process/0.20mm STRUCTURAL @COREONE0.6 + MMU3.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.20mm STRUCTURAL @COREONE0.6 + MMU3", + "inherits": "0.20mm STRUCTURAL @CORE One 0.6", + "from": "system", + "setting_id": "uvQ25wBWKEFdqMVl", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.6 nozzle" + ], + "compatible_printers_condition": "", + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[0]}-{filament_type[1]}-{filament_type[2]}-{filament_type[3]}-{filament_type[4]}_COREONE_MMU3_{print_time}.gcode", + "prime_tower_brim_width": "2", + "print_extruder_id": [ + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard" + ], + "wipe_tower_cone_angle": "25", + "wipe_tower_extra_flow": "250%", + "wipe_tower_extra_spacing": "110%" +} diff --git a/resources/profiles/Prusa/process/0.25mm BALANCED @COREONE0.4 + MMU3.json b/resources/profiles/Prusa/process/0.25mm BALANCED @COREONE0.4 + MMU3.json new file mode 100644 index 0000000000..4a3343351a --- /dev/null +++ b/resources/profiles/Prusa/process/0.25mm BALANCED @COREONE0.4 + MMU3.json @@ -0,0 +1,68 @@ +{ + "type": "process", + "name": "0.25mm BALANCED @COREONE0.4 + MMU3", + "inherits": "0.20mm Standard @MK4", + "from": "system", + "setting_id": "cEccdq6KND9xa5HS", + "instantiation": "true", + "bridge_acceleration": "1500", + "brim_type": "no_brim", + "default_acceleration": "3000", + "elefant_foot_compensation": "0.2", + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[0]}-{filament_type[1]}-{filament_type[2]}-{filament_type[3]}-{filament_type[4]}_COREONE_MMU3_{print_time}.gcode", + "initial_layer_acceleration": "500", + "initial_layer_infill_speed": "100", + "initial_layer_line_width": "0.5", + "inner_wall_line_width": "0.45", + "internal_solid_infill_line_width": "0.45", + "line_width": "0.45", + "outer_wall_line_width": "0.45", + "prime_tower_brim_width": "2", + "print_extruder_id": [ + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard" + ], + "raft_first_layer_expansion": "3", + "resolution": "0", + "seam_gap": "15%", + "sparse_infill_line_width": "0.45", + "sparse_infill_pattern": "grid", + "support_base_pattern_spacing": "2", + "support_bottom_interface_spacing": "0.2", + "support_interface_bottom_layers": "0", + "support_interface_spacing": "0.2", + "support_interface_top_layers": "3", + "support_line_width": "0.4", + "support_speed": "120", + "top_surface_acceleration": "2000", + "top_surface_line_width": "0.42", + "travel_acceleration": "7000", + "travel_speed": "350", + "wall_loops": "2", + "wipe_tower_cone_angle": "25", + "wipe_tower_extra_flow": "250%", + "wipe_tower_extra_spacing": "110%", + "bridge_speed": "50", + "inner_wall_acceleration": "3000", + "inner_wall_speed": "150", + "internal_solid_infill_acceleration": "5000", + "internal_solid_infill_speed": "140", + "layer_height": "0.25", + "outer_wall_acceleration": "2500", + "overhang_2_4_speed": "15", + "overhang_3_4_speed": "25", + "overhang_4_4_speed": "70%", + "small_perimeter_speed": "150", + "sparse_infill_acceleration": "5000", + "sparse_infill_speed": "150", + "support_base_pattern": "rectilinear", + "support_bottom_z_distance": "0.25", + "support_style": "snug", + "support_threshold_angle": "35", + "support_top_z_distance": "0.25", + "compatible_printers": [ + "Prusa CORE One MMU3 0.4 nozzle" + ] +} diff --git a/resources/profiles/Prusa/process/0.25mm SPEED @COREONE0.4 + MMU3.json b/resources/profiles/Prusa/process/0.25mm SPEED @COREONE0.4 + MMU3.json new file mode 100644 index 0000000000..869de56781 --- /dev/null +++ b/resources/profiles/Prusa/process/0.25mm SPEED @COREONE0.4 + MMU3.json @@ -0,0 +1,65 @@ +{ + "type": "process", + "name": "0.25mm SPEED @COREONE0.4 + MMU3", + "inherits": "0.20mm Standard @MK4", + "from": "system", + "setting_id": "oVLlJtwPINArAb0Y", + "instantiation": "true", + "bridge_acceleration": "1500", + "brim_type": "no_brim", + "default_acceleration": "3000", + "elefant_foot_compensation": "0.2", + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[0]}-{filament_type[1]}-{filament_type[2]}-{filament_type[3]}-{filament_type[4]}_COREONE_MMU3_{print_time}.gcode", + "initial_layer_acceleration": "500", + "initial_layer_infill_speed": "100", + "initial_layer_line_width": "0.5", + "inner_wall_line_width": "0.45", + "internal_solid_infill_line_width": "0.45", + "line_width": "0.45", + "outer_wall_line_width": "0.45", + "prime_tower_brim_width": "2", + "print_extruder_id": [ + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard" + ], + "raft_first_layer_expansion": "3", + "resolution": "0", + "seam_gap": "15%", + "sparse_infill_line_width": "0.45", + "sparse_infill_pattern": "grid", + "support_base_pattern_spacing": "2", + "support_bottom_interface_spacing": "0.2", + "support_interface_bottom_layers": "0", + "support_interface_spacing": "0.2", + "support_interface_top_layers": "3", + "support_line_width": "0.4", + "support_speed": "120", + "top_surface_acceleration": "2000", + "top_surface_line_width": "0.42", + "travel_acceleration": "7000", + "travel_speed": "350", + "wall_loops": "2", + "wipe_tower_cone_angle": "25", + "wipe_tower_extra_flow": "250%", + "wipe_tower_extra_spacing": "110%", + "bridge_speed": "50", + "inner_wall_acceleration": "6000", + "internal_solid_infill_acceleration": "5000", + "layer_height": "0.25", + "overhang_2_4_speed": "15", + "overhang_3_4_speed": "25", + "overhang_4_4_speed": "70%", + "small_perimeter_speed": "170", + "sparse_infill_acceleration": "7000", + "support_base_pattern": "rectilinear", + "support_bottom_z_distance": "0.25", + "support_interface_speed": "60", + "support_style": "snug", + "support_threshold_angle": "35", + "support_top_z_distance": "0.25", + "compatible_printers": [ + "Prusa CORE One MMU3 0.4 nozzle" + ] +} diff --git a/resources/profiles/Prusa/process/0.25mm SPEED @COREONE0.6 + MMU3.json b/resources/profiles/Prusa/process/0.25mm SPEED @COREONE0.6 + MMU3.json new file mode 100644 index 0000000000..ebfaa5bad5 --- /dev/null +++ b/resources/profiles/Prusa/process/0.25mm SPEED @COREONE0.6 + MMU3.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.25mm SPEED @COREONE0.6 + MMU3", + "inherits": "0.25mm SPEED @CORE One 0.6", + "from": "system", + "setting_id": "CRAV58WCDIn2bZdK", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.6 nozzle" + ], + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[0]}-{filament_type[1]}-{filament_type[2]}-{filament_type[3]}-{filament_type[4]}_COREONE_MMU3_{print_time}.gcode", + "prime_tower_brim_width": "2", + "print_extruder_id": [ + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard" + ], + "wipe_tower_cone_angle": "25", + "wipe_tower_extra_flow": "250%", + "wipe_tower_extra_spacing": "110%", + "compatible_printers_condition": "" +} diff --git a/resources/profiles/Prusa/process/0.25mm STRUCTURAL @COREONE0.4 + MMU3.json b/resources/profiles/Prusa/process/0.25mm STRUCTURAL @COREONE0.4 + MMU3.json new file mode 100644 index 0000000000..87aa0f0c52 --- /dev/null +++ b/resources/profiles/Prusa/process/0.25mm STRUCTURAL @COREONE0.4 + MMU3.json @@ -0,0 +1,72 @@ +{ + "type": "process", + "name": "0.25mm STRUCTURAL @COREONE0.4 + MMU3", + "inherits": "0.20mm Standard @MK4", + "from": "system", + "setting_id": "lBGry26X4a9IihAD", + "instantiation": "true", + "bridge_acceleration": "1500", + "brim_type": "no_brim", + "default_acceleration": "3000", + "elefant_foot_compensation": "0.2", + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[0]}-{filament_type[1]}-{filament_type[2]}-{filament_type[3]}-{filament_type[4]}_COREONE_MMU3_{print_time}.gcode", + "initial_layer_acceleration": "500", + "initial_layer_infill_speed": "100", + "initial_layer_line_width": "0.5", + "inner_wall_line_width": "0.45", + "internal_solid_infill_line_width": "0.45", + "line_width": "0.45", + "outer_wall_line_width": "0.45", + "prime_tower_brim_width": "2", + "print_extruder_id": [ + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard" + ], + "raft_first_layer_expansion": "3", + "resolution": "0", + "seam_gap": "15%", + "sparse_infill_line_width": "0.45", + "sparse_infill_pattern": "grid", + "support_base_pattern_spacing": "2", + "support_bottom_interface_spacing": "0.2", + "support_interface_bottom_layers": "0", + "support_interface_spacing": "0.2", + "support_interface_top_layers": "3", + "support_line_width": "0.4", + "support_speed": "120", + "top_surface_acceleration": "2000", + "top_surface_line_width": "0.42", + "travel_acceleration": "7000", + "travel_speed": "350", + "wall_loops": "2", + "wipe_tower_cone_angle": "25", + "wipe_tower_extra_flow": "250%", + "wipe_tower_extra_spacing": "110%", + "bridge_speed": "50", + "gap_infill_speed": "60", + "inner_wall_acceleration": "2500", + "inner_wall_speed": "70", + "internal_solid_infill_acceleration": "4000", + "internal_solid_infill_speed": "140", + "layer_height": "0.25", + "outer_wall_acceleration": "1500", + "outer_wall_speed": "50", + "overhang_1_4_speed": "50%", + "overhang_2_4_speed": "15", + "overhang_3_4_speed": "45", + "overhang_4_4_speed": "90%", + "small_perimeter_speed": "50", + "sparse_infill_acceleration": "6000", + "sparse_infill_speed": "120", + "support_base_pattern": "rectilinear", + "support_bottom_z_distance": "0.25", + "support_style": "snug", + "support_threshold_angle": "40", + "support_top_z_distance": "0.25", + "top_surface_speed": "80", + "compatible_printers": [ + "Prusa CORE One MMU3 0.4 nozzle" + ] +} diff --git a/resources/profiles/Prusa/process/0.25mm STRUCTURAL @COREONE0.6 + MMU3.json b/resources/profiles/Prusa/process/0.25mm STRUCTURAL @COREONE0.6 + MMU3.json new file mode 100644 index 0000000000..3ade06d990 --- /dev/null +++ b/resources/profiles/Prusa/process/0.25mm STRUCTURAL @COREONE0.6 + MMU3.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.25mm STRUCTURAL @COREONE0.6 + MMU3", + "inherits": "0.25mm STRUCTURAL @CORE One 0.6", + "from": "system", + "setting_id": "95m4AA4YRwcBt63r", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.6 nozzle" + ], + "compatible_printers_condition": "", + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[0]}-{filament_type[1]}-{filament_type[2]}-{filament_type[3]}-{filament_type[4]}_COREONE_MMU3_{print_time}.gcode", + "prime_tower_brim_width": "2", + "print_extruder_id": [ + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard" + ], + "wipe_tower_cone_angle": "25", + "wipe_tower_extra_flow": "250%", + "wipe_tower_extra_spacing": "110%" +} diff --git a/resources/profiles/Prusa/process/0.32mm SPEED @COREONE0.6 + MMU3.json b/resources/profiles/Prusa/process/0.32mm SPEED @COREONE0.6 + MMU3.json new file mode 100644 index 0000000000..1f39814702 --- /dev/null +++ b/resources/profiles/Prusa/process/0.32mm SPEED @COREONE0.6 + MMU3.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.32mm SPEED @COREONE0.6 + MMU3", + "inherits": "0.32mm SPEED @CORE One 0.6", + "from": "system", + "setting_id": "nqrmLvULVOKW9bSm", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.6 nozzle" + ], + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[0]}-{filament_type[1]}-{filament_type[2]}-{filament_type[3]}-{filament_type[4]}_COREONE_MMU3_{print_time}.gcode", + "prime_tower_brim_width": "2", + "print_extruder_id": [ + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard" + ], + "wipe_tower_cone_angle": "25", + "wipe_tower_extra_flow": "250%", + "wipe_tower_extra_spacing": "110%", + "compatible_printers_condition": "" +} diff --git a/resources/profiles/Prusa/process/0.32mm STRUCTURAL @COREONE0.6 + MMU3.json b/resources/profiles/Prusa/process/0.32mm STRUCTURAL @COREONE0.6 + MMU3.json new file mode 100644 index 0000000000..8d69f5c4bc --- /dev/null +++ b/resources/profiles/Prusa/process/0.32mm STRUCTURAL @COREONE0.6 + MMU3.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.32mm STRUCTURAL @COREONE0.6 + MMU3", + "inherits": "0.32mm STRUCTURAL @CORE One 0.6", + "from": "system", + "setting_id": "rYhCYIq1vvY40IYf", + "instantiation": "true", + "compatible_printers": [ + "Prusa CORE One MMU3 0.6 nozzle" + ], + "compatible_printers_condition": "", + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[0]}-{filament_type[1]}-{filament_type[2]}-{filament_type[3]}-{filament_type[4]}_COREONE_MMU3_{print_time}.gcode", + "prime_tower_brim_width": "2", + "print_extruder_id": [ + "1" + ], + "print_extruder_variant": [ + "Direct Drive Standard" + ], + "wipe_tower_cone_angle": "25", + "wipe_tower_extra_flow": "250%", + "wipe_tower_extra_spacing": "110%" +} diff --git a/resources/profiles/Qidi.json b/resources/profiles/Qidi.json index 25ffa10171..4ccb243fe3 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.15", "force_update": "0", "description": "Qidi configurations", "machine_model_list": [ diff --git a/resources/profiles/Qidi/Qidi X-Plus 5_cover.png b/resources/profiles/Qidi/Qidi X-Plus 5_cover.png index 06f5c5858d..632a2ce841 100644 Binary files a/resources/profiles/Qidi/Qidi X-Plus 5_cover.png and b/resources/profiles/Qidi/Qidi X-Plus 5_cover.png differ diff --git a/resources/profiles/Qidi/qidi_xplus5_buildplate_model.stl b/resources/profiles/Qidi/qidi_xplus5_buildplate_model.stl index 5e2d7ca485..efc28709cb 100644 Binary files a/resources/profiles/Qidi/qidi_xplus5_buildplate_model.stl and b/resources/profiles/Qidi/qidi_xplus5_buildplate_model.stl differ diff --git a/resources/profiles/Qidi/qidi_xplus5_buildplate_texture.svg b/resources/profiles/Qidi/qidi_xplus5_buildplate_texture.svg index 72a081620f..1edb2c3900 100644 --- a/resources/profiles/Qidi/qidi_xplus5_buildplate_texture.svg +++ b/resources/profiles/Qidi/qidi_xplus5_buildplate_texture.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/RH3D.json b/resources/profiles/RH3D.json index dbf9500ca0..3e177c5efd 100644 --- a/resources/profiles/RH3D.json +++ b/resources/profiles/RH3D.json @@ -1,12 +1,16 @@ { "name": "RH3D", - "version": "02.04.00.03", + "version": "02.04.00.04", "force_update": "0", "description": "RH3D - printer profiles", "machine_model_list": [ { "name": "E3NG v1.2S", "sub_path": "machine/E3NG v1.2S.json" + }, + { + "name": "VIRTU E3", + "sub_path": "machine/VIRTU E3.json" } ], "machine_list": [ @@ -18,6 +22,10 @@ "name": "fdm_common_E3NG v1.2S", "sub_path": "machine/fdm_common_E3NG v1.2S.json" }, + { + "name": "fdm_common_VIRTU E3", + "sub_path": "machine/fdm_common_VIRTU E3.json" + }, { "name": "E3NG v1.2S - 0.2 nozzle", "sub_path": "machine/E3NG v1.2S - 0.2 nozzle.json" @@ -37,6 +45,26 @@ { "name": "E3NG v1.2S - 0.6 nozzle", "sub_path": "machine/E3NG v1.2S - 0.6 nozzle.json" + }, + { + "name": "VIRTU E3 - 0.2 nozzle", + "sub_path": "machine/VIRTU E3 - 0.2 nozzle.json" + }, + { + "name": "VIRTU E3 - 0.3 nozzle", + "sub_path": "machine/VIRTU E3 - 0.3 nozzle.json" + }, + { + "name": "VIRTU E3 - 0.4 nozzle", + "sub_path": "machine/VIRTU E3 - 0.4 nozzle.json" + }, + { + "name": "VIRTU E3 - 0.5 nozzle", + "sub_path": "machine/VIRTU E3 - 0.5 nozzle.json" + }, + { + "name": "VIRTU E3 - 0.6 nozzle", + "sub_path": "machine/VIRTU E3 - 0.6 nozzle.json" } ], "process_list": [ @@ -45,8 +73,92 @@ "sub_path": "process/fdm_process_common.json" }, { - "name": "process_common_E3NG v1.2S", - "sub_path": "process/process_common_E3NG v1.2S.json" + "name": "process_Fast_E3NG v1.2S", + "sub_path": "process/process_Fast_E3NG v1.2S.json" + }, + { + "name": "process_Fast_VIRTU E3", + "sub_path": "process/process_Fast_VIRTU E3.json" + }, + { + "name": "process_Slow_E3NG v1.2S", + "sub_path": "process/process_Slow_E3NG v1.2S.json" + }, + { + "name": "process_Slow_VIRTU E3", + "sub_path": "process/process_Slow_VIRTU E3.json" + }, + { + "name": "process_Standard_E3NG v1.2S", + "sub_path": "process/process_Standard_E3NG v1.2S.json" + }, + { + "name": "process_Standard_VIRTU E3", + "sub_path": "process/process_Standard_VIRTU E3.json" + }, + { + "name": "0.10mm Fast @E3NG v1.2S", + "sub_path": "process/0.10mm Fast @E3NG v1.2S.json" + }, + { + "name": "0.15mm Fast @E3NG v1.2S", + "sub_path": "process/0.15mm Fast @E3NG v1.2S.json" + }, + { + "name": "0.20mm Fast @E3NG v1.2S", + "sub_path": "process/0.20mm Fast @E3NG v1.2S.json" + }, + { + "name": "0.25mm Fast @E3NG v1.2S", + "sub_path": "process/0.25mm Fast @E3NG v1.2S.json" + }, + { + "name": "0.10mm Fast @VIRTU E3", + "sub_path": "process/0.10mm Fast @VIRTU E3.json" + }, + { + "name": "0.15mm Fast @VIRTU E3", + "sub_path": "process/0.15mm Fast @VIRTU E3.json" + }, + { + "name": "0.20mm Fast @VIRTU E3", + "sub_path": "process/0.20mm Fast @VIRTU E3.json" + }, + { + "name": "0.25mm Fast @VIRTU E3", + "sub_path": "process/0.25mm Fast @VIRTU E3.json" + }, + { + "name": "0.10mm Slow @E3NG v1.2S", + "sub_path": "process/0.10mm Slow @E3NG v1.2S.json" + }, + { + "name": "0.15mm Slow @E3NG v1.2S", + "sub_path": "process/0.15mm Slow @E3NG v1.2S.json" + }, + { + "name": "0.20mm Slow @E3NG v1.2S", + "sub_path": "process/0.20mm Slow @E3NG v1.2S.json" + }, + { + "name": "0.25mm Slow @E3NG v1.2S", + "sub_path": "process/0.25mm Slow @E3NG v1.2S.json" + }, + { + "name": "0.10mm Slow @VIRTU E3", + "sub_path": "process/0.10mm Slow @VIRTU E3.json" + }, + { + "name": "0.15mm Slow @VIRTU E3", + "sub_path": "process/0.15mm Slow @VIRTU E3.json" + }, + { + "name": "0.20mm Slow @VIRTU E3", + "sub_path": "process/0.20mm Slow @VIRTU E3.json" + }, + { + "name": "0.25mm Slow @VIRTU E3", + "sub_path": "process/0.25mm Slow @VIRTU E3.json" }, { "name": "0.10mm Standard @E3NG v1.2S", @@ -56,25 +168,29 @@ "name": "0.15mm Standard @E3NG v1.2S", "sub_path": "process/0.15mm Standard @E3NG v1.2S.json" }, - { - "name": "0.20mm Fast @E3NG v1.2S", - "sub_path": "process/0.20mm Fast @E3NG v1.2S.json" - }, - { - "name": "0.20mm Slow @E3NG v1.2S", - "sub_path": "process/0.20mm Slow @E3NG v1.2S.json" - }, { "name": "0.20mm Standard @E3NG v1.2S", "sub_path": "process/0.20mm Standard @E3NG v1.2S.json" }, - { - "name": "0.25mm Fast @E3NG v1.2S", - "sub_path": "process/0.25mm Fast @E3NG v1.2S.json" - }, { "name": "0.25mm Standard @E3NG v1.2S", "sub_path": "process/0.25mm Standard @E3NG v1.2S.json" + }, + { + "name": "0.10mm Standard @VIRTU E3", + "sub_path": "process/0.10mm Standard @VIRTU E3.json" + }, + { + "name": "0.15mm Standard @VIRTU E3", + "sub_path": "process/0.15mm Standard @VIRTU E3.json" + }, + { + "name": "0.20mm Standard @VIRTU E3", + "sub_path": "process/0.20mm Standard @VIRTU E3.json" + }, + { + "name": "0.25mm Standard @VIRTU E3", + "sub_path": "process/0.25mm Standard @VIRTU E3.json" } ], "filament_list": [ @@ -110,25 +226,49 @@ "name": "Generic ABS @E3NG v1.2S", "sub_path": "filament/Generic ABS @E3NG v1.2S.json" }, + { + "name": "Generic ABS @VIRTU E3", + "sub_path": "filament/Generic ABS @VIRTU E3.json" + }, { "name": "Generic ASA @E3NG v1.2S", "sub_path": "filament/Generic ASA @E3NG v1.2S.json" }, + { + "name": "Generic ASA @VIRTU E3", + "sub_path": "filament/Generic ASA @VIRTU E3.json" + }, { "name": "Generic PCCF @E3NG v1.2S", "sub_path": "filament/Generic PCCF @E3NG v1.2S.json" }, + { + "name": "Generic PCCF @VIRTU E3", + "sub_path": "filament/Generic PCCF @VIRTU E3.json" + }, { "name": "Generic PETG @E3NG v1.2S", "sub_path": "filament/Generic PETG @E3NG v1.2S.json" }, + { + "name": "Generic PETG @VIRTU E3", + "sub_path": "filament/Generic PETG @VIRTU E3.json" + }, { "name": "Generic PLA @E3NG v1.2S", "sub_path": "filament/Generic PLA @E3NG v1.2S.json" }, + { + "name": "Generic PLA @VIRTU E3", + "sub_path": "filament/Generic PLA @VIRTU E3.json" + }, { "name": "Generic TPU @E3NG v1.2S", "sub_path": "filament/Generic TPU @E3NG v1.2S.json" + }, + { + "name": "Generic TPU @VIRTU E3", + "sub_path": "filament/Generic TPU @VIRTU E3.json" } ] } diff --git a/resources/profiles/RH3D/E3NG v1.2S_cover.png b/resources/profiles/RH3D/E3NG v1.2S_cover.png index 03bb5a9e42..f70e2ed35f 100644 Binary files a/resources/profiles/RH3D/E3NG v1.2S_cover.png and b/resources/profiles/RH3D/E3NG v1.2S_cover.png differ diff --git a/resources/profiles/RH3D/E3NG-bed-texture.svg b/resources/profiles/RH3D/E3NG-bed-texture.svg index 2cc13e29ad..93e944d534 100644 --- a/resources/profiles/RH3D/E3NG-bed-texture.svg +++ b/resources/profiles/RH3D/E3NG-bed-texture.svg @@ -1 +1,443 @@ - \ No newline at end of file + + diff --git a/resources/profiles/RH3D/VIRTU E3_cover.png b/resources/profiles/RH3D/VIRTU E3_cover.png new file mode 100644 index 0000000000..085b853cc0 Binary files /dev/null and b/resources/profiles/RH3D/VIRTU E3_cover.png differ diff --git a/resources/profiles/RH3D/VIRTU-bed-texture.svg b/resources/profiles/RH3D/VIRTU-bed-texture.svg new file mode 100644 index 0000000000..802310f8d5 --- /dev/null +++ b/resources/profiles/RH3D/VIRTU-bed-texture.svg @@ -0,0 +1,460 @@ + + diff --git a/resources/profiles/RH3D/VIRTU-bed.stl b/resources/profiles/RH3D/VIRTU-bed.stl new file mode 100644 index 0000000000..c26e99e419 Binary files /dev/null and b/resources/profiles/RH3D/VIRTU-bed.stl differ diff --git a/resources/profiles/RH3D/filament/Generic ABS @VIRTU E3.json b/resources/profiles/RH3D/filament/Generic ABS @VIRTU E3.json new file mode 100644 index 0000000000..be6f94b304 --- /dev/null +++ b/resources/profiles/RH3D/filament/Generic ABS @VIRTU E3.json @@ -0,0 +1,16 @@ +{ + "type": "filament", + "name": "Generic ABS @VIRTU E3", + "inherits": "fdm_filament_abs", + "from": "system", + "setting_id": "AULhQhVApTASqF2p", + "filament_id": "OFY9muEs", + "instantiation": "true", + "compatible_printers": [ + "VIRTU E3 - 0.2 nozzle", + "VIRTU E3 - 0.3 nozzle", + "VIRTU E3 - 0.4 nozzle", + "VIRTU E3 - 0.5 nozzle", + "VIRTU E3 - 0.6 nozzle" + ] +} diff --git a/resources/profiles/RH3D/filament/Generic ASA @VIRTU E3.json b/resources/profiles/RH3D/filament/Generic ASA @VIRTU E3.json new file mode 100644 index 0000000000..c2626f57c6 --- /dev/null +++ b/resources/profiles/RH3D/filament/Generic ASA @VIRTU E3.json @@ -0,0 +1,16 @@ +{ + "type": "filament", + "name": "Generic ASA @VIRTU E3", + "inherits": "fdm_filament_asa", + "from": "system", + "setting_id": "yJa8PC5f8c4uYgny", + "filament_id": "OFLPAxz3", + "instantiation": "true", + "compatible_printers": [ + "VIRTU E3 - 0.2 nozzle", + "VIRTU E3 - 0.3 nozzle", + "VIRTU E3 - 0.4 nozzle", + "VIRTU E3 - 0.5 nozzle", + "VIRTU E3 - 0.6 nozzle" + ] +} diff --git a/resources/profiles/RH3D/filament/Generic PCCF @VIRTU E3.json b/resources/profiles/RH3D/filament/Generic PCCF @VIRTU E3.json new file mode 100644 index 0000000000..c8a7f3f800 --- /dev/null +++ b/resources/profiles/RH3D/filament/Generic PCCF @VIRTU E3.json @@ -0,0 +1,13 @@ +{ + "type": "filament", + "name": "Generic PCCF @VIRTU E3", + "inherits": "fdm_filament_pccf", + "from": "system", + "setting_id": "5byL7KQPKyybDAgQ", + "filament_id": "OFC5f4Ay", + "instantiation": "true", + "compatible_printers": [ + "VIRTU E3 - 0.5 nozzle", + "VIRTU E3 - 0.6 nozzle" + ] +} diff --git a/resources/profiles/RH3D/filament/Generic PETG @VIRTU E3.json b/resources/profiles/RH3D/filament/Generic PETG @VIRTU E3.json new file mode 100644 index 0000000000..2e39f9e1d9 --- /dev/null +++ b/resources/profiles/RH3D/filament/Generic PETG @VIRTU E3.json @@ -0,0 +1,16 @@ +{ + "type": "filament", + "name": "Generic PETG @VIRTU E3", + "inherits": "fdm_filament_petg", + "from": "system", + "setting_id": "OAN1Ozk75r0ODvVw", + "filament_id": "OFYPdQJh", + "instantiation": "true", + "compatible_printers": [ + "VIRTU E3 - 0.2 nozzle", + "VIRTU E3 - 0.3 nozzle", + "VIRTU E3 - 0.4 nozzle", + "VIRTU E3 - 0.5 nozzle", + "VIRTU E3 - 0.6 nozzle" + ] +} diff --git a/resources/profiles/RH3D/filament/Generic PLA @VIRTU E3.json b/resources/profiles/RH3D/filament/Generic PLA @VIRTU E3.json new file mode 100644 index 0000000000..394a92f0c8 --- /dev/null +++ b/resources/profiles/RH3D/filament/Generic PLA @VIRTU E3.json @@ -0,0 +1,16 @@ +{ + "type": "filament", + "name": "Generic PLA @VIRTU E3", + "inherits": "fdm_filament_pla", + "from": "system", + "setting_id": "DgSFTqNWfJEp0w9f", + "filament_id": "OFDSrzZ8", + "instantiation": "true", + "compatible_printers": [ + "VIRTU E3 - 0.2 nozzle", + "VIRTU E3 - 0.3 nozzle", + "VIRTU E3 - 0.4 nozzle", + "VIRTU E3 - 0.5 nozzle", + "VIRTU E3 - 0.6 nozzle" + ] +} diff --git a/resources/profiles/RH3D/filament/Generic TPU @VIRTU E3.json b/resources/profiles/RH3D/filament/Generic TPU @VIRTU E3.json new file mode 100644 index 0000000000..ff816313da --- /dev/null +++ b/resources/profiles/RH3D/filament/Generic TPU @VIRTU E3.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "Generic TPU @VIRTU E3", + "inherits": "fdm_filament_tpu", + "from": "system", + "setting_id": "ifG0f5hgJ7L9zw34", + "filament_id": "OFgbpcy9", + "instantiation": "true", + "compatible_printers": [ + "VIRTU E3 - 0.4 nozzle", + "VIRTU E3 - 0.5 nozzle", + "VIRTU E3 - 0.6 nozzle" + ] +} diff --git a/resources/profiles/RH3D/filament/fdm_filament_abs.json b/resources/profiles/RH3D/filament/fdm_filament_abs.json index f4ab005733..2aab3d25ba 100644 --- a/resources/profiles/RH3D/filament/fdm_filament_abs.json +++ b/resources/profiles/RH3D/filament/fdm_filament_abs.json @@ -26,10 +26,10 @@ "55" ], "fan_cooling_layer_time": [ - "10" + "12" ], "filament_max_volumetric_speed": [ - "32" + "24" ], "filament_type": [ "ABS" @@ -75,9 +75,9 @@ "275" ], "slow_down_min_speed": [ - "10" + "20" ], "slow_down_layer_time": [ - "2" + "4" ] } diff --git a/resources/profiles/RH3D/filament/fdm_filament_asa.json b/resources/profiles/RH3D/filament/fdm_filament_asa.json index ac03beef13..cbf4f5dc36 100644 --- a/resources/profiles/RH3D/filament/fdm_filament_asa.json +++ b/resources/profiles/RH3D/filament/fdm_filament_asa.json @@ -26,10 +26,10 @@ "55" ], "fan_cooling_layer_time": [ - "10" + "12" ], "filament_max_volumetric_speed": [ - "32" + "24" ], "filament_type": [ "ASA" @@ -54,7 +54,7 @@ "50" ], "fan_min_speed": [ - "10" + "15" ], "overhang_fan_threshold": [ "25%" @@ -75,9 +75,9 @@ "275" ], "slow_down_min_speed": [ - "10" + "20" ], "slow_down_layer_time": [ - "2" + "4" ] } diff --git a/resources/profiles/RH3D/filament/fdm_filament_common.json b/resources/profiles/RH3D/filament/fdm_filament_common.json index 576ae24a48..fe143ce05b 100644 --- a/resources/profiles/RH3D/filament/fdm_filament_common.json +++ b/resources/profiles/RH3D/filament/fdm_filament_common.json @@ -22,7 +22,7 @@ "60" ], "overhang_fan_threshold": [ - "95%" + "25%" ], "overhang_fan_speed": [ "100" @@ -40,10 +40,10 @@ "1" ], "reduce_fan_stop_start_freq": [ - "0" + "1" ], "fan_cooling_layer_time": [ - "15" + "20" ], "filament_cost": [ "0" @@ -51,6 +51,9 @@ "filament_density": [ "0" ], + "filament_change_length": [ + "0" + ], "filament_deretraction_speed": [ "nil" ], @@ -61,7 +64,7 @@ "10" ], "filament_minimal_purge_on_wipe_tower": [ - "40" + "50" ], "filament_retraction_minimum_travel": [ "nil" @@ -115,13 +118,13 @@ "100" ], "fan_min_speed": [ - "10" + "20" ], "slow_down_min_speed": [ - "10" + "20" ], "slow_down_layer_time": [ - "3" + "7" ], "filament_start_gcode": [ "; Filament gcode\n" diff --git a/resources/profiles/RH3D/filament/fdm_filament_pccf.json b/resources/profiles/RH3D/filament/fdm_filament_pccf.json index 4296da76c5..401ab2eb23 100644 --- a/resources/profiles/RH3D/filament/fdm_filament_pccf.json +++ b/resources/profiles/RH3D/filament/fdm_filament_pccf.json @@ -26,7 +26,7 @@ "55" ], "fan_cooling_layer_time": [ - "10" + "12" ], "filament_max_volumetric_speed": [ "8" @@ -75,9 +75,9 @@ "330" ], "slow_down_min_speed": [ - "10" + "20" ], "slow_down_layer_time": [ - "2" + "4" ] } diff --git a/resources/profiles/RH3D/filament/fdm_filament_petg.json b/resources/profiles/RH3D/filament/fdm_filament_petg.json index aaa0f62357..8a69c94f7d 100644 --- a/resources/profiles/RH3D/filament/fdm_filament_petg.json +++ b/resources/profiles/RH3D/filament/fdm_filament_petg.json @@ -23,10 +23,10 @@ "90" ], "fan_cooling_layer_time": [ - "10" + "15" ], "filament_max_volumetric_speed": [ - "26" + "18" ], "filament_type": [ "PETG" @@ -72,9 +72,9 @@ "260" ], "slow_down_min_speed": [ - "12" + "20" ], "slow_down_layer_time": [ - "3" + "6" ] } diff --git a/resources/profiles/RH3D/filament/fdm_filament_pla.json b/resources/profiles/RH3D/filament/fdm_filament_pla.json index 873a78461b..770af83296 100644 --- a/resources/profiles/RH3D/filament/fdm_filament_pla.json +++ b/resources/profiles/RH3D/filament/fdm_filament_pla.json @@ -72,9 +72,9 @@ "250" ], "slow_down_min_speed": [ - "10" + "20" ], "slow_down_layer_time": [ - "6" + "8" ] } diff --git a/resources/profiles/RH3D/machine/VIRTU E3 - 0.2 nozzle.json b/resources/profiles/RH3D/machine/VIRTU E3 - 0.2 nozzle.json new file mode 100644 index 0000000000..8814f25e0c --- /dev/null +++ b/resources/profiles/RH3D/machine/VIRTU E3 - 0.2 nozzle.json @@ -0,0 +1,14 @@ +{ + "type": "machine", + "name": "VIRTU E3 - 0.2 nozzle", + "printer_model": "VIRTU E3", + "inherits": "fdm_common_VIRTU E3", + "from": "system", + "setting_id": "NEqwtUJ9txtcf1vY", + "instantiation": "true", + "default_print_profile": "0.10mm Standard @VIRTU E3", + "nozzle_diameter": [ + "0.2" + ], + "printer_variant": "0.2" +} diff --git a/resources/profiles/RH3D/machine/VIRTU E3 - 0.3 nozzle.json b/resources/profiles/RH3D/machine/VIRTU E3 - 0.3 nozzle.json new file mode 100644 index 0000000000..4c27b80bb8 --- /dev/null +++ b/resources/profiles/RH3D/machine/VIRTU E3 - 0.3 nozzle.json @@ -0,0 +1,14 @@ +{ + "type": "machine", + "name": "VIRTU E3 - 0.3 nozzle", + "printer_model": "VIRTU E3", + "inherits": "fdm_common_VIRTU E3", + "from": "system", + "setting_id": "3PjlEiZxmdLJjoGw", + "instantiation": "true", + "default_print_profile": "0.15mm Standard @VIRTU E3", + "nozzle_diameter": [ + "0.3" + ], + "printer_variant": "0.3" +} diff --git a/resources/profiles/RH3D/machine/VIRTU E3 - 0.4 nozzle.json b/resources/profiles/RH3D/machine/VIRTU E3 - 0.4 nozzle.json new file mode 100644 index 0000000000..7b02993a2b --- /dev/null +++ b/resources/profiles/RH3D/machine/VIRTU E3 - 0.4 nozzle.json @@ -0,0 +1,14 @@ +{ + "type": "machine", + "name": "VIRTU E3 - 0.4 nozzle", + "printer_model": "VIRTU E3", + "inherits": "fdm_common_VIRTU E3", + "from": "system", + "setting_id": "mYCTx4ovF6z0STDL", + "instantiation": "true", + "default_print_profile": "0.20mm Standard @VIRTU E3", + "nozzle_diameter": [ + "0.4" + ], + "printer_variant": "0.4" +} diff --git a/resources/profiles/RH3D/machine/VIRTU E3 - 0.5 nozzle.json b/resources/profiles/RH3D/machine/VIRTU E3 - 0.5 nozzle.json new file mode 100644 index 0000000000..660dd35305 --- /dev/null +++ b/resources/profiles/RH3D/machine/VIRTU E3 - 0.5 nozzle.json @@ -0,0 +1,14 @@ +{ + "type": "machine", + "name": "VIRTU E3 - 0.5 nozzle", + "printer_model": "VIRTU E3", + "inherits": "fdm_common_VIRTU E3", + "from": "system", + "setting_id": "iMnENFt2zw6UTcbM", + "instantiation": "true", + "default_print_profile": "0.20mm Standard @VIRTU E3", + "nozzle_diameter": [ + "0.5" + ], + "printer_variant": "0.5" +} diff --git a/resources/profiles/RH3D/machine/VIRTU E3 - 0.6 nozzle.json b/resources/profiles/RH3D/machine/VIRTU E3 - 0.6 nozzle.json new file mode 100644 index 0000000000..bce4e91736 --- /dev/null +++ b/resources/profiles/RH3D/machine/VIRTU E3 - 0.6 nozzle.json @@ -0,0 +1,14 @@ +{ + "type": "machine", + "name": "VIRTU E3 - 0.6 nozzle", + "printer_model": "VIRTU E3", + "inherits": "fdm_common_VIRTU E3", + "from": "system", + "setting_id": "T1RuDWhyFkI1GH1h", + "instantiation": "true", + "default_print_profile": "0.25mm Standard @VIRTU E3", + "nozzle_diameter": [ + "0.6" + ], + "printer_variant": "0.6" +} diff --git a/resources/profiles/RH3D/machine/VIRTU E3.json b/resources/profiles/RH3D/machine/VIRTU E3.json new file mode 100644 index 0000000000..f34fa3aefe --- /dev/null +++ b/resources/profiles/RH3D/machine/VIRTU E3.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "VIRTU E3", + "nozzle_diameter": "0.2;0.3;0.4;0.5;0.6", + "bed_model": "VIRTU-bed.stl", + "bed_texture": "VIRTU-bed-texture.svg", + "model_id": "VIRTUE3", + "family": "RH3D", + "hotend_model": "", + "machine_tech": "FFF", + "default_materials": "Generic ABS @VIRTU E3;Generic ASA @VIRTU E3;Generic PCCF @VIRTU E3;Generic PETG @VIRTU E3;Generic PLA @VIRTU E3;Generic TPU @VIRTU E3" +} diff --git a/resources/profiles/RH3D/machine/fdm_common_E3NG v1.2S.json b/resources/profiles/RH3D/machine/fdm_common_E3NG v1.2S.json index 0b952c73f3..8479a4e451 100644 --- a/resources/profiles/RH3D/machine/fdm_common_E3NG v1.2S.json +++ b/resources/profiles/RH3D/machine/fdm_common_E3NG v1.2S.json @@ -7,6 +7,7 @@ "extruder_clearance_height_to_lid": "140", "extruder_clearance_height_to_rod": "36", "extruder_clearance_radius": "65", + "default_filament_profile": "Generic PLA @E3NG v1.2S", "machine_max_acceleration_e": [ "7500", "7500" @@ -40,12 +41,12 @@ "25" ], "machine_max_speed_x": [ - "400", - "400" + "600", + "600" ], "machine_max_speed_y": [ - "400", - "400" + "600", + "600" ], "machine_max_speed_z": [ "12", diff --git a/resources/profiles/RH3D/machine/fdm_common_VIRTU E3.json b/resources/profiles/RH3D/machine/fdm_common_VIRTU E3.json new file mode 100644 index 0000000000..e825838811 --- /dev/null +++ b/resources/profiles/RH3D/machine/fdm_common_VIRTU E3.json @@ -0,0 +1,71 @@ +{ + "type": "machine", + "name": "fdm_common_VIRTU E3", + "inherits": "fdm_machine_common", + "from": "system", + "instantiation": "false", + "extruder_clearance_height_to_lid": "140", + "extruder_clearance_height_to_rod": "36", + "extruder_clearance_radius": "65", + "default_filament_profile": "Generic PLA @VIRTU E3", + "machine_max_acceleration_e": [ + "7500", + "7500" + ], + "machine_max_acceleration_extruding": [ + "35000", + "35000" + ], + "machine_max_acceleration_retracting": [ + "35000", + "35000" + ], + "machine_max_acceleration_travel": [ + "10000", + "10000" + ], + "machine_max_acceleration_x": [ + "35000", + "35000" + ], + "machine_max_acceleration_y": [ + "35000", + "35000" + ], + "machine_max_acceleration_z": [ + "2000", + "2000" + ], + "machine_max_speed_e": [ + "25", + "25" + ], + "machine_max_speed_x": [ + "900", + "900" + ], + "machine_max_speed_y": [ + "900", + "900" + ], + "machine_max_speed_z": [ + "400", + "400" + ], + "printable_area": [ + "0x0", + "230x0", + "230x232", + "0x232" + ], + "printable_height": "232", + "printer_model": "VIRTU E3", + "printer_notes": [ + "Design by RH3D" + ], + "retract_before_wipe": "80%", + "retract_length_toolchange": "0", + "retract_lift_below": "230", + "retraction_minimum_travel": "1.5", + "travel_slope": "1" +} diff --git a/resources/profiles/RH3D/machine/fdm_machine_common.json b/resources/profiles/RH3D/machine/fdm_machine_common.json index 4a3245b701..0f23916d97 100644 --- a/resources/profiles/RH3D/machine/fdm_machine_common.json +++ b/resources/profiles/RH3D/machine/fdm_machine_common.json @@ -5,12 +5,11 @@ "instantiation": "false", "printer_structure": "corexy", "gcode_flavor": "klipper", - "machine_start_gcode": "M104 S0 ; Stops OrcaSlicer from sending temp waits separately\nM140 S0\nPRINT_START EXTRUDER=[first_layer_temperature] BED=[first_layer_bed_temperature]\n; Start of actual GCode for the print", + "machine_start_gcode": "M104 S0 ; Stops OrcaSlicer from sending temp waits separately\nM140 S0\nPRINT_START EXTRUDER=[first_layer_temperature] BED=[first_layer_bed_temperature] CHAMBER=[chamber_temperature] PROFILE=[notes]\n; Start of actual GCode for the print", "machine_end_gcode": "PRINT_END", "extruder_colour": "#02aba2", "extruder_offset": "0x0", "emit_machine_limits_to_gcode": "0", - "default_filament_profile": "Generic PLA @E3NG v1.2S", "machine_min_extruding_rate": [ "0", "0" @@ -47,7 +46,7 @@ "320x240/PNG", "640x480/PNG" ], - "change_filament_gcode": "PAUSE\nG1 E1.0 F300 ; prime after color change", + "change_filament_gcode": "G1 E1.0 F300 ; prime after color change", "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\nG92 E0", "layer_change_gcode": ";AFTER_LAYER_CHANGE", "machine_pause_gcode": "PAUSE\n", diff --git a/resources/profiles/RH3D/process/0.10mm Fast @E3NG v1.2S.json b/resources/profiles/RH3D/process/0.10mm Fast @E3NG v1.2S.json new file mode 100644 index 0000000000..f8103a4582 --- /dev/null +++ b/resources/profiles/RH3D/process/0.10mm Fast @E3NG v1.2S.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "0.10mm Fast @E3NG v1.2S", + "inherits": "process_Fast_E3NG v1.2S", + "from": "system", + "setting_id": "zaYFBkbfYXxSz5eU", + "instantiation": "true", + "layer_height": "0.1", + "initial_layer_print_height": "0.15", + "compatible_printers": [ + "E3NG v1.2S - 0.2 nozzle", + "E3NG v1.2S - 0.3 nozzle", + "E3NG v1.2S - 0.4 nozzle" + ] +} diff --git a/resources/profiles/RH3D/process/0.10mm Fast @VIRTU E3.json b/resources/profiles/RH3D/process/0.10mm Fast @VIRTU E3.json new file mode 100644 index 0000000000..a72467ecfd --- /dev/null +++ b/resources/profiles/RH3D/process/0.10mm Fast @VIRTU E3.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "0.10mm Fast @VIRTU E3", + "inherits": "process_Fast_VIRTU E3", + "from": "system", + "setting_id": "nWpKy9NYLGggsHlM", + "instantiation": "true", + "layer_height": "0.1", + "initial_layer_print_height": "0.15", + "compatible_printers": [ + "VIRTU E3 - 0.2 nozzle", + "VIRTU E3 - 0.3 nozzle", + "VIRTU E3 - 0.4 nozzle" + ] +} diff --git a/resources/profiles/RH3D/process/0.10mm Slow @E3NG v1.2S.json b/resources/profiles/RH3D/process/0.10mm Slow @E3NG v1.2S.json new file mode 100644 index 0000000000..c853471ef9 --- /dev/null +++ b/resources/profiles/RH3D/process/0.10mm Slow @E3NG v1.2S.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "0.10mm Slow @E3NG v1.2S", + "inherits": "process_Slow_E3NG v1.2S", + "from": "system", + "setting_id": "W35S1kwfonBFrHAy", + "instantiation": "true", + "layer_height": "0.1", + "initial_layer_print_height": "0.15", + "compatible_printers": [ + "E3NG v1.2S - 0.2 nozzle", + "E3NG v1.2S - 0.3 nozzle", + "E3NG v1.2S - 0.4 nozzle" + ] +} diff --git a/resources/profiles/RH3D/process/0.10mm Slow @VIRTU E3.json b/resources/profiles/RH3D/process/0.10mm Slow @VIRTU E3.json new file mode 100644 index 0000000000..5c33e2e8f8 --- /dev/null +++ b/resources/profiles/RH3D/process/0.10mm Slow @VIRTU E3.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "0.10mm Slow @VIRTU E3", + "inherits": "process_Slow_VIRTU E3", + "from": "system", + "setting_id": "br9ISgiSBZTgKEqn", + "instantiation": "true", + "layer_height": "0.1", + "initial_layer_print_height": "0.15", + "compatible_printers": [ + "VIRTU E3 - 0.2 nozzle", + "VIRTU E3 - 0.3 nozzle", + "VIRTU E3 - 0.4 nozzle" + ] +} diff --git a/resources/profiles/RH3D/process/0.10mm Standard @E3NG v1.2S.json b/resources/profiles/RH3D/process/0.10mm Standard @E3NG v1.2S.json index dcaecb6b0b..86e7415897 100644 --- a/resources/profiles/RH3D/process/0.10mm Standard @E3NG v1.2S.json +++ b/resources/profiles/RH3D/process/0.10mm Standard @E3NG v1.2S.json @@ -1,7 +1,7 @@ { "type": "process", "name": "0.10mm Standard @E3NG v1.2S", - "inherits": "process_common_E3NG v1.2S", + "inherits": "process_Standard_E3NG v1.2S", "from": "system", "setting_id": "YhKounYUzB4FB9Em", "instantiation": "true", diff --git a/resources/profiles/RH3D/process/0.10mm Standard @VIRTU E3.json b/resources/profiles/RH3D/process/0.10mm Standard @VIRTU E3.json new file mode 100644 index 0000000000..675d8b3646 --- /dev/null +++ b/resources/profiles/RH3D/process/0.10mm Standard @VIRTU E3.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "0.10mm Standard @VIRTU E3", + "inherits": "process_Standard_VIRTU E3", + "from": "system", + "setting_id": "qf2uqEsVBJLb87TW", + "instantiation": "true", + "layer_height": "0.1", + "initial_layer_print_height": "0.15", + "compatible_printers": [ + "VIRTU E3 - 0.2 nozzle", + "VIRTU E3 - 0.3 nozzle", + "VIRTU E3 - 0.4 nozzle" + ] +} diff --git a/resources/profiles/RH3D/process/0.15mm Fast @E3NG v1.2S.json b/resources/profiles/RH3D/process/0.15mm Fast @E3NG v1.2S.json new file mode 100644 index 0000000000..8a301ed822 --- /dev/null +++ b/resources/profiles/RH3D/process/0.15mm Fast @E3NG v1.2S.json @@ -0,0 +1,16 @@ +{ + "type": "process", + "name": "0.15mm Fast @E3NG v1.2S", + "inherits": "process_Fast_E3NG v1.2S", + "from": "system", + "setting_id": "O4zDtFKxom68L07o", + "instantiation": "true", + "layer_height": "0.15", + "initial_layer_print_height": "0.2", + "compatible_printers": [ + "E3NG v1.2S - 0.2 nozzle", + "E3NG v1.2S - 0.3 nozzle", + "E3NG v1.2S - 0.4 nozzle", + "E3NG v1.2S - 0.5 nozzle" + ] +} diff --git a/resources/profiles/RH3D/process/0.15mm Fast @VIRTU E3.json b/resources/profiles/RH3D/process/0.15mm Fast @VIRTU E3.json new file mode 100644 index 0000000000..8c4040d1bb --- /dev/null +++ b/resources/profiles/RH3D/process/0.15mm Fast @VIRTU E3.json @@ -0,0 +1,16 @@ +{ + "type": "process", + "name": "0.15mm Fast @VIRTU E3", + "inherits": "process_Fast_VIRTU E3", + "from": "system", + "setting_id": "G0HkboSFDavmOAU4", + "instantiation": "true", + "layer_height": "0.15", + "initial_layer_print_height": "0.2", + "compatible_printers": [ + "VIRTU E3 - 0.2 nozzle", + "VIRTU E3 - 0.3 nozzle", + "VIRTU E3 - 0.4 nozzle", + "VIRTU E3 - 0.5 nozzle" + ] +} diff --git a/resources/profiles/RH3D/process/0.15mm Slow @E3NG v1.2S.json b/resources/profiles/RH3D/process/0.15mm Slow @E3NG v1.2S.json new file mode 100644 index 0000000000..f3693f8cbb --- /dev/null +++ b/resources/profiles/RH3D/process/0.15mm Slow @E3NG v1.2S.json @@ -0,0 +1,16 @@ +{ + "type": "process", + "name": "0.15mm Slow @E3NG v1.2S", + "inherits": "process_Slow_E3NG v1.2S", + "from": "system", + "setting_id": "zfmqi9qahym79w71", + "instantiation": "true", + "layer_height": "0.15", + "initial_layer_print_height": "0.2", + "compatible_printers": [ + "E3NG v1.2S - 0.2 nozzle", + "E3NG v1.2S - 0.3 nozzle", + "E3NG v1.2S - 0.4 nozzle", + "E3NG v1.2S - 0.5 nozzle" + ] +} diff --git a/resources/profiles/RH3D/process/0.15mm Slow @VIRTU E3.json b/resources/profiles/RH3D/process/0.15mm Slow @VIRTU E3.json new file mode 100644 index 0000000000..bac33744bb --- /dev/null +++ b/resources/profiles/RH3D/process/0.15mm Slow @VIRTU E3.json @@ -0,0 +1,16 @@ +{ + "type": "process", + "name": "0.15mm Slow @VIRTU E3", + "inherits": "process_Slow_VIRTU E3", + "from": "system", + "setting_id": "6RvsW4p0AVsAXYlf", + "instantiation": "true", + "layer_height": "0.15", + "initial_layer_print_height": "0.2", + "compatible_printers": [ + "VIRTU E3 - 0.2 nozzle", + "VIRTU E3 - 0.3 nozzle", + "VIRTU E3 - 0.4 nozzle", + "VIRTU E3 - 0.5 nozzle" + ] +} diff --git a/resources/profiles/RH3D/process/0.15mm Standard @E3NG v1.2S.json b/resources/profiles/RH3D/process/0.15mm Standard @E3NG v1.2S.json index deaded91ab..0c1a8367a8 100644 --- a/resources/profiles/RH3D/process/0.15mm Standard @E3NG v1.2S.json +++ b/resources/profiles/RH3D/process/0.15mm Standard @E3NG v1.2S.json @@ -1,7 +1,7 @@ { "type": "process", "name": "0.15mm Standard @E3NG v1.2S", - "inherits": "process_common_E3NG v1.2S", + "inherits": "process_Standard_E3NG v1.2S", "from": "system", "setting_id": "jYPd3BedSG1oG6S3", "instantiation": "true", diff --git a/resources/profiles/RH3D/process/0.15mm Standard @VIRTU E3.json b/resources/profiles/RH3D/process/0.15mm Standard @VIRTU E3.json new file mode 100644 index 0000000000..de6a3e1ddf --- /dev/null +++ b/resources/profiles/RH3D/process/0.15mm Standard @VIRTU E3.json @@ -0,0 +1,16 @@ +{ + "type": "process", + "name": "0.15mm Standard @VIRTU E3", + "inherits": "process_Standard_VIRTU E3", + "from": "system", + "setting_id": "NFY8TFxasqh2wUvX", + "instantiation": "true", + "layer_height": "0.15", + "initial_layer_print_height": "0.2", + "compatible_printers": [ + "VIRTU E3 - 0.2 nozzle", + "VIRTU E3 - 0.3 nozzle", + "VIRTU E3 - 0.4 nozzle", + "VIRTU E3 - 0.5 nozzle" + ] +} diff --git a/resources/profiles/RH3D/process/0.20mm Fast @E3NG v1.2S.json b/resources/profiles/RH3D/process/0.20mm Fast @E3NG v1.2S.json index bca60006c4..61fd819a39 100644 --- a/resources/profiles/RH3D/process/0.20mm Fast @E3NG v1.2S.json +++ b/resources/profiles/RH3D/process/0.20mm Fast @E3NG v1.2S.json @@ -1,49 +1,16 @@ { "type": "process", "name": "0.20mm Fast @E3NG v1.2S", - "inherits": "process_common_E3NG v1.2S", + "inherits": "process_Fast_E3NG v1.2S", "from": "system", "setting_id": "S7z7EwSYYbjVWRK0", "instantiation": "true", "layer_height": "0.2", "initial_layer_print_height": "0.2", "compatible_printers": [ + "E3NG v1.2S - 0.3 nozzle", "E3NG v1.2S - 0.4 nozzle", "E3NG v1.2S - 0.5 nozzle", "E3NG v1.2S - 0.6 nozzle" - ], - "reduce_crossing_wall": "0", - "bridge_speed": "75", - "default_acceleration": "10000", - "initial_layer_acceleration": "7500", - "top_surface_acceleration": "7500", - "travel_acceleration": "10000", - "inner_wall_acceleration": "10000", - "outer_wall_acceleration": "7500", - "bridge_acceleration": "5000", - "sparse_infill_acceleration": "12500", - "internal_solid_infill_acceleration": "10000", - "infill_combination": "1", - "ironing_speed": "150", - "overhang_1_4_speed": "100", - "overhang_2_4_speed": "50", - "overhang_3_4_speed": "30", - "overhang_4_4_speed": "15", - "support_interface_speed": "120", - "top_surface_line_width": "100%", - "sparse_infill_line_width": "125%", - "internal_solid_infill_line_width": "125%", - "seam_position": "nearest", - "initial_layer_speed": "100", - "initial_layer_infill_speed": "150", - "outer_wall_speed": "300", - "inner_wall_speed": "340", - "small_perimeter_speed": "300", - "sparse_infill_speed": "400", - "internal_solid_infill_speed": "340", - "top_surface_speed": "300", - "gap_infill_speed": "300", - "travel_speed": "400", - "only_one_wall_top": "0", - "only_one_wall_first_layer": "0" + ] } diff --git a/resources/profiles/RH3D/process/0.20mm Fast @VIRTU E3.json b/resources/profiles/RH3D/process/0.20mm Fast @VIRTU E3.json new file mode 100644 index 0000000000..1c182fd117 --- /dev/null +++ b/resources/profiles/RH3D/process/0.20mm Fast @VIRTU E3.json @@ -0,0 +1,16 @@ +{ + "type": "process", + "name": "0.20mm Fast @VIRTU E3", + "inherits": "process_Fast_VIRTU E3", + "from": "system", + "setting_id": "cSol8x6vF51GUloq", + "instantiation": "true", + "layer_height": "0.2", + "initial_layer_print_height": "0.2", + "compatible_printers": [ + "VIRTU E3 - 0.3 nozzle", + "VIRTU E3 - 0.4 nozzle", + "VIRTU E3 - 0.5 nozzle", + "VIRTU E3 - 0.6 nozzle" + ] +} diff --git a/resources/profiles/RH3D/process/0.20mm Slow @E3NG v1.2S.json b/resources/profiles/RH3D/process/0.20mm Slow @E3NG v1.2S.json index 45be150670..4894fc3637 100644 --- a/resources/profiles/RH3D/process/0.20mm Slow @E3NG v1.2S.json +++ b/resources/profiles/RH3D/process/0.20mm Slow @E3NG v1.2S.json @@ -1,49 +1,16 @@ { "type": "process", "name": "0.20mm Slow @E3NG v1.2S", - "inherits": "process_common_E3NG v1.2S", + "inherits": "process_Slow_E3NG v1.2S", "from": "system", "setting_id": "JH4jITLGT8tbtnu1", "instantiation": "true", "layer_height": "0.2", "initial_layer_print_height": "0.2", "compatible_printers": [ + "E3NG v1.2S - 0.3 nozzle", "E3NG v1.2S - 0.4 nozzle", "E3NG v1.2S - 0.5 nozzle", "E3NG v1.2S - 0.6 nozzle" - ], - "reduce_crossing_wall": "1", - "bridge_speed": "40", - "default_acceleration": "3000", - "initial_layer_acceleration": "3000", - "top_surface_acceleration": "2000", - "travel_acceleration": "3000", - "inner_wall_acceleration": "3000", - "outer_wall_acceleration": "3000", - "bridge_acceleration": "2000", - "sparse_infill_acceleration": "4000", - "internal_solid_infill_acceleration": "3000", - "infill_combination": "0", - "ironing_speed": "80", - "overhang_1_4_speed": "60", - "overhang_2_4_speed": "35", - "overhang_3_4_speed": "20", - "overhang_4_4_speed": "8", - "support_interface_speed": "60", - "top_surface_line_width": "100%", - "sparse_infill_line_width": "125%", - "internal_solid_infill_line_width": "125%", - "seam_position": "aligned", - "initial_layer_speed": "60", - "initial_layer_infill_speed": "75", - "outer_wall_speed": "140", - "inner_wall_speed": "140", - "small_perimeter_speed": "140", - "sparse_infill_speed": "140", - "internal_solid_infill_speed": "140", - "top_surface_speed": "140", - "gap_infill_speed": "140", - "travel_speed": "400", - "only_one_wall_top": "1", - "only_one_wall_first_layer": "1" + ] } diff --git a/resources/profiles/RH3D/process/0.20mm Slow @VIRTU E3.json b/resources/profiles/RH3D/process/0.20mm Slow @VIRTU E3.json new file mode 100644 index 0000000000..1ee87921aa --- /dev/null +++ b/resources/profiles/RH3D/process/0.20mm Slow @VIRTU E3.json @@ -0,0 +1,16 @@ +{ + "type": "process", + "name": "0.20mm Slow @VIRTU E3", + "inherits": "process_Slow_VIRTU E3", + "from": "system", + "setting_id": "NlGjHdIRQnp9PCfc", + "instantiation": "true", + "layer_height": "0.2", + "initial_layer_print_height": "0.2", + "compatible_printers": [ + "VIRTU E3 - 0.3 nozzle", + "VIRTU E3 - 0.4 nozzle", + "VIRTU E3 - 0.5 nozzle", + "VIRTU E3 - 0.6 nozzle" + ] +} diff --git a/resources/profiles/RH3D/process/0.20mm Standard @E3NG v1.2S.json b/resources/profiles/RH3D/process/0.20mm Standard @E3NG v1.2S.json index 92ddcd9109..95b149cfba 100644 --- a/resources/profiles/RH3D/process/0.20mm Standard @E3NG v1.2S.json +++ b/resources/profiles/RH3D/process/0.20mm Standard @E3NG v1.2S.json @@ -1,10 +1,12 @@ { "type": "process", "name": "0.20mm Standard @E3NG v1.2S", - "inherits": "process_common_E3NG v1.2S", + "inherits": "process_Standard_E3NG v1.2S", "from": "system", "setting_id": "XgaEHNWBsBQoPjbP", "instantiation": "true", + "layer_height": "0.2", + "initial_layer_print_height": "0.2", "compatible_printers": [ "E3NG v1.2S - 0.3 nozzle", "E3NG v1.2S - 0.4 nozzle", diff --git a/resources/profiles/RH3D/process/0.20mm Standard @VIRTU E3.json b/resources/profiles/RH3D/process/0.20mm Standard @VIRTU E3.json new file mode 100644 index 0000000000..ad7ac64a0b --- /dev/null +++ b/resources/profiles/RH3D/process/0.20mm Standard @VIRTU E3.json @@ -0,0 +1,16 @@ +{ + "type": "process", + "name": "0.20mm Standard @VIRTU E3", + "inherits": "process_Standard_VIRTU E3", + "from": "system", + "setting_id": "F0hx03mNji9yec5G", + "instantiation": "true", + "layer_height": "0.2", + "initial_layer_print_height": "0.2", + "compatible_printers": [ + "VIRTU E3 - 0.3 nozzle", + "VIRTU E3 - 0.4 nozzle", + "VIRTU E3 - 0.5 nozzle", + "VIRTU E3 - 0.6 nozzle" + ] +} diff --git a/resources/profiles/RH3D/process/0.25mm Fast @E3NG v1.2S.json b/resources/profiles/RH3D/process/0.25mm Fast @E3NG v1.2S.json index bf910f676a..f9442067d1 100644 --- a/resources/profiles/RH3D/process/0.25mm Fast @E3NG v1.2S.json +++ b/resources/profiles/RH3D/process/0.25mm Fast @E3NG v1.2S.json @@ -1,7 +1,7 @@ { "type": "process", "name": "0.25mm Fast @E3NG v1.2S", - "inherits": "process_common_E3NG v1.2S", + "inherits": "process_Fast_E3NG v1.2S", "from": "system", "setting_id": "QqkHiZPjk3QWyKKN", "instantiation": "true", @@ -11,39 +11,5 @@ "E3NG v1.2S - 0.4 nozzle", "E3NG v1.2S - 0.5 nozzle", "E3NG v1.2S - 0.6 nozzle" - ], - "reduce_crossing_wall": "0", - "bridge_speed": "75", - "default_acceleration": "10000", - "initial_layer_acceleration": "7500", - "top_surface_acceleration": "7500", - "travel_acceleration": "10000", - "inner_wall_acceleration": "10000", - "outer_wall_acceleration": "7500", - "bridge_acceleration": "5000", - "sparse_infill_acceleration": "12500", - "internal_solid_infill_acceleration": "10000", - "infill_combination": "1", - "ironing_speed": "150", - "overhang_1_4_speed": "100", - "overhang_2_4_speed": "50", - "overhang_3_4_speed": "30", - "overhang_4_4_speed": "15", - "support_interface_speed": "120", - "top_surface_line_width": "100%", - "sparse_infill_line_width": "125%", - "internal_solid_infill_line_width": "125%", - "seam_position": "nearest", - "initial_layer_speed": "100", - "initial_layer_infill_speed": "150", - "outer_wall_speed": "300", - "inner_wall_speed": "340", - "small_perimeter_speed": "300", - "sparse_infill_speed": "400", - "internal_solid_infill_speed": "340", - "top_surface_speed": "300", - "gap_infill_speed": "300", - "travel_speed": "400", - "only_one_wall_top": "0", - "only_one_wall_first_layer": "0" + ] } diff --git a/resources/profiles/RH3D/process/0.25mm Fast @VIRTU E3.json b/resources/profiles/RH3D/process/0.25mm Fast @VIRTU E3.json new file mode 100644 index 0000000000..0e6c3ef6eb --- /dev/null +++ b/resources/profiles/RH3D/process/0.25mm Fast @VIRTU E3.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "0.25mm Fast @VIRTU E3", + "inherits": "process_Fast_VIRTU E3", + "from": "system", + "setting_id": "MyqBOD8a6YOpgm8h", + "instantiation": "true", + "layer_height": "0.25", + "initial_layer_print_height": "0.25", + "compatible_printers": [ + "VIRTU E3 - 0.4 nozzle", + "VIRTU E3 - 0.5 nozzle", + "VIRTU E3 - 0.6 nozzle" + ] +} diff --git a/resources/profiles/RH3D/process/0.25mm Slow @E3NG v1.2S.json b/resources/profiles/RH3D/process/0.25mm Slow @E3NG v1.2S.json new file mode 100644 index 0000000000..65de472eec --- /dev/null +++ b/resources/profiles/RH3D/process/0.25mm Slow @E3NG v1.2S.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "0.25mm Slow @E3NG v1.2S", + "inherits": "process_Slow_E3NG v1.2S", + "from": "system", + "setting_id": "7sr967Tgq1J3qxTG", + "instantiation": "true", + "layer_height": "0.25", + "initial_layer_print_height": "0.25", + "compatible_printers": [ + "E3NG v1.2S - 0.4 nozzle", + "E3NG v1.2S - 0.5 nozzle", + "E3NG v1.2S - 0.6 nozzle" + ] +} diff --git a/resources/profiles/RH3D/process/0.25mm Slow @VIRTU E3.json b/resources/profiles/RH3D/process/0.25mm Slow @VIRTU E3.json new file mode 100644 index 0000000000..36ef0d460f --- /dev/null +++ b/resources/profiles/RH3D/process/0.25mm Slow @VIRTU E3.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "0.25mm Slow @VIRTU E3", + "inherits": "process_Slow_VIRTU E3", + "from": "system", + "setting_id": "BqoOYOcFMFNbkpAb", + "instantiation": "true", + "layer_height": "0.25", + "initial_layer_print_height": "0.25", + "compatible_printers": [ + "VIRTU E3 - 0.4 nozzle", + "VIRTU E3 - 0.5 nozzle", + "VIRTU E3 - 0.6 nozzle" + ] +} diff --git a/resources/profiles/RH3D/process/0.25mm Standard @E3NG v1.2S.json b/resources/profiles/RH3D/process/0.25mm Standard @E3NG v1.2S.json index 5ebe88f3fe..4234924db2 100644 --- a/resources/profiles/RH3D/process/0.25mm Standard @E3NG v1.2S.json +++ b/resources/profiles/RH3D/process/0.25mm Standard @E3NG v1.2S.json @@ -1,7 +1,7 @@ { "type": "process", "name": "0.25mm Standard @E3NG v1.2S", - "inherits": "process_common_E3NG v1.2S", + "inherits": "process_Standard_E3NG v1.2S", "from": "system", "setting_id": "2dPD9ljxZ8hknXZu", "instantiation": "true", diff --git a/resources/profiles/RH3D/process/0.25mm Standard @VIRTU E3.json b/resources/profiles/RH3D/process/0.25mm Standard @VIRTU E3.json new file mode 100644 index 0000000000..3aa8db5be4 --- /dev/null +++ b/resources/profiles/RH3D/process/0.25mm Standard @VIRTU E3.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "0.25mm Standard @VIRTU E3", + "inherits": "process_Standard_VIRTU E3", + "from": "system", + "setting_id": "uKXPx0hfphTLXfmI", + "instantiation": "true", + "layer_height": "0.25", + "initial_layer_print_height": "0.25", + "compatible_printers": [ + "VIRTU E3 - 0.4 nozzle", + "VIRTU E3 - 0.5 nozzle", + "VIRTU E3 - 0.6 nozzle" + ] +} diff --git a/resources/profiles/RH3D/process/fdm_process_common.json b/resources/profiles/RH3D/process/fdm_process_common.json index 4f02e37fa6..0f5087af8c 100644 --- a/resources/profiles/RH3D/process/fdm_process_common.json +++ b/resources/profiles/RH3D/process/fdm_process_common.json @@ -8,6 +8,7 @@ "bottom_surface_pattern": "monotonicline", "bottom_shell_thickness": "0", "bridge_speed": "50", + "brim_type": "no_brim", "brim_width": "0", "brim_object_gap": "0.1", "compatible_printers": [], @@ -22,6 +23,8 @@ "bridge_acceleration": "2500", "sparse_infill_acceleration": "8000", "internal_solid_infill_acceleration": "5000", + "accel_to_decel_enable": "0", + "accel_to_decel_factor": "100%", "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0.1", @@ -41,8 +44,8 @@ "reduce_infill_retraction": "1", "filename_format": "{input_filename_base}_{filament_type[0]}_{print_time}_{printer_model}.gcode", "detect_overhang_wall": "1", - "slowdown_for_curled_perimeters": "1", - "overhang_1_4_speed": "70", + "slowdown_for_curled_perimeters": "0", + "overhang_1_4_speed": "0", "overhang_2_4_speed": "40", "overhang_3_4_speed": "25", "overhang_4_4_speed": "10", @@ -102,7 +105,7 @@ "initial_layer_infill_speed": "100", "outer_wall_speed": "220", "inner_wall_speed": "220", - "small_perimeter_speed": "220", + "small_perimeter_speed": "50%", "sparse_infill_speed": "300", "internal_solid_infill_speed": "220", "top_surface_speed": "180", diff --git a/resources/profiles/RH3D/process/process_Fast_E3NG v1.2S.json b/resources/profiles/RH3D/process/process_Fast_E3NG v1.2S.json new file mode 100644 index 0000000000..73d0ae5202 --- /dev/null +++ b/resources/profiles/RH3D/process/process_Fast_E3NG v1.2S.json @@ -0,0 +1,42 @@ +{ + "type": "process", + "name": "process_Fast_E3NG v1.2S", + "inherits": "fdm_process_common", + "from": "system", + "instantiation": "false", + "reduce_crossing_wall": "0", + "bridge_speed": "75", + "default_acceleration": "10000", + "initial_layer_acceleration": "7500", + "top_surface_acceleration": "7500", + "travel_acceleration": "10000", + "inner_wall_acceleration": "10000", + "outer_wall_acceleration": "7500", + "bridge_acceleration": "5000", + "sparse_infill_acceleration": "12500", + "internal_solid_infill_acceleration": "10000", + "infill_combination": "0", + "ironing_speed": "150", + "overhang_1_4_speed": "100", + "overhang_2_4_speed": "50", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "15", + "support_interface_speed": "120", + "top_surface_line_width": "100%", + "sparse_infill_line_width": "125%", + "internal_solid_infill_line_width": "125%", + "seam_position": "nearest", + "initial_layer_speed": "100", + "initial_layer_infill_speed": "150", + "outer_wall_speed": "300", + "inner_wall_speed": "340", + "small_perimeter_speed": "300", + "sparse_infill_speed": "400", + "internal_solid_infill_speed": "340", + "top_surface_speed": "300", + "gap_infill_speed": "300", + "travel_speed": "400", + "only_one_wall_top": "0", + "only_one_wall_first_layer": "0", + "notes": "fast" +} diff --git a/resources/profiles/RH3D/process/process_Fast_VIRTU E3.json b/resources/profiles/RH3D/process/process_Fast_VIRTU E3.json new file mode 100644 index 0000000000..b981150596 --- /dev/null +++ b/resources/profiles/RH3D/process/process_Fast_VIRTU E3.json @@ -0,0 +1,42 @@ +{ + "type": "process", + "name": "process_Fast_VIRTU E3", + "inherits": "fdm_process_common", + "from": "system", + "instantiation": "false", + "reduce_crossing_wall": "0", + "bridge_speed": "75", + "default_acceleration": "20000", + "initial_layer_acceleration": "15000", + "top_surface_acceleration": "15000", + "travel_acceleration": "15000", + "inner_wall_acceleration": "25000", + "outer_wall_acceleration": "15000", + "bridge_acceleration": "10000", + "sparse_infill_acceleration": "30000", + "internal_solid_infill_acceleration": "25000", + "infill_combination": "0", + "ironing_speed": "150", + "overhang_1_4_speed": "100", + "overhang_2_4_speed": "50", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "15", + "support_interface_speed": "120", + "top_surface_line_width": "90%", + "sparse_infill_line_width": "125%", + "internal_solid_infill_line_width": "125%", + "seam_position": "nearest", + "initial_layer_speed": "100", + "initial_layer_infill_speed": "150", + "outer_wall_speed": "300", + "inner_wall_speed": "600", + "small_perimeter_speed": "300", + "sparse_infill_speed": "600", + "internal_solid_infill_speed": "500", + "top_surface_speed": "300", + "gap_infill_speed": "300", + "travel_speed": "800", + "only_one_wall_top": "0", + "only_one_wall_first_layer": "0", + "notes": "fast" +} diff --git a/resources/profiles/RH3D/process/process_Slow_E3NG v1.2S.json b/resources/profiles/RH3D/process/process_Slow_E3NG v1.2S.json new file mode 100644 index 0000000000..5cf259e378 --- /dev/null +++ b/resources/profiles/RH3D/process/process_Slow_E3NG v1.2S.json @@ -0,0 +1,42 @@ +{ + "type": "process", + "name": "process_Slow_E3NG v1.2S", + "inherits": "fdm_process_common", + "from": "system", + "instantiation": "false", + "reduce_crossing_wall": "1", + "bridge_speed": "40", + "default_acceleration": "3000", + "initial_layer_acceleration": "3000", + "top_surface_acceleration": "2000", + "travel_acceleration": "3000", + "inner_wall_acceleration": "3000", + "outer_wall_acceleration": "3000", + "bridge_acceleration": "2000", + "sparse_infill_acceleration": "4000", + "internal_solid_infill_acceleration": "3000", + "infill_combination": "0", + "ironing_speed": "80", + "overhang_1_4_speed": "60", + "overhang_2_4_speed": "35", + "overhang_3_4_speed": "20", + "overhang_4_4_speed": "8", + "support_interface_speed": "60", + "top_surface_line_width": "90%", + "sparse_infill_line_width": "125%", + "internal_solid_infill_line_width": "125%", + "seam_position": "aligned", + "initial_layer_speed": "60", + "initial_layer_infill_speed": "75", + "outer_wall_speed": "120", + "inner_wall_speed": "120", + "small_perimeter_speed": "120", + "sparse_infill_speed": "160", + "internal_solid_infill_speed": "160", + "top_surface_speed": "120", + "gap_infill_speed": "120", + "travel_speed": "400", + "only_one_wall_top": "1", + "only_one_wall_first_layer": "1", + "notes": "quiet" +} diff --git a/resources/profiles/RH3D/process/process_Slow_VIRTU E3.json b/resources/profiles/RH3D/process/process_Slow_VIRTU E3.json new file mode 100644 index 0000000000..4f7f41e5eb --- /dev/null +++ b/resources/profiles/RH3D/process/process_Slow_VIRTU E3.json @@ -0,0 +1,42 @@ +{ + "type": "process", + "name": "process_Slow_VIRTU E3", + "inherits": "fdm_process_common", + "from": "system", + "instantiation": "false", + "reduce_crossing_wall": "1", + "bridge_speed": "40", + "default_acceleration": "3000", + "initial_layer_acceleration": "3000", + "top_surface_acceleration": "2000", + "travel_acceleration": "3000", + "inner_wall_acceleration": "3000", + "outer_wall_acceleration": "3000", + "bridge_acceleration": "2000", + "sparse_infill_acceleration": "4000", + "internal_solid_infill_acceleration": "3000", + "infill_combination": "0", + "ironing_speed": "80", + "overhang_1_4_speed": "60", + "overhang_2_4_speed": "35", + "overhang_3_4_speed": "20", + "overhang_4_4_speed": "8", + "support_interface_speed": "60", + "top_surface_line_width": "90%", + "sparse_infill_line_width": "125%", + "internal_solid_infill_line_width": "125%", + "seam_position": "aligned", + "initial_layer_speed": "60", + "initial_layer_infill_speed": "75", + "outer_wall_speed": "140", + "inner_wall_speed": "140", + "small_perimeter_speed": "140", + "sparse_infill_speed": "140", + "internal_solid_infill_speed": "140", + "top_surface_speed": "140", + "gap_infill_speed": "140", + "travel_speed": "400", + "only_one_wall_top": "1", + "only_one_wall_first_layer": "1", + "notes": "quiet" +} diff --git a/resources/profiles/RH3D/process/process_Standard_E3NG v1.2S.json b/resources/profiles/RH3D/process/process_Standard_E3NG v1.2S.json new file mode 100644 index 0000000000..55828f200a --- /dev/null +++ b/resources/profiles/RH3D/process/process_Standard_E3NG v1.2S.json @@ -0,0 +1,33 @@ +{ + "type": "process", + "name": "process_Standard_E3NG v1.2S", + "inherits": "fdm_process_common", + "from": "system", + "instantiation": "false", + "default_acceleration": "10000", + "initial_layer_acceleration": "5000", + "top_surface_acceleration": "5000", + "travel_acceleration": "7500", + "inner_wall_acceleration": "10000", + "outer_wall_acceleration": "10000", + "bridge_acceleration": "3500", + "sparse_infill_acceleration": "12500", + "internal_solid_infill_acceleration": "12500", + "overhang_1_4_speed": "70", + "overhang_2_4_speed": "40", + "overhang_3_4_speed": "25", + "overhang_4_4_speed": "10", + "support_interface_speed": "100", + "support_speed": "180", + "initial_layer_speed": "90", + "initial_layer_infill_speed": "120", + "outer_wall_speed": "180", + "inner_wall_speed": "220", + "small_perimeter_speed": "180", + "sparse_infill_speed": "220", + "internal_solid_infill_speed": "220", + "top_surface_speed": "180", + "gap_infill_speed": "180", + "travel_speed": "500", + "notes": "normal" +} diff --git a/resources/profiles/RH3D/process/process_Standard_VIRTU E3.json b/resources/profiles/RH3D/process/process_Standard_VIRTU E3.json new file mode 100644 index 0000000000..d312218844 --- /dev/null +++ b/resources/profiles/RH3D/process/process_Standard_VIRTU E3.json @@ -0,0 +1,33 @@ +{ + "type": "process", + "name": "process_Standard_VIRTU E3", + "inherits": "fdm_process_common", + "from": "system", + "instantiation": "false", + "default_acceleration": "15000", + "initial_layer_acceleration": "7500", + "top_surface_acceleration": "7500", + "travel_acceleration": "10000", + "inner_wall_acceleration": "15000", + "outer_wall_acceleration": "15000", + "bridge_acceleration": "5000", + "sparse_infill_acceleration": "20000", + "internal_solid_infill_acceleration": "20000", + "overhang_1_4_speed": "70", + "overhang_2_4_speed": "40", + "overhang_3_4_speed": "25", + "overhang_4_4_speed": "10", + "support_interface_speed": "100", + "support_speed": "250", + "initial_layer_speed": "100", + "initial_layer_infill_speed": "150", + "outer_wall_speed": "260", + "inner_wall_speed": "350", + "small_perimeter_speed": "260", + "sparse_infill_speed": "350", + "internal_solid_infill_speed": "350", + "top_surface_speed": "260", + "gap_infill_speed": "260", + "travel_speed": "600", + "notes": "normal" +} diff --git a/resources/profiles/RH3D/process/process_common_E3NG v1.2S.json b/resources/profiles/RH3D/process/process_common_E3NG v1.2S.json deleted file mode 100644 index b43952fb89..0000000000 --- a/resources/profiles/RH3D/process/process_common_E3NG v1.2S.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "process", - "name": "process_common_E3NG v1.2S", - "inherits": "fdm_process_common", - "from": "system", - "instantiation": "false" -} diff --git a/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Dual).json b/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Dual).json index 660abd55d4..64b55dffaa 100644 --- a/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Dual).json +++ b/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Dual).json @@ -21,8 +21,8 @@ ], "printable_area": [ "0x0", - "340x0", - "340x300", + "255x0", + "255x300", "0x300" ], "printable_height": "300", diff --git a/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Left).json b/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Left).json index 433dddfff7..5275f02ccf 100644 --- a/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Left).json +++ b/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Left).json @@ -21,8 +21,8 @@ ], "printable_area": [ "0x0", - "340x0", - "340x300", + "300x0", + "300x300", "0x300" ], "printable_height": "300", diff --git a/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Right).json b/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Right).json index 2cbbe2fc49..59b86fd468 100644 --- a/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Right).json +++ b/resources/profiles/Raise3D/machine/Raise3D Pro3 0.4 nozzle (Right).json @@ -21,8 +21,8 @@ ], "printable_area": [ "0x0", - "340x0", - "340x300", + "300x0", + "300x300", "0x300" ], "printable_height": "300", diff --git a/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Dual).json b/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Dual).json index 566911b4c6..e576937531 100644 --- a/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Dual).json +++ b/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Dual).json @@ -21,8 +21,8 @@ ], "printable_area": [ "0x0", - "340x0", - "340x300", + "255x0", + "255x300", "0x300" ], "printable_height": "605", diff --git a/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Left).json b/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Left).json index daaef6abdb..a7da5981f0 100644 --- a/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Left).json +++ b/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Left).json @@ -21,8 +21,8 @@ ], "printable_area": [ "0x0", - "340x0", - "340x300", + "300x0", + "300x300", "0x300" ], "printable_height": "605", diff --git a/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Right).json b/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Right).json index 1e842a07ae..2ee32e65d3 100644 --- a/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Right).json +++ b/resources/profiles/Raise3D/machine/Raise3D Pro3 Plus 0.4 nozzle (Right).json @@ -21,8 +21,8 @@ ], "printable_area": [ "0x0", - "340x0", - "340x300", + "300x0", + "300x300", "0x300" ], "printable_height": "605", diff --git a/resources/profiles/Snapmaker/process/fdm_process_U1_common.json b/resources/profiles/Snapmaker/process/fdm_process_U1_common.json index 5240f242c4..3fbacd5f4f 100644 --- a/resources/profiles/Snapmaker/process/fdm_process_U1_common.json +++ b/resources/profiles/Snapmaker/process/fdm_process_U1_common.json @@ -28,7 +28,7 @@ "ironing_type": "no ironing", "layer_height": "0.2", "reduce_infill_retraction": "1", - "filename_format": "{input_filename_base}_{filament_type[0]}_{print_time}.gcode", + "filename_format": "{input_filename_base}_{filament_type[initial_no_support_extruder]}_{int(total_weight*10) / 10.0}g_{print_time}.gcode", "detect_overhang_wall": "1", "overhang_1_4_speed": "0", "overhang_2_4_speed": "50", diff --git a/resources/profiles/Sovol.json b/resources/profiles/Sovol.json index 7f08417ed7..81dab20239 100644 --- a/resources/profiles/Sovol.json +++ b/resources/profiles/Sovol.json @@ -1,7 +1,7 @@ { "name": "Sovol", "url": "", - "version": "02.04.00.04", + "version": "02.04.00.07", "force_update": "0", "description": "Sovol configurations", "machine_model_list": [ @@ -167,10 +167,6 @@ "name": "0.20mm Standard @Sovol SV08 MAX 0.4 nozzle", "sub_path": "process/0.20mm Standard @Sovol SV08 MAX 0.4 nozzle.json" }, - { - "name": "0.20mm Standard @Sovol Zero 0.4 nozzle", - "sub_path": "process/0.20mm Standard @Sovol Zero 0.4 nozzle.json" - }, { "name": "0.28mm Fast @Sovol SV06 ACE", "sub_path": "process/0.28mm Fast @Sovol SV06 ACE 0.4 nozzle.json" @@ -198,6 +194,74 @@ { "name": "0.40mm Standard @Sovol SV08 MAX 0.8 nozzle", "sub_path": "process/0.40mm Standard @Sovol SV08 MAX 0.8 nozzle.json" + }, + { + "name": "fdm_process_zero", + "sub_path": "process/fdm_process_zero.json" + }, + { + "name": "0.06mm Quality @Sovol Zero 0.2 nozzle", + "sub_path": "process/0.06mm Quality @Sovol Zero 0.2 nozzle.json" + }, + { + "name": "0.10mm Standard @Sovol Zero 0.2 nozzle", + "sub_path": "process/0.10mm Standard @Sovol Zero 0.2 nozzle.json" + }, + { + "name": "0.12mm Quality @Sovol Zero 0.4 nozzle", + "sub_path": "process/0.12mm Quality @Sovol Zero 0.4 nozzle.json" + }, + { + "name": "0.14mm Fast @Sovol Zero 0.2 nozzle", + "sub_path": "process/0.14mm Fast @Sovol Zero 0.2 nozzle.json" + }, + { + "name": "0.15mm Quality @Sovol Zero 0.6 nozzle", + "sub_path": "process/0.15mm Quality @Sovol Zero 0.6 nozzle.json" + }, + { + "name": "0.20mm Quality @Sovol Zero 0.8 nozzle", + "sub_path": "process/0.20mm Quality @Sovol Zero 0.8 nozzle.json" + }, + { + "name": "0.20mm Standard @Sovol Zero 0.4 nozzle", + "sub_path": "process/0.20mm Standard @Sovol Zero 0.4 nozzle.json" + }, + { + "name": "0.25mm Quality @Sovol Zero 1.0 nozzle", + "sub_path": "process/0.25mm Quality @Sovol Zero 1.0 nozzle.json" + }, + { + "name": "0.25mm SPEEDBENCHY @Sovol Zero 0.4 nozzle", + "sub_path": "process/0.25mm SPEEDBENCHY @Sovol Zero 0.4 nozzle.json" + }, + { + "name": "0.28mm Fast @Sovol Zero 0.4 nozzle", + "sub_path": "process/0.28mm Fast @Sovol Zero 0.4 nozzle.json" + }, + { + "name": "0.30mm Standard @Sovol Zero 0.6 nozzle", + "sub_path": "process/0.30mm Standard @Sovol Zero 0.6 nozzle.json" + }, + { + "name": "0.40mm Standard @Sovol Zero 0.8 nozzle", + "sub_path": "process/0.40mm Standard @Sovol Zero 0.8 nozzle.json" + }, + { + "name": "0.42mm Fast @Sovol Zero 0.6 nozzle", + "sub_path": "process/0.42mm Fast @Sovol Zero 0.6 nozzle.json" + }, + { + "name": "0.50mm Standard @Sovol Zero 1.0 nozzle", + "sub_path": "process/0.50mm Standard @Sovol Zero 1.0 nozzle.json" + }, + { + "name": "0.56mm Fast @Sovol Zero 0.8 nozzle", + "sub_path": "process/0.56mm Fast @Sovol Zero 0.8 nozzle.json" + }, + { + "name": "0.70mm Fast @Sovol Zero 1.0 nozzle", + "sub_path": "process/0.70mm Fast @Sovol Zero 1.0 nozzle.json" } ], "filament_list": [ @@ -249,6 +313,10 @@ "name": "Generic PETG @Sovol Zero", "sub_path": "filament/Generic PETG @Sovol Zero.json" }, + { + "name": "Generic PETG @Sovol Zero Hardened Steel nozzle", + "sub_path": "filament/Generic PETG @Sovol Zero Hardened Steel nozzle.json" + }, { "name": "Generic PLA @Sovol SV06 ACE", "sub_path": "filament/Generic PLA @Sovol SV06 ACE.json" @@ -277,6 +345,14 @@ "name": "Generic PLA @Sovol Zero", "sub_path": "filament/Generic PLA @Sovol Zero.json" }, + { + "name": "Generic PLA @Sovol Zero Hardened Steel nozzle", + "sub_path": "filament/Generic PLA @Sovol Zero Hardened Steel nozzle.json" + }, + { + "name": "Generic PLA SPEEDBENCHY @Sovol Zero", + "sub_path": "filament/Generic PLA SPEEDBENCHY @Sovol Zero.json" + }, { "name": "Generic PLA Silk @Sovol SV08 MAX", "sub_path": "filament/Generic PLA Silk @Sovol SV08 MAX.json" @@ -285,6 +361,10 @@ "name": "Generic PLA Silk @Sovol Zero", "sub_path": "filament/Generic PLA Silk @Sovol Zero.json" }, + { + "name": "Generic PLA Silk @Sovol Zero Hardened Steel nozzle", + "sub_path": "filament/Generic PLA Silk @Sovol Zero Hardened Steel nozzle.json" + }, { "name": "Generic TPU @Sovol SV06 ACE", "sub_path": "filament/Generic TPU @Sovol SV06 ACE.json" @@ -312,18 +392,6 @@ { "name": "SUNLU PETG @Sovol SV08 MAX", "sub_path": "filament/SUNLU PETG @Sovol SV08 MAX.json" - }, - { - "name": "Sovol Zero PETG HS Nozzle", - "sub_path": "filament/Sovol Zero PETG HS Nozzle.json" - }, - { - "name": "Sovol Zero PLA Basic HS Nozzle", - "sub_path": "filament/Sovol Zero PLA Basic HS Nozzle.json" - }, - { - "name": "Sovol Zero PLA Silk HS Nozzle", - "sub_path": "filament/Sovol Zero PLA Silk HS Nozzle.json" } ], "machine_list": [ @@ -415,9 +483,45 @@ "name": "Sovol SV08 MAX 0.8 nozzle", "sub_path": "machine/Sovol SV08 MAX 0.8 nozzle.json" }, + { + "name": "Sovol Zero 0.2 nozzle", + "sub_path": "machine/Sovol Zero 0.2 nozzle.json" + }, { "name": "Sovol Zero 0.4 nozzle", "sub_path": "machine/Sovol Zero 0.4 nozzle.json" + }, + { + "name": "Sovol Zero 0.6 nozzle", + "sub_path": "machine/Sovol Zero 0.6 nozzle.json" + }, + { + "name": "Sovol Zero 0.8 nozzle", + "sub_path": "machine/Sovol Zero 0.8 nozzle.json" + }, + { + "name": "Sovol Zero 1.0 nozzle", + "sub_path": "machine/Sovol Zero 1.0 nozzle.json" + }, + { + "name": "Sovol Zero 0.2 Hardened Steel nozzle", + "sub_path": "machine/Sovol Zero 0.2 Hardened Steel nozzle.json" + }, + { + "name": "Sovol Zero 0.4 Hardened Steel nozzle", + "sub_path": "machine/Sovol Zero 0.4 Hardened Steel nozzle.json" + }, + { + "name": "Sovol Zero 0.6 Hardened Steel nozzle", + "sub_path": "machine/Sovol Zero 0.6 Hardened Steel nozzle.json" + }, + { + "name": "Sovol Zero 0.8 Hardened Steel nozzle", + "sub_path": "machine/Sovol Zero 0.8 Hardened Steel nozzle.json" + }, + { + "name": "Sovol Zero 1.0 Hardened Steel nozzle", + "sub_path": "machine/Sovol Zero 1.0 Hardened Steel nozzle.json" } ] } diff --git a/resources/profiles/Sovol/filament/Generic ABS @Sovol Zero.json b/resources/profiles/Sovol/filament/Generic ABS @Sovol Zero.json index 3b737e2a18..7c24b7a0aa 100644 --- a/resources/profiles/Sovol/filament/Generic ABS @Sovol Zero.json +++ b/resources/profiles/Sovol/filament/Generic ABS @Sovol Zero.json @@ -1,10 +1,11 @@ { "type": "filament", "name": "Generic ABS @Sovol Zero", - "inherits": "Generic ABS @System", "renamed_from": "Sovol Zero ABS", + "inherits": "fdm_filament_abs", "from": "system", "setting_id": "g6sSyyIFYJUzlXsp", + "filament_id": "OFY9muEs", "instantiation": "true", "filament_flow_ratio": [ "0.98" @@ -73,6 +74,39 @@ "0" ], "compatible_printers": [ - "Sovol Zero 0.4 nozzle" + "Sovol Zero 0.2 nozzle", + "Sovol Zero 0.4 nozzle", + "Sovol Zero 0.6 nozzle", + "Sovol Zero 0.8 nozzle", + "Sovol Zero 1.0 nozzle", + "Sovol Zero 0.2 Hardened Steel nozzle", + "Sovol Zero 0.4 Hardened Steel nozzle", + "Sovol Zero 0.6 Hardened Steel nozzle", + "Sovol Zero 0.8 Hardened Steel nozzle", + "Sovol Zero 1.0 Hardened Steel nozzle" + ], + "cool_plate_temp": [ + "80" + ], + "eng_plate_temp": [ + "80" + ], + "textured_plate_temp": [ + "80" + ], + "cool_plate_temp_initial_layer": [ + "80" + ], + "eng_plate_temp_initial_layer": [ + "80" + ], + "textured_plate_temp_initial_layer": [ + "80" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ], + "filament_density": [ + "1.10" ] } diff --git a/resources/profiles/Sovol/filament/Generic PC @Sovol Zero.json b/resources/profiles/Sovol/filament/Generic PC @Sovol Zero.json index dd0eb60594..832deb1368 100644 --- a/resources/profiles/Sovol/filament/Generic PC @Sovol Zero.json +++ b/resources/profiles/Sovol/filament/Generic PC @Sovol Zero.json @@ -1,11 +1,12 @@ { "type": "filament", + "filament_id": "OFLakOUI", + "setting_id": "yRKCiPMN6fxibcyg", "name": "Generic PC @Sovol Zero", - "inherits": "Generic PC @System", "renamed_from": "Sovol Zero PC", "from": "system", - "setting_id": "yRKCiPMN6fxibcyg", "instantiation": "true", + "inherits": "fdm_filament_pc", "filament_flow_ratio": [ "0.98" ], @@ -13,7 +14,16 @@ "21" ], "compatible_printers": [ - "Sovol Zero 0.4 nozzle" + "Sovol Zero 0.2 nozzle", + "Sovol Zero 0.4 nozzle", + "Sovol Zero 0.6 nozzle", + "Sovol Zero 0.8 nozzle", + "Sovol Zero 1.0 nozzle", + "Sovol Zero 0.2 Hardened Steel nozzle", + "Sovol Zero 0.4 Hardened Steel nozzle", + "Sovol Zero 0.6 Hardened Steel nozzle", + "Sovol Zero 0.8 Hardened Steel nozzle", + "Sovol Zero 1.0 Hardened Steel nozzle" ], "nozzle_temperature_initial_layer": [ "290" @@ -51,7 +61,9 @@ "slow_down_min_speed": [ "10" ], - "dont_slow_down_outer_wall": "0", + "dont_slow_down_outer_wall": [ + "0" + ], "overhang_fan_speed": [ "20" ], @@ -61,8 +73,19 @@ "temperature_vitrification": [ "60" ], - "additional_cooling_fan_speed": "0", - "activate_air_filtration": "1", - "during_print_exhaust_fan_speed": "50", - "complete_print_exhaust_fan_speed": "50" + "additional_cooling_fan_speed": [ + "0" + ], + "activate_air_filtration": [ + "1" + ], + "during_print_exhaust_fan_speed": [ + "50" + ], + "complete_print_exhaust_fan_speed": [ + "50" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ] } diff --git a/resources/profiles/Sovol/filament/Generic PETG @Sovol Zero Hardened Steel nozzle.json b/resources/profiles/Sovol/filament/Generic PETG @Sovol Zero Hardened Steel nozzle.json new file mode 100644 index 0000000000..ef6a6324e3 --- /dev/null +++ b/resources/profiles/Sovol/filament/Generic PETG @Sovol Zero Hardened Steel nozzle.json @@ -0,0 +1,116 @@ +{ + "type": "filament", + "filament_id": "OFYPdQJh", + "setting_id": "d9QbCESNz3ZLU6eu", + "name": "Generic PETG @Sovol Zero Hardened Steel nozzle", + "renamed_from": "Sovol Zero PETG HS Nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pet", + "filament_flow_ratio": [ + "0.98" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.048" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "nozzle_temperature_initial_layer": [ + "265" + ], + "nozzle_temperature": [ + "250" + ], + "nozzle_temperature_range_low": [ + "230" + ], + "nozzle_temperature_range_high": [ + "280" + ], + "hot_plate_temp": [ + "85" + ], + "hot_plate_temp_initial_layer": [ + "85" + ], + "fan_min_speed": [ + "10" + ], + "fan_max_speed": [ + "40" + ], + "fan_cooling_layer_time": [ + "50" + ], + "full_fan_speed_layer": [ + "3" + ], + "slow_down_layer_time": [ + "10" + ], + "slow_down_min_speed": [ + "10" + ], + "overhang_fan_speed": [ + "70" + ], + "overhang_fan_threshold": [ + "10%" + ], + "temperature_vitrification": [ + "60" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "filament_retraction_length": [ + "0.5" + ], + "filament_z_hop": [ + "0.4" + ], + "activate_air_filtration": [ + "1" + ], + "during_print_exhaust_fan_speed": [ + "50" + ], + "complete_print_exhaust_fan_speed": [ + "50" + ], + "compatible_printers": [ + "Sovol Zero 0.2 Hardened Steel nozzle", + "Sovol Zero 0.4 Hardened Steel nozzle", + "Sovol Zero 0.6 Hardened Steel nozzle", + "Sovol Zero 0.8 Hardened Steel nozzle", + "Sovol Zero 1.0 Hardened Steel nozzle" + ], + "cool_plate_temp": [ + "85" + ], + "eng_plate_temp": [ + "85" + ], + "textured_plate_temp": [ + "85" + ], + "cool_plate_temp_initial_layer": [ + "85" + ], + "eng_plate_temp_initial_layer": [ + "85" + ], + "textured_plate_temp_initial_layer": [ + "85" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ] +} diff --git a/resources/profiles/Sovol/filament/Generic PETG @Sovol Zero.json b/resources/profiles/Sovol/filament/Generic PETG @Sovol Zero.json index a223521d25..b9632637ad 100644 --- a/resources/profiles/Sovol/filament/Generic PETG @Sovol Zero.json +++ b/resources/profiles/Sovol/filament/Generic PETG @Sovol Zero.json @@ -1,16 +1,21 @@ { "type": "filament", + "filament_id": "OFYPdQJh", + "setting_id": "i4OW2eAtXOKdtVNj", "name": "Generic PETG @Sovol Zero", - "inherits": "Generic PETG @System", "renamed_from": "Sovol Zero PETG", "from": "system", - "setting_id": "i4OW2eAtXOKdtVNj", "instantiation": "true", + "inherits": "fdm_filament_pet", "filament_flow_ratio": [ "1.0348" ], - "enable_pressure_advance": "1", - "pressure_advance": "0.046", + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.046" + ], "filament_max_volumetric_speed": [ "15" ], @@ -68,10 +73,44 @@ "filament_z_hop": [ "0.4" ], - "activate_air_filtration": "1", - "during_print_exhaust_fan_speed": "50", - "complete_print_exhaust_fan_speed": "50", + "activate_air_filtration": [ + "1" + ], + "during_print_exhaust_fan_speed": [ + "50" + ], + "complete_print_exhaust_fan_speed": [ + "50" + ], "compatible_printers": [ - "Sovol Zero 0.4 nozzle" + "Sovol Zero 0.2 nozzle", + "Sovol Zero 0.4 nozzle", + "Sovol Zero 0.6 nozzle", + "Sovol Zero 0.8 nozzle", + "Sovol Zero 1.0 nozzle" + ], + "cool_plate_temp": [ + "85" + ], + "eng_plate_temp": [ + "85" + ], + "textured_plate_temp": [ + "85" + ], + "cool_plate_temp_initial_layer": [ + "85" + ], + "eng_plate_temp_initial_layer": [ + "85" + ], + "textured_plate_temp_initial_layer": [ + "85" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ], + "filament_start_gcode": [ + "; filament start gcode\n" ] } diff --git a/resources/profiles/Sovol/filament/Generic PLA @Sovol Zero Hardened Steel nozzle.json b/resources/profiles/Sovol/filament/Generic PLA @Sovol Zero Hardened Steel nozzle.json new file mode 100644 index 0000000000..bba0cbfb51 --- /dev/null +++ b/resources/profiles/Sovol/filament/Generic PLA @Sovol Zero Hardened Steel nozzle.json @@ -0,0 +1,110 @@ +{ + "type": "filament", + "filament_id": "OFDSrzZ8", + "setting_id": "nZgETe4CTpicEjQX", + "name": "Generic PLA @Sovol Zero Hardened Steel nozzle", + "renamed_from": "Sovol Zero PLA Basic HS Nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pla", + "filament_flow_ratio": [ + "1.0348" + ], + "filament_max_volumetric_speed": [ + "21" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.03" + ], + "compatible_printers": [ + "Sovol Zero 0.2 Hardened Steel nozzle", + "Sovol Zero 0.4 Hardened Steel nozzle", + "Sovol Zero 0.6 Hardened Steel nozzle", + "Sovol Zero 0.8 Hardened Steel nozzle", + "Sovol Zero 1.0 Hardened Steel nozzle" + ], + "nozzle_temperature_initial_layer": [ + "245" + ], + "nozzle_temperature": [ + "230" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "fan_min_speed": [ + "70" + ], + "fan_max_speed": [ + "100" + ], + "fan_cooling_layer_time": [ + "80" + ], + "full_fan_speed_layer": [ + "3" + ], + "slow_down_layer_time": [ + "5" + ], + "slow_down_min_speed": [ + "10" + ], + "dont_slow_down_outer_wall": [ + "0" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "temperature_vitrification": [ + "60" + ], + "additional_cooling_fan_speed": [ + "75%" + ], + "activate_air_filtration": [ + "1" + ], + "during_print_exhaust_fan_speed": [ + "80%" + ], + "complete_print_exhaust_fan_speed": [ + "80%" + ], + "cool_plate_temp": [ + "60" + ], + "eng_plate_temp": [ + "60" + ], + "textured_plate_temp": [ + "60" + ], + "cool_plate_temp_initial_layer": [ + "55" + ], + "eng_plate_temp_initial_layer": [ + "55" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ] +} diff --git a/resources/profiles/Sovol/filament/Generic PLA @Sovol Zero.json b/resources/profiles/Sovol/filament/Generic PLA @Sovol Zero.json index 131867f6b8..c8424af4f4 100644 --- a/resources/profiles/Sovol/filament/Generic PLA @Sovol Zero.json +++ b/resources/profiles/Sovol/filament/Generic PLA @Sovol Zero.json @@ -1,21 +1,24 @@ { "type": "filament", + "filament_id": "OFDSrzZ8", + "setting_id": "NNDerIjh7qtuh1I3", "name": "Generic PLA @Sovol Zero", - "inherits": "Generic PLA @System", "renamed_from": "Sovol Zero PLA Basic", "from": "system", - "setting_id": "NNDerIjh7qtuh1I3", "instantiation": "true", + "inherits": "fdm_filament_pla", "filament_flow_ratio": [ "0.98" ], "filament_max_volumetric_speed": [ - "21" + "25" ], - "enable_pressure_advance": "1", - "pressure_advance": "0.032", "compatible_printers": [ - "Sovol Zero 0.4 nozzle" + "Sovol Zero 0.2 nozzle", + "Sovol Zero 0.4 nozzle", + "Sovol Zero 0.6 nozzle", + "Sovol Zero 0.8 nozzle", + "Sovol Zero 1.0 nozzle" ], "nozzle_temperature_initial_layer": [ "230" @@ -24,28 +27,28 @@ "210" ], "nozzle_temperature_range_low": [ - "190" + "180" ], "nozzle_temperature_range_high": [ - "250" + "240" ], "hot_plate_temp": [ - "65" + "60" ], "hot_plate_temp_initial_layer": [ - "65" + "60" ], "fan_min_speed": [ - "70" + "100" ], "fan_max_speed": [ "100" ], "fan_cooling_layer_time": [ - "80" + "60" ], "full_fan_speed_layer": [ - "3" + "2" ], "slow_down_layer_time": [ "5" @@ -53,18 +56,43 @@ "slow_down_min_speed": [ "10" ], - "dont_slow_down_outer_wall": "0", "overhang_fan_speed": [ "100" ], "overhang_fan_threshold": [ - "50%" + "10%" ], "temperature_vitrification": [ + "50" + ], + "filament_z_hop": [ + "0.4" + ], + "filament_retraction_length": [ + "0.4" + ], + "filament_diameter": [ + "1.75" + ], + "cool_plate_temp": [ "60" ], - "additional_cooling_fan_speed": "75%", - "activate_air_filtration": "1", - "during_print_exhaust_fan_speed": "80%", - "complete_print_exhaust_fan_speed": "80%" + "eng_plate_temp": [ + "60" + ], + "textured_plate_temp": [ + "60" + ], + "cool_plate_temp_initial_layer": [ + "55" + ], + "eng_plate_temp_initial_layer": [ + "55" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ] } diff --git a/resources/profiles/Sovol/filament/Generic PLA SPEEDBENCHY @Sovol Zero.json b/resources/profiles/Sovol/filament/Generic PLA SPEEDBENCHY @Sovol Zero.json new file mode 100644 index 0000000000..a9aefc6bd2 --- /dev/null +++ b/resources/profiles/Sovol/filament/Generic PLA SPEEDBENCHY @Sovol Zero.json @@ -0,0 +1,118 @@ +{ + "type": "filament", + "filament_id": "OFIUkWYN", + "setting_id": "MC2InZ7iKDjIGike", + "name": "Generic PLA SPEEDBENCHY @Sovol Zero", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pla", + "filament_flow_ratio": [ + "1" + ], + "filament_max_volumetric_speed": [ + "50" + ], + "compatible_printers": [ + "Sovol Zero 0.4 nozzle", + "Sovol Zero 0.4 Hardened Steel nozzle" + ], + "nozzle_temperature_initial_layer": [ + "245" + ], + "nozzle_temperature": [ + "225" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.032" + ], + "fan_min_speed": [ + "100" + ], + "fan_max_speed": [ + "100" + ], + "fan_cooling_layer_time": [ + "30" + ], + "full_fan_speed_layer": [ + "3" + ], + "slow_down_layer_time": [ + "1.7" + ], + "slow_down_min_speed": [ + "40" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "75%" + ], + "additional_cooling_fan_speed": [ + "100" + ], + "filament_z_hop": [ + "0" + ], + "filament_retraction_length": [ + "0.35" + ], + "filament_retraction_speed": [ + "90" + ], + "filament_deretraction_speed": [ + "90" + ], + "filament_retract_before_wipe": [ + "0%" + ], + "filament_wipe_distance": [ + "2" + ], + "filament_retract_when_changing_layer": [ + "0" + ], + "filament_diameter": [ + "1.75" + ], + "cool_plate_temp": [ + "60" + ], + "eng_plate_temp": [ + "60" + ], + "textured_plate_temp": [ + "60" + ], + "cool_plate_temp_initial_layer": [ + "55" + ], + "eng_plate_temp_initial_layer": [ + "55" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "temperature_vitrification": [ + "100" + ] +} diff --git a/resources/profiles/Sovol/filament/Generic PLA Silk @Sovol Zero Hardened Steel nozzle.json b/resources/profiles/Sovol/filament/Generic PLA Silk @Sovol Zero Hardened Steel nozzle.json new file mode 100644 index 0000000000..7347fa08de --- /dev/null +++ b/resources/profiles/Sovol/filament/Generic PLA Silk @Sovol Zero Hardened Steel nozzle.json @@ -0,0 +1,110 @@ +{ + "type": "filament", + "filament_id": "OFesA6rF", + "setting_id": "LA8X1RsMdV2xNT1o", + "name": "Generic PLA Silk @Sovol Zero Hardened Steel nozzle", + "renamed_from": "Sovol Zero PLA Silk HS Nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pla", + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.027" + ], + "compatible_printers": [ + "Sovol Zero 0.2 Hardened Steel nozzle", + "Sovol Zero 0.4 Hardened Steel nozzle", + "Sovol Zero 0.6 Hardened Steel nozzle", + "Sovol Zero 0.8 Hardened Steel nozzle", + "Sovol Zero 1.0 Hardened Steel nozzle" + ], + "nozzle_temperature_initial_layer": [ + "245" + ], + "nozzle_temperature": [ + "230" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "hot_plate_temp": [ + "65" + ], + "hot_plate_temp_initial_layer": [ + "65" + ], + "fan_min_speed": [ + "70" + ], + "fan_max_speed": [ + "100" + ], + "fan_cooling_layer_time": [ + "80" + ], + "full_fan_speed_layer": [ + "3" + ], + "slow_down_layer_time": [ + "5" + ], + "slow_down_min_speed": [ + "10" + ], + "dont_slow_down_outer_wall": [ + "0" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "temperature_vitrification": [ + "60" + ], + "additional_cooling_fan_speed": [ + "75%" + ], + "activate_air_filtration": [ + "1" + ], + "during_print_exhaust_fan_speed": [ + "80%" + ], + "complete_print_exhaust_fan_speed": [ + "80%" + ], + "cool_plate_temp": [ + "60" + ], + "eng_plate_temp": [ + "60" + ], + "textured_plate_temp": [ + "60" + ], + "cool_plate_temp_initial_layer": [ + "55" + ], + "eng_plate_temp_initial_layer": [ + "55" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ] +} diff --git a/resources/profiles/Sovol/filament/Generic PLA Silk @Sovol Zero.json b/resources/profiles/Sovol/filament/Generic PLA Silk @Sovol Zero.json index 5b46a92d64..6c9c27a00a 100644 --- a/resources/profiles/Sovol/filament/Generic PLA Silk @Sovol Zero.json +++ b/resources/profiles/Sovol/filament/Generic PLA Silk @Sovol Zero.json @@ -1,27 +1,30 @@ { "type": "filament", + "filament_id": "OFesA6rF", + "setting_id": "Se2yKerHRStYtWf5", "name": "Generic PLA Silk @Sovol Zero", - "inherits": "Generic PLA Silk @System", "renamed_from": "Sovol Zero PLA Silk", "from": "system", - "setting_id": "Se2yKerHRStYtWf5", "instantiation": "true", - "filament_multitool_ramming_flow": [ - "20" - ], - "filament_retraction_length": [ - "nil" - ], + "inherits": "fdm_filament_pla", "filament_flow_ratio": [ "0.98" ], "filament_max_volumetric_speed": [ "15" ], - "enable_pressure_advance": "1", - "pressure_advance": "0.029", + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.029" + ], "compatible_printers": [ - "Sovol Zero 0.4 nozzle" + "Sovol Zero 0.2 nozzle", + "Sovol Zero 0.4 nozzle", + "Sovol Zero 0.6 nozzle", + "Sovol Zero 0.8 nozzle", + "Sovol Zero 1.0 nozzle" ], "nozzle_temperature_initial_layer": [ "245" @@ -59,7 +62,9 @@ "slow_down_min_speed": [ "10" ], - "dont_slow_down_outer_wall": "0", + "dont_slow_down_outer_wall": [ + "0" + ], "overhang_fan_speed": [ "100" ], @@ -69,8 +74,43 @@ "temperature_vitrification": [ "60" ], - "additional_cooling_fan_speed": "75%", - "activate_air_filtration": "1", - "during_print_exhaust_fan_speed": "80%", - "complete_print_exhaust_fan_speed": "80%" + "additional_cooling_fan_speed": [ + "75%" + ], + "activate_air_filtration": [ + "1" + ], + "during_print_exhaust_fan_speed": [ + "80%" + ], + "complete_print_exhaust_fan_speed": [ + "80%" + ], + "filament_multitool_ramming_flow": [ + "20" + ], + "filament_retraction_length": [ + "nil" + ], + "cool_plate_temp": [ + "60" + ], + "eng_plate_temp": [ + "60" + ], + "textured_plate_temp": [ + "60" + ], + "cool_plate_temp_initial_layer": [ + "55" + ], + "eng_plate_temp_initial_layer": [ + "55" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ] } diff --git a/resources/profiles/Sovol/filament/Generic TPU @Sovol Zero.json b/resources/profiles/Sovol/filament/Generic TPU @Sovol Zero.json index 8c7c18c523..8624043cf9 100644 --- a/resources/profiles/Sovol/filament/Generic TPU @Sovol Zero.json +++ b/resources/profiles/Sovol/filament/Generic TPU @Sovol Zero.json @@ -1,11 +1,12 @@ { "type": "filament", + "filament_id": "OFgbpcy9", + "setting_id": "MlY6WQ41FE8zDPSV", "name": "Generic TPU @Sovol Zero", - "inherits": "Generic TPU @System", "renamed_from": "Sovol Zero TPU", "from": "system", - "setting_id": "MlY6WQ41FE8zDPSV", "instantiation": "true", + "inherits": "fdm_filament_tpu", "filament_flow_ratio": [ "0.98" ], @@ -60,11 +61,55 @@ "filament_z_hop": [ "0.4" ], - "additional_cooling_fan_speed": "50", - "activate_air_filtration": "1", - "during_print_exhaust_fan_speed": "100", - "complete_print_exhaust_fan_speed": "50", + "additional_cooling_fan_speed": [ + "50" + ], + "activate_air_filtration": [ + "1" + ], + "during_print_exhaust_fan_speed": [ + "100" + ], + "complete_print_exhaust_fan_speed": [ + "50" + ], "compatible_printers": [ - "Sovol Zero 0.4 nozzle" + "Sovol Zero 0.2 nozzle", + "Sovol Zero 0.4 nozzle", + "Sovol Zero 0.6 nozzle", + "Sovol Zero 0.8 nozzle", + "Sovol Zero 1.0 nozzle", + "Sovol Zero 0.2 Hardened Steel nozzle", + "Sovol Zero 0.4 Hardened Steel nozzle", + "Sovol Zero 0.6 Hardened Steel nozzle", + "Sovol Zero 0.8 Hardened Steel nozzle", + "Sovol Zero 1.0 Hardened Steel nozzle" + ], + "cool_plate_temp": [ + "60" + ], + "eng_plate_temp": [ + "60" + ], + "textured_plate_temp": [ + "60" + ], + "cool_plate_temp_initial_layer": [ + "55" + ], + "eng_plate_temp_initial_layer": [ + "55" + ], + "textured_plate_temp_initial_layer": [ + "55" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ], + "filament_retraction_length": [ + "nil" + ], + "filament_start_gcode": [ + "; filament start gcode\n" ] } 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 deleted file mode 100644 index 6dfb630e0a..0000000000 --- a/resources/profiles/Sovol/filament/Sovol Zero PLA Basic HS Nozzle.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "type": "filament", - "name": "Sovol Zero PLA Basic HS Nozzle", - "inherits": "Generic PLA @System", - "from": "system", - "setting_id": "i9wDnSEIrOBPbOZl", - "filament_id": "OFzB4uOs", - "instantiation": "true", - "filament_flow_ratio": [ - "1.0348" - ], - "filament_max_volumetric_speed": [ - "21" - ], - "enable_pressure_advance": "1", - "pressure_advance": "0.03", - "compatible_printers": [ - "Sovol Zero 0.4 nozzle" - ], - "nozzle_temperature_initial_layer": [ - "245" - ], - "nozzle_temperature": [ - "230" - ], - "nozzle_temperature_range_low": [ - "190" - ], - "nozzle_temperature_range_high": [ - "250" - ], - "hot_plate_temp": [ - "65" - ], - "hot_plate_temp_initial_layer": [ - "65" - ], - "fan_min_speed": [ - "70" - ], - "fan_max_speed": [ - "100" - ], - "fan_cooling_layer_time": [ - "80" - ], - "full_fan_speed_layer": [ - "3" - ], - "slow_down_layer_time": [ - "5" - ], - "slow_down_min_speed": [ - "10" - ], - "dont_slow_down_outer_wall": "0", - "overhang_fan_speed": [ - "100" - ], - "overhang_fan_threshold": [ - "50%" - ], - "temperature_vitrification": [ - "60" - ], - "additional_cooling_fan_speed": "75%", - "activate_air_filtration": "1", - "during_print_exhaust_fan_speed": "80%", - "complete_print_exhaust_fan_speed": "80%" -} 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 deleted file mode 100644 index 97e4050b8c..0000000000 --- a/resources/profiles/Sovol/filament/Sovol Zero PLA Silk HS Nozzle.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "type": "filament", - "name": "Sovol Zero PLA Silk HS Nozzle", - "inherits": "Generic PLA @System", - "from": "system", - "setting_id": "XxEJBNFLRltR2Xwn", - "filament_id": "OFAO9A7J", - "instantiation": "true", - "filament_flow_ratio": [ - "0.98" - ], - "filament_max_volumetric_speed": [ - "15" - ], - "enable_pressure_advance": "1", - "pressure_advance": "0.027", - "compatible_printers": [ - "Sovol Zero 0.4 nozzle" - ], - "nozzle_temperature_initial_layer": [ - "245" - ], - "nozzle_temperature": [ - "230" - ], - "nozzle_temperature_range_low": [ - "190" - ], - "nozzle_temperature_range_high": [ - "250" - ], - "hot_plate_temp": [ - "65" - ], - "hot_plate_temp_initial_layer": [ - "65" - ], - "fan_min_speed": [ - "70" - ], - "fan_max_speed": [ - "100" - ], - "fan_cooling_layer_time": [ - "80" - ], - "full_fan_speed_layer": [ - "3" - ], - "slow_down_layer_time": [ - "5" - ], - "slow_down_min_speed": [ - "10" - ], - "dont_slow_down_outer_wall": "0", - "overhang_fan_speed": [ - "100" - ], - "overhang_fan_threshold": [ - "50%" - ], - "temperature_vitrification": [ - "60" - ], - "additional_cooling_fan_speed": "75%", - "activate_air_filtration": "1", - "during_print_exhaust_fan_speed": "80%", - "complete_print_exhaust_fan_speed": "80%" -} diff --git a/resources/profiles/Sovol/machine/Sovol Zero 0.2 Hardened Steel nozzle.json b/resources/profiles/Sovol/machine/Sovol Zero 0.2 Hardened Steel nozzle.json new file mode 100644 index 0000000000..89ee9c1c09 --- /dev/null +++ b/resources/profiles/Sovol/machine/Sovol Zero 0.2 Hardened Steel nozzle.json @@ -0,0 +1,19 @@ +{ + "type": "machine", + "name": "Sovol Zero 0.2 Hardened Steel nozzle", + "inherits": "Sovol Zero 0.2 nozzle", + "from": "system", + "setting_id": "OkvEInEyzUUJzw9K", + "instantiation": "true", + "printer_model": "Sovol Zero", + "printer_variant": "0.2HS", + "nozzle_diameter": [ + "0.2" + ], + "default_filament_profile": [ + "Generic PLA @Sovol Zero Hardened Steel nozzle" + ], + "nozzle_type": [ + "hardened_steel" + ] +} diff --git a/resources/profiles/Sovol/machine/Sovol Zero 0.2 nozzle.json b/resources/profiles/Sovol/machine/Sovol Zero 0.2 nozzle.json new file mode 100644 index 0000000000..33fb16508a --- /dev/null +++ b/resources/profiles/Sovol/machine/Sovol Zero 0.2 nozzle.json @@ -0,0 +1,118 @@ +{ + "type": "machine", + "setting_id": "MAF2n6b8uoY92qVH", + "name": "Sovol Zero 0.2 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_machine_common", + "printer_model": "Sovol Zero", + "default_print_profile": "0.10mm Standard @Sovol Zero 0.2 nozzle", + "printer_variant": "0.2", + "nozzle_diameter": [ + "0.2" + ], + "min_layer_height": [ + "0.04" + ], + "max_layer_height": [ + "0.2" + ], + "retract_before_wipe": [ + "0%" + ], + "printable_area": [ + "0x0", + "152.4x0", + "152.4x152.4", + "0x152.4" + ], + "printable_height": "152.4", + "gcode_flavor": "klipper", + "retraction_length": [ + "1.8" + ], + "machine_max_speed_e": [ + "50" + ], + "machine_max_speed_x": [ + "1200" + ], + "machine_max_speed_y": [ + "1200" + ], + "machine_max_speed_z": [ + "30" + ], + "machine_max_acceleration_e": [ + "20000" + ], + "machine_max_acceleration_extruding": [ + "40000" + ], + "machine_max_acceleration_retracting": [ + "20000" + ], + "machine_max_acceleration_travel": [ + "40000" + ], + "machine_max_acceleration_x": [ + "40000" + ], + "machine_max_acceleration_y": [ + "40000" + ], + "machine_max_acceleration_z": [ + "1000" + ], + "machine_max_jerk_e": [ + "2.5" + ], + "machine_max_jerk_x": [ + "5" + ], + "machine_max_jerk_y": [ + "5" + ], + "machine_max_jerk_z": [ + "0.5" + ], + "z_hop": [ + "0.6" + ], + "retraction_speed": [ + "40" + ], + "deretraction_speed": [ + "40" + ], + "retraction_minimum_travel": [ + "0" + ], + "retract_length_toolchange": [ + "2" + ], + "wipe": [ + "1" + ], + "wipe_distance": [ + "3" + ], + "z_hop_types": [ + "Auto Lift" + ], + "thumbnails": [ + "300x300", + "32x32" + ], + "retract_lift_below": [ + "150" + ], + "auxiliary_fan": "1", + "thumbnails_format": "PNG", + "before_layer_change_gcode": "TIMELAPSE_TAKE_FRAME\nG92 E0\nSET_PRINT_STATS_INFO CURRENT_LAYER=[layer_num]\n", + "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": [ + "Generic PLA @Sovol Zero" + ] +} diff --git a/resources/profiles/Sovol/machine/Sovol Zero 0.4 Hardened Steel nozzle.json b/resources/profiles/Sovol/machine/Sovol Zero 0.4 Hardened Steel nozzle.json new file mode 100644 index 0000000000..515c4cf696 --- /dev/null +++ b/resources/profiles/Sovol/machine/Sovol Zero 0.4 Hardened Steel nozzle.json @@ -0,0 +1,19 @@ +{ + "type": "machine", + "name": "Sovol Zero 0.4 Hardened Steel nozzle", + "inherits": "Sovol Zero 0.4 nozzle", + "from": "system", + "setting_id": "RqwHKS8MYRdoeJPi", + "instantiation": "true", + "printer_model": "Sovol Zero", + "printer_variant": "0.4HS", + "nozzle_diameter": [ + "0.4" + ], + "default_filament_profile": [ + "Generic PLA @Sovol Zero Hardened Steel nozzle" + ], + "nozzle_type": [ + "hardened_steel" + ] +} 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 a5699a9eed..932c5b9121 100644 --- a/resources/profiles/Sovol/machine/Sovol Zero 0.4 nozzle.json +++ b/resources/profiles/Sovol/machine/Sovol Zero 0.4 nozzle.json @@ -1,18 +1,24 @@ { "type": "machine", - "name": "Sovol Zero 0.4 nozzle", - "inherits": "fdm_machine_common", - "from": "system", "setting_id": "QclEa2nmpBiii6Y0", + "name": "Sovol Zero 0.4 nozzle", + "from": "system", "instantiation": "true", + "inherits": "fdm_machine_common", "printer_model": "Sovol Zero", "default_print_profile": "0.20mm Standard @Sovol Zero 0.4 nozzle", "printer_variant": "0.4", "nozzle_diameter": [ "0.4" ], + "min_layer_height": [ + "0.08" + ], + "max_layer_height": [ + "0.32" + ], "retract_before_wipe": [ - "100%" + "0%" ], "printable_area": [ "0x0", @@ -23,7 +29,7 @@ "printable_height": "152.4", "gcode_flavor": "klipper", "retraction_length": [ - "0.8" + "1.8" ], "machine_max_speed_e": [ "50" @@ -71,7 +77,7 @@ "0.5" ], "z_hop": [ - "0.4" + "0.6" ], "retraction_speed": [ "40" @@ -89,7 +95,7 @@ "1" ], "wipe_distance": [ - "2" + "3" ], "z_hop_types": [ "Auto Lift" @@ -104,7 +110,7 @@ "auxiliary_fan": "1", "thumbnails_format": "PNG", "before_layer_change_gcode": "TIMELAPSE_TAKE_FRAME\nG92 E0\nSET_PRINT_STATS_INFO CURRENT_LAYER=[layer_num]\n", - "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_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": [ "Generic PLA @Sovol Zero" diff --git a/resources/profiles/Sovol/machine/Sovol Zero 0.6 Hardened Steel nozzle.json b/resources/profiles/Sovol/machine/Sovol Zero 0.6 Hardened Steel nozzle.json new file mode 100644 index 0000000000..5b53d59ae2 --- /dev/null +++ b/resources/profiles/Sovol/machine/Sovol Zero 0.6 Hardened Steel nozzle.json @@ -0,0 +1,19 @@ +{ + "type": "machine", + "name": "Sovol Zero 0.6 Hardened Steel nozzle", + "inherits": "Sovol Zero 0.6 nozzle", + "from": "system", + "setting_id": "s3N3FJkWrzOylFm8", + "instantiation": "true", + "printer_model": "Sovol Zero", + "printer_variant": "0.6HS", + "nozzle_diameter": [ + "0.6" + ], + "default_filament_profile": [ + "Generic PLA @Sovol Zero Hardened Steel nozzle" + ], + "nozzle_type": [ + "hardened_steel" + ] +} diff --git a/resources/profiles/Sovol/machine/Sovol Zero 0.6 nozzle.json b/resources/profiles/Sovol/machine/Sovol Zero 0.6 nozzle.json new file mode 100644 index 0000000000..e2cfc7ccc5 --- /dev/null +++ b/resources/profiles/Sovol/machine/Sovol Zero 0.6 nozzle.json @@ -0,0 +1,118 @@ +{ + "type": "machine", + "setting_id": "BlngL0WExXTeyrXg", + "name": "Sovol Zero 0.6 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_machine_common", + "printer_model": "Sovol Zero", + "default_print_profile": "0.30mm Standard @Sovol Zero 0.6 nozzle", + "printer_variant": "0.6", + "nozzle_diameter": [ + "0.6" + ], + "min_layer_height": [ + "0.12" + ], + "max_layer_height": [ + "0.48" + ], + "retract_before_wipe": [ + "0%" + ], + "printable_area": [ + "0x0", + "152.4x0", + "152.4x152.4", + "0x152.4" + ], + "printable_height": "152.4", + "gcode_flavor": "klipper", + "retraction_length": [ + "3.0" + ], + "machine_max_speed_e": [ + "50" + ], + "machine_max_speed_x": [ + "1200" + ], + "machine_max_speed_y": [ + "1200" + ], + "machine_max_speed_z": [ + "30" + ], + "machine_max_acceleration_e": [ + "20000" + ], + "machine_max_acceleration_extruding": [ + "40000" + ], + "machine_max_acceleration_retracting": [ + "20000" + ], + "machine_max_acceleration_travel": [ + "40000" + ], + "machine_max_acceleration_x": [ + "40000" + ], + "machine_max_acceleration_y": [ + "40000" + ], + "machine_max_acceleration_z": [ + "1000" + ], + "machine_max_jerk_e": [ + "2.5" + ], + "machine_max_jerk_x": [ + "5" + ], + "machine_max_jerk_y": [ + "5" + ], + "machine_max_jerk_z": [ + "0.5" + ], + "z_hop": [ + "0.6" + ], + "retraction_speed": [ + "40" + ], + "deretraction_speed": [ + "40" + ], + "retraction_minimum_travel": [ + "0" + ], + "retract_length_toolchange": [ + "2" + ], + "wipe": [ + "1" + ], + "wipe_distance": [ + "3" + ], + "z_hop_types": [ + "Auto Lift" + ], + "thumbnails": [ + "300x300", + "32x32" + ], + "retract_lift_below": [ + "150" + ], + "auxiliary_fan": "1", + "thumbnails_format": "PNG", + "before_layer_change_gcode": "TIMELAPSE_TAKE_FRAME\nG92 E0\nSET_PRINT_STATS_INFO CURRENT_LAYER=[layer_num]\n", + "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": [ + "Generic PLA @Sovol Zero" + ] +} diff --git a/resources/profiles/Sovol/machine/Sovol Zero 0.8 Hardened Steel nozzle.json b/resources/profiles/Sovol/machine/Sovol Zero 0.8 Hardened Steel nozzle.json new file mode 100644 index 0000000000..db6bd740fb --- /dev/null +++ b/resources/profiles/Sovol/machine/Sovol Zero 0.8 Hardened Steel nozzle.json @@ -0,0 +1,19 @@ +{ + "type": "machine", + "name": "Sovol Zero 0.8 Hardened Steel nozzle", + "inherits": "Sovol Zero 0.8 nozzle", + "from": "system", + "setting_id": "houacf8sQ3bLozqD", + "instantiation": "true", + "printer_model": "Sovol Zero", + "printer_variant": "0.8HS", + "nozzle_diameter": [ + "0.8" + ], + "default_filament_profile": [ + "Generic PLA @Sovol Zero Hardened Steel nozzle" + ], + "nozzle_type": [ + "hardened_steel" + ] +} diff --git a/resources/profiles/Sovol/machine/Sovol Zero 0.8 nozzle.json b/resources/profiles/Sovol/machine/Sovol Zero 0.8 nozzle.json new file mode 100644 index 0000000000..bc67a64ce5 --- /dev/null +++ b/resources/profiles/Sovol/machine/Sovol Zero 0.8 nozzle.json @@ -0,0 +1,118 @@ +{ + "type": "machine", + "setting_id": "DDpJMY1A2r4k1Cho", + "name": "Sovol Zero 0.8 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_machine_common", + "printer_model": "Sovol Zero", + "default_print_profile": "0.40mm Standard @Sovol Zero 0.8 nozzle", + "printer_variant": "0.8", + "nozzle_diameter": [ + "0.8" + ], + "min_layer_height": [ + "0.08" + ], + "max_layer_height": [ + "0.64" + ], + "retract_before_wipe": [ + "0%" + ], + "printable_area": [ + "0x0", + "152.4x0", + "152.4x152.4", + "0x152.4" + ], + "printable_height": "152.4", + "gcode_flavor": "klipper", + "retraction_length": [ + "3.0" + ], + "machine_max_speed_e": [ + "50" + ], + "machine_max_speed_x": [ + "1200" + ], + "machine_max_speed_y": [ + "1200" + ], + "machine_max_speed_z": [ + "30" + ], + "machine_max_acceleration_e": [ + "20000" + ], + "machine_max_acceleration_extruding": [ + "40000" + ], + "machine_max_acceleration_retracting": [ + "20000" + ], + "machine_max_acceleration_travel": [ + "40000" + ], + "machine_max_acceleration_x": [ + "40000" + ], + "machine_max_acceleration_y": [ + "40000" + ], + "machine_max_acceleration_z": [ + "1000" + ], + "machine_max_jerk_e": [ + "2.5" + ], + "machine_max_jerk_x": [ + "5" + ], + "machine_max_jerk_y": [ + "5" + ], + "machine_max_jerk_z": [ + "0.5" + ], + "z_hop": [ + "0.6" + ], + "retraction_speed": [ + "40" + ], + "deretraction_speed": [ + "40" + ], + "retraction_minimum_travel": [ + "0" + ], + "retract_length_toolchange": [ + "2" + ], + "wipe": [ + "1" + ], + "wipe_distance": [ + "3" + ], + "z_hop_types": [ + "Auto Lift" + ], + "thumbnails": [ + "300x300", + "32x32" + ], + "retract_lift_below": [ + "150" + ], + "auxiliary_fan": "1", + "thumbnails_format": "PNG", + "before_layer_change_gcode": "TIMELAPSE_TAKE_FRAME\nG92 E0\nSET_PRINT_STATS_INFO CURRENT_LAYER=[layer_num]\n", + "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": [ + "Generic PLA @Sovol Zero" + ] +} diff --git a/resources/profiles/Sovol/machine/Sovol Zero 1.0 Hardened Steel nozzle.json b/resources/profiles/Sovol/machine/Sovol Zero 1.0 Hardened Steel nozzle.json new file mode 100644 index 0000000000..73b99e55ef --- /dev/null +++ b/resources/profiles/Sovol/machine/Sovol Zero 1.0 Hardened Steel nozzle.json @@ -0,0 +1,19 @@ +{ + "type": "machine", + "name": "Sovol Zero 1.0 Hardened Steel nozzle", + "inherits": "Sovol Zero 1.0 nozzle", + "from": "system", + "setting_id": "sqlEiL0in8LSjmmn", + "instantiation": "true", + "printer_model": "Sovol Zero", + "printer_variant": "1.0HS", + "nozzle_diameter": [ + "1.0" + ], + "default_filament_profile": [ + "Generic PLA @Sovol Zero Hardened Steel nozzle" + ], + "nozzle_type": [ + "hardened_steel" + ] +} diff --git a/resources/profiles/Sovol/machine/Sovol Zero 1.0 nozzle.json b/resources/profiles/Sovol/machine/Sovol Zero 1.0 nozzle.json new file mode 100644 index 0000000000..beb6db80bd --- /dev/null +++ b/resources/profiles/Sovol/machine/Sovol Zero 1.0 nozzle.json @@ -0,0 +1,118 @@ +{ + "type": "machine", + "setting_id": "CGunT3KHnCqEAlrN", + "name": "Sovol Zero 1.0 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_machine_common", + "printer_model": "Sovol Zero", + "default_print_profile": "0.50mm Standard @Sovol Zero 1.0 nozzle", + "printer_variant": "1.0", + "nozzle_diameter": [ + "1.0" + ], + "min_layer_height": [ + "0.16" + ], + "max_layer_height": [ + "0.8" + ], + "retract_before_wipe": [ + "0%" + ], + "printable_area": [ + "0x0", + "152.4x0", + "152.4x152.4", + "0x152.4" + ], + "printable_height": "152.4", + "gcode_flavor": "klipper", + "retraction_length": [ + "3.0" + ], + "machine_max_speed_e": [ + "50" + ], + "machine_max_speed_x": [ + "1200" + ], + "machine_max_speed_y": [ + "1200" + ], + "machine_max_speed_z": [ + "30" + ], + "machine_max_acceleration_e": [ + "20000" + ], + "machine_max_acceleration_extruding": [ + "40000" + ], + "machine_max_acceleration_retracting": [ + "20000" + ], + "machine_max_acceleration_travel": [ + "40000" + ], + "machine_max_acceleration_x": [ + "40000" + ], + "machine_max_acceleration_y": [ + "40000" + ], + "machine_max_acceleration_z": [ + "1000" + ], + "machine_max_jerk_e": [ + "2.5" + ], + "machine_max_jerk_x": [ + "5" + ], + "machine_max_jerk_y": [ + "5" + ], + "machine_max_jerk_z": [ + "0.5" + ], + "z_hop": [ + "0.6" + ], + "retraction_speed": [ + "40" + ], + "deretraction_speed": [ + "40" + ], + "retraction_minimum_travel": [ + "0" + ], + "retract_length_toolchange": [ + "2" + ], + "wipe": [ + "1" + ], + "wipe_distance": [ + "3" + ], + "z_hop_types": [ + "Auto Lift" + ], + "thumbnails": [ + "300x300", + "32x32" + ], + "retract_lift_below": [ + "150" + ], + "auxiliary_fan": "1", + "thumbnails_format": "PNG", + "before_layer_change_gcode": "TIMELAPSE_TAKE_FRAME\nG92 E0\nSET_PRINT_STATS_INFO CURRENT_LAYER=[layer_num]\n", + "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": [ + "Generic PLA @Sovol Zero" + ] +} diff --git a/resources/profiles/Sovol/machine/Sovol Zero.json b/resources/profiles/Sovol/machine/Sovol Zero.json index 6f99e8f8d0..1c67135cf9 100644 --- a/resources/profiles/Sovol/machine/Sovol Zero.json +++ b/resources/profiles/Sovol/machine/Sovol Zero.json @@ -2,11 +2,11 @@ "type": "machine_model", "name": "Sovol Zero", "model_id": "Sovol-Zero", - "nozzle_diameter": "0.4", + "nozzle_diameter": "0.2;0.4;0.6;0.8;1.0;0.2HS;0.4HS;0.6HS;0.8HS;1.0HS", "machine_tech": "FFF", "family": "Sovol", "bed_model": "sovol_zero_buildplate_model.stl", "bed_texture": "sovol_zero_buildplate_texture.svg", "hotend_model": "", - "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" + "default_materials": "Generic PLA @Sovol Zero;Generic PLA SPEEDBENCHY @Sovol Zero;Generic PLA @Sovol Zero Hardened Steel nozzle;Generic PLA Silk @Sovol Zero;Generic PLA Silk @Sovol Zero Hardened Steel nozzle;Generic ABS @Sovol Zero;Generic PETG @Sovol Zero;Generic PETG @Sovol Zero Hardened Steel nozzle;Generic TPU @Sovol Zero;Generic PC @Sovol Zero" } diff --git a/resources/profiles/Sovol/process/0.06mm Quality @Sovol Zero 0.2 nozzle.json b/resources/profiles/Sovol/process/0.06mm Quality @Sovol Zero 0.2 nozzle.json new file mode 100644 index 0000000000..908bfd9813 --- /dev/null +++ b/resources/profiles/Sovol/process/0.06mm Quality @Sovol Zero 0.2 nozzle.json @@ -0,0 +1,36 @@ +{ + "type": "process", + "name": "0.06mm Quality @Sovol Zero 0.2 nozzle", + "inherits": "fdm_process_zero", + "from": "system", + "setting_id": "fWP7jaL7sJmmZ6QN", + "instantiation": "true", + "layer_height": "0.06", + "bottom_shell_layers": "8", + "bottom_shell_thickness": "0.8", + "bridge_speed": "30", + "outer_wall_acceleration": "10000", + "top_surface_acceleration": "5000", + "outer_wall_line_width": "0.21", + "line_width": "0.21", + "sparse_infill_density": "15%", + "inner_wall_acceleration": "12000", + "initial_layer_print_height": "0.06", + "initial_layer_line_width": "0.3", + "infill_wall_overlap": "18", + "inner_wall_line_width": "0.22", + "wall_loops": "3", + "internal_solid_infill_line_width": "0.21", + "sparse_infill_line_width": "0.21", + "support_top_z_distance": "0.10", + "support_line_width": "0.21", + "tree_support_tip_diameter": "0.21", + "support_speed": "100", + "top_surface_line_width": "0.21", + "top_shell_layers": "8", + "top_shell_thickness": "1", + "compatible_printers": [ + "Sovol Zero 0.2 nozzle", + "Sovol Zero 0.2 Hardened Steel nozzle" + ] +} diff --git a/resources/profiles/Sovol/process/0.10mm Standard @Sovol Zero 0.2 nozzle.json b/resources/profiles/Sovol/process/0.10mm Standard @Sovol Zero 0.2 nozzle.json new file mode 100644 index 0000000000..15540bb172 --- /dev/null +++ b/resources/profiles/Sovol/process/0.10mm Standard @Sovol Zero 0.2 nozzle.json @@ -0,0 +1,36 @@ +{ + "type": "process", + "name": "0.10mm Standard @Sovol Zero 0.2 nozzle", + "inherits": "fdm_process_zero", + "from": "system", + "setting_id": "Gql3487jsaTXyuYZ", + "instantiation": "true", + "layer_height": "0.10", + "bottom_shell_layers": "4", + "bottom_shell_thickness": "0.8", + "bridge_speed": "50", + "outer_wall_acceleration": "10000", + "top_surface_acceleration": "5000", + "outer_wall_line_width": "0.22", + "line_width": "0.22", + "sparse_infill_density": "15%", + "inner_wall_acceleration": "12000", + "initial_layer_print_height": "0.12", + "initial_layer_line_width": "0.3", + "infill_wall_overlap": "20", + "inner_wall_line_width": "0.22", + "wall_loops": "2", + "internal_solid_infill_line_width": "0.22", + "sparse_infill_line_width": "0.22", + "support_top_z_distance": "0.20", + "support_line_width": "0.22", + "tree_support_tip_diameter": "0.22", + "support_speed": "100", + "top_surface_line_width": "0.22", + "top_shell_layers": "4", + "top_shell_thickness": "1", + "compatible_printers": [ + "Sovol Zero 0.2 nozzle", + "Sovol Zero 0.2 Hardened Steel nozzle" + ] +} diff --git a/resources/profiles/Sovol/process/0.12mm Quality @Sovol Zero 0.4 nozzle.json b/resources/profiles/Sovol/process/0.12mm Quality @Sovol Zero 0.4 nozzle.json new file mode 100644 index 0000000000..c1cc06a737 --- /dev/null +++ b/resources/profiles/Sovol/process/0.12mm Quality @Sovol Zero 0.4 nozzle.json @@ -0,0 +1,35 @@ +{ + "type": "process", + "setting_id": "CaEopiv2Wg6pQJjH", + "name": "0.12mm Quality @Sovol Zero 0.4 nozzle", + "from": "system", + "inherits": "fdm_process_zero", + "instantiation": "true", + "layer_height": "0.12", + "bottom_shell_layers": "8", + "bottom_shell_thickness": "0.8", + "bridge_speed": "30", + "outer_wall_acceleration": "10000", + "top_surface_acceleration": "5000", + "outer_wall_line_width": "0.42", + "line_width": "0.42", + "sparse_infill_density": "15%", + "inner_wall_acceleration": "12000", + "initial_layer_print_height": "0.12", + "initial_layer_line_width": "0.6", + "sparse_infill_line_width": "0.42", + "infill_wall_overlap": "18", + "inner_wall_line_width": "0.44", + "wall_loops": "3", + "support_top_z_distance": "0.10", + "support_line_width": "0.42", + "tree_support_tip_diameter": "0.42", + "support_speed": "100", + "top_surface_line_width": "0.42", + "internal_solid_infill_line_width": "0.42", + "top_shell_layers": "8", + "compatible_printers": [ + "Sovol Zero 0.4 nozzle", + "Sovol Zero 0.4 Hardened Steel nozzle" + ] +} diff --git a/resources/profiles/Sovol/process/0.14mm Fast @Sovol Zero 0.2 nozzle.json b/resources/profiles/Sovol/process/0.14mm Fast @Sovol Zero 0.2 nozzle.json new file mode 100644 index 0000000000..79fe17eb39 --- /dev/null +++ b/resources/profiles/Sovol/process/0.14mm Fast @Sovol Zero 0.2 nozzle.json @@ -0,0 +1,36 @@ +{ + "type": "process", + "name": "0.14mm Fast @Sovol Zero 0.2 nozzle", + "inherits": "fdm_process_zero", + "from": "system", + "setting_id": "I9yoyCcGGTRrDoKu", + "instantiation": "true", + "layer_height": "0.14", + "bottom_shell_layers": "3", + "bottom_shell_thickness": "0", + "bridge_speed": "60", + "outer_wall_acceleration": "22000", + "top_surface_acceleration": "22000", + "outer_wall_line_width": "0.24", + "line_width": "0.24", + "sparse_infill_density": "10%", + "inner_wall_acceleration": "28000", + "initial_layer_print_height": "0.14", + "initial_layer_line_width": "0.3", + "infill_wall_overlap": "20", + "inner_wall_line_width": "0.24", + "wall_loops": "2", + "internal_solid_infill_line_width": "0.24", + "sparse_infill_line_width": "0.24", + "support_top_z_distance": "0.30", + "support_line_width": "0.24", + "tree_support_tip_diameter": "0.24", + "support_speed": "120", + "top_surface_line_width": "0.24", + "top_shell_layers": "4", + "top_shell_thickness": "1", + "compatible_printers": [ + "Sovol Zero 0.2 nozzle", + "Sovol Zero 0.2 Hardened Steel nozzle" + ] +} diff --git a/resources/profiles/Sovol/process/0.15mm Quality @Sovol Zero 0.6 nozzle.json b/resources/profiles/Sovol/process/0.15mm Quality @Sovol Zero 0.6 nozzle.json new file mode 100644 index 0000000000..f532985258 --- /dev/null +++ b/resources/profiles/Sovol/process/0.15mm Quality @Sovol Zero 0.6 nozzle.json @@ -0,0 +1,34 @@ +{ + "type": "process", + "setting_id": "IfDpa3vM99D4ytny", + "name": "0.15mm Quality @Sovol Zero 0.6 nozzle", + "from": "system", + "inherits": "fdm_process_zero", + "instantiation": "true", + "layer_height": "0.15", + "bottom_shell_layers": "5", + "bottom_shell_thickness": "0.8", + "bridge_speed": "30", + "outer_wall_acceleration": "10000", + "top_surface_acceleration": "5000", + "outer_wall_line_width": "0.63", + "line_width": "0.63", + "sparse_infill_density": "15%", + "inner_wall_acceleration": "12000", + "initial_layer_line_width": "0.9", + "sparse_infill_line_width": "0.63", + "infill_wall_overlap": "18", + "inner_wall_line_width": "0.66", + "wall_loops": "3", + "support_top_z_distance": "0.15", + "support_line_width": "0.63", + "tree_support_tip_diameter": "0.63", + "support_speed": "100", + "top_surface_line_width": "0.63", + "top_shell_layers": "5", + "internal_solid_infill_line_width": "0.63", + "compatible_printers": [ + "Sovol Zero 0.6 nozzle", + "Sovol Zero 0.6 Hardened Steel nozzle" + ] +} diff --git a/resources/profiles/Sovol/process/0.20mm Quality @Sovol Zero 0.8 nozzle.json b/resources/profiles/Sovol/process/0.20mm Quality @Sovol Zero 0.8 nozzle.json new file mode 100644 index 0000000000..c9774c6d65 --- /dev/null +++ b/resources/profiles/Sovol/process/0.20mm Quality @Sovol Zero 0.8 nozzle.json @@ -0,0 +1,42 @@ +{ + "type": "process", + "name": "0.20mm Quality @Sovol Zero 0.8 nozzle", + "inherits": "fdm_process_zero", + "from": "system", + "setting_id": "MSxikpQZNYdoBynZ", + "instantiation": "true", + "layer_height": "0.20", + "bottom_shell_layers": "4", + "bottom_shell_thickness": "0.8", + "bridge_speed": "30", + "outer_wall_acceleration": "10000", + "top_surface_acceleration": "5000", + "outer_wall_line_width": "0.84", + "line_width": "0.84", + "sparse_infill_density": "15%", + "inner_wall_acceleration": "12000", + "initial_layer_print_height": "0.36", + "initial_layer_line_width": "1.2", + "sparse_infill_line_width": "0.84", + "infill_wall_overlap": "18", + "inner_wall_line_width": "0.88", + "wall_loops": "3", + "support_top_z_distance": "0.20", + "support_line_width": "0.84", + "tree_support_tip_diameter": "0.84", + "support_speed": "100", + "top_surface_line_width": "0.84", + "top_shell_layers": "4", + "outer_wall_speed": "350", + "inner_wall_speed": "400", + "small_perimeter_speed": "50%", + "internal_solid_infill_speed": "200", + "internal_solid_infill_line_width": "0.84", + "top_surface_speed": "200", + "gap_infill_speed": "200", + "sparse_infill_speed": "500", + "compatible_printers": [ + "Sovol Zero 0.8 nozzle", + "Sovol Zero 0.8 Hardened Steel nozzle" + ] +} diff --git a/resources/profiles/Sovol/process/0.20mm Standard @Sovol Zero 0.4 nozzle.json b/resources/profiles/Sovol/process/0.20mm Standard @Sovol Zero 0.4 nozzle.json index 323553beaa..d8820163d6 100644 --- a/resources/profiles/Sovol/process/0.20mm Standard @Sovol Zero 0.4 nozzle.json +++ b/resources/profiles/Sovol/process/0.20mm Standard @Sovol Zero 0.4 nozzle.json @@ -1,141 +1,36 @@ { "type": "process", - "name": "0.20mm Standard @Sovol Zero 0.4 nozzle", - "inherits": "fdm_process_common", - "from": "system", "setting_id": "ShJTVnJ492No1j2j", + "name": "0.20mm Standard @Sovol Zero 0.4 nozzle", + "from": "system", + "inherits": "fdm_process_zero", "instantiation": "true", - "reduce_crossing_wall": "1", - "max_travel_detour_distance": "100%", "layer_height": "0.20", - "bottom_surface_pattern": "monotonic", - "bottom_shell_layers": "3", - "bottom_shell_thickness": "0", - "bridge_flow": "1.2", - "internal_bridge_flow": "1.2", + "bottom_shell_layers": "4", + "bottom_shell_thickness": "0.8", "bridge_speed": "50", - "internal_bridge_speed": "200", - "brim_type": "auto_brim", - "brim_width": "5", - "brim_object_gap": "0", - "compatible_printers_condition": "", - "print_sequence": "by layer", - "default_acceleration": "40000", "outer_wall_acceleration": "10000", "top_surface_acceleration": "5000", - "bridge_no_support": "0", - "draft_shield": "disabled", - "elefant_foot_compensation": "0.1", - "enable_arc_fitting": "0", - "exclude_object": "1", - "outer_wall_line_width": "0.4", - "wall_infill_order": "inner wall/outer wall/infill", - "line_width": "0.4", - "infill_direction": "45", - "sparse_infill_density": "10%", - "sparse_infill_pattern": "grid", - "internal_solid_infill_acceleration": "50%", - "initial_layer_acceleration": "1000", - "initial_solid_infill_acceleration": "3000", - "travel_acceleration": "40000", + "outer_wall_line_width": "0.44", + "line_width": "0.44", + "sparse_infill_density": "15%", "inner_wall_acceleration": "12000", - "outer_wall_jerk": "5", - "inner_wall_jerk": "5", - "infill_jerk": "5", - "top_surface_jerk": "5", - "initial_layer_jerk": "5", - "travel_jerk": "5", - "initial_layer_line_width": "0.42", - "initial_layer_print_height": "0.25", - "infill_combination": "0", - "sparse_infill_line_width": "0.45", - "infill_wall_overlap": "15%", - "interface_shells": "0", - "ironing_flow": "15%", - "ironing_spacing": "0.25", - "ironing_speed": "15", - "ironing_type": "no ironing", - "reduce_infill_retraction": "1", - "filename_format": "{printer_model}_{input_filename_base}_{filament_type[0]}_{layer_height}_{print_time}.gcode", - "detect_overhang_wall": "1", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "50", - "overhang_3_4_speed": "30", - "overhang_4_4_speed": "20", - "inner_wall_line_width": "0.4", + "initial_layer_print_height": "0.24", + "initial_layer_line_width": "0.6", + "sparse_infill_line_width": "0.44", + "infill_wall_overlap": "20", + "ironing_speed": "100", + "inner_wall_line_width": "0.44", "wall_loops": "2", - "print_settings_id": "", - "raft_layers": "0", - "seam_position": "aligned", - "skirt_distance": "0.8", - "skirt_height": "1", - "skirt_loops": "1", - "minimum_sparse_infill_area": "15", - "internal_solid_infill_line_width": "0.45", - "spiral_mode": "0", - "standby_temperature_delta": "-5", - "enable_support": "0", - "resolution": "0.012", - "support_type": "tree(auto)", - "support_style": "default", - "support_on_build_plate_only": "0", - "support_top_z_distance": "0.235", - "support_bottom_z_distance": "0.235", - "support_filament": "0", - "support_line_width": "0.45", - "support_interface_loop_pattern": "0", - "support_interface_filament": "0", - "support_interface_top_layers": "5", - "support_interface_bottom_layers": "-1", - "support_interface_spacing": "0.2", - "support_bottom_interface_spacing": "0.2", - "support_interface_speed": "100%", - "support_interface_pattern": "grid", - "support_base_pattern": "rectilinear", - "support_base_pattern_spacing": "3.5", - "support_speed": "100", - "support_threshold_angle": "20", - "support_object_xy_distance": "0.35", - "tree_support_branch_angle": "40", - "tree_support_wall_count": "0", - "detect_thin_wall": "1", - "top_surface_pattern": "monotonic", - "top_surface_line_width": "0.38", + "support_top_z_distance": "0.20", + "support_line_width": "0.44", + "tree_support_tip_diameter": "0.44", + "support_speed": "60", + "top_surface_line_width": "0.44", "top_shell_layers": "4", - "top_shell_thickness": "1", - "initial_layer_speed": "55", - "initial_layer_infill_speed": "105", - "initial_layer_travel_speed": "60%", - "outer_wall_speed": "350", - "inner_wall_speed": "400", - "small_perimeter_speed": "50%", - "internal_solid_infill_speed": "200", - "top_surface_speed": "200", - "gap_infill_speed": "200", - "sparse_infill_speed": "500", - "accel_to_decel_enable": "1", - "accel_to_decel_factor": "25%", - "travel_speed": "1000", - "enable_prime_tower": "1", - "wipe_tower_no_sparse_layers": "0", - "prime_tower_width": "60", - "xy_hole_compensation": "0", - "xy_contour_compensation": "0", - "bridge_acceleration": "50%", - "seam_gap": "10%", - "precise_outer_wall": "1", - "wall_generator": "classic", - "gcode_label_objects": "1", - "slow_down_layers": "3", - "top_solid_infill_flow_ratio": "0.9", - "only_one_wall_top": "1", - "wall_loop_direction": "clockwise", - "top_bottom_infill_wall_overlap": "25%", - "filter_out_gap_fill": "0", - "detect_narrow_internal_solid_infill": "1", - "thick_bridges": "1", - "bridge_angle": "0", + "internal_solid_infill_line_width": "0.44", "compatible_printers": [ - "Sovol Zero 0.4 nozzle" + "Sovol Zero 0.4 nozzle", + "Sovol Zero 0.4 Hardened Steel nozzle" ] } diff --git a/resources/profiles/Sovol/process/0.25mm Quality @Sovol Zero 1.0 nozzle.json b/resources/profiles/Sovol/process/0.25mm Quality @Sovol Zero 1.0 nozzle.json new file mode 100644 index 0000000000..60e8db168f --- /dev/null +++ b/resources/profiles/Sovol/process/0.25mm Quality @Sovol Zero 1.0 nozzle.json @@ -0,0 +1,79 @@ +{ + "type": "process", + "name": "0.25mm Quality @Sovol Zero 1.0 nozzle", + "inherits": "fdm_process_zero", + "from": "system", + "setting_id": "JUmnFOoEMJrbWCN9", + "instantiation": "true", + "layer_height": "0.25", + "bottom_shell_layers": "4", + "bottom_shell_thickness": "0.8", + "bridge_speed": "30", + "internal_bridge_speed": "200", + "default_acceleration": "40000", + "outer_wall_acceleration": "10000", + "top_surface_acceleration": "5000", + "outer_wall_line_width": "1.05", + "line_width": "1.05", + "sparse_infill_density": "15%", + "inner_wall_acceleration": "12000", + "initial_layer_print_height": "0.45", + "initial_layer_line_width": "1.5", + "infill_combination": "0", + "sparse_infill_line_width": "1.05", + "infill_wall_overlap": "18", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.25", + "ironing_speed": "15", + "ironing_type": "no ironing", + "filename_format": "{input_filename_base}_{nozzle_diameter[0]}n_{filament_type[0]}_{layer_height}_{print_time}.gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "50", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "20", + "inner_wall_line_width": "1.1", + "wall_loops": "3", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "0.8", + "skirt_height": "1", + "skirt_loops": "1", + "minimum_sparse_infill_area": "15", + "internal_solid_infill_line_width": "1.05", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "tree(auto)", + "support_style": "snug", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.25", + "support_bottom_z_distance": "0.235", + "support_filament": "0", + "support_line_width": "1.05", + "tree_support_tip_diameter": "1.05", + "support_interface_loop_pattern": "0", + "support_interface_filament": "0", + "support_interface_top_layers": "5", + "support_interface_bottom_layers": "-1", + "support_interface_spacing": "0.2", + "support_bottom_interface_spacing": "0.2", + "support_interface_speed": "100%", + "support_interface_pattern": "grid", + "support_base_pattern": "rectilinear", + "support_base_pattern_spacing": "3.5", + "support_speed": "100", + "support_threshold_angle": "50", + "support_object_xy_distance": "0.35", + "tree_support_branch_angle": "40", + "top_surface_line_width": "1.05", + "top_shell_layers": "4", + "top_shell_thickness": "1", + "compatible_printers": [ + "Sovol Zero 1.0 nozzle", + "Sovol Zero 1.0 Hardened Steel nozzle" + ] +} diff --git a/resources/profiles/Sovol/process/0.25mm SPEEDBENCHY @Sovol Zero 0.4 nozzle.json b/resources/profiles/Sovol/process/0.25mm SPEEDBENCHY @Sovol Zero 0.4 nozzle.json new file mode 100644 index 0000000000..89e248b223 --- /dev/null +++ b/resources/profiles/Sovol/process/0.25mm SPEEDBENCHY @Sovol Zero 0.4 nozzle.json @@ -0,0 +1,85 @@ +{ + "type": "process", + "setting_id": "oFrWcSxmad1b6sD4", + "name": "0.25mm SPEEDBENCHY @Sovol Zero 0.4 nozzle", + "from": "system", + "inherits": "fdm_process_zero", + "instantiation": "true", + "layer_height": "0.25", + "initial_layer_print_height": "0.25", + "line_width": "0.5", + "initial_layer_line_width": "0.5", + "outer_wall_line_width": "0.5", + "inner_wall_line_width": "0.5", + "top_surface_line_width": "0.55", + "internal_solid_infill_line_width": "0.55", + "sparse_infill_line_width": "0.55", + "support_line_width": "0.5", + "tree_support_tip_diameter": "0.5", + "wall_loops": "2", + "top_shell_layers": "3", + "bottom_shell_layers": "3", + "bottom_shell_thickness": "0", + "sparse_infill_density": "10%", + "sparse_infill_pattern": "grid", + "bottom_solid_infill_flow_ratio": "1.2", + "top_solid_infill_flow_ratio": "1.4", + "bridge_flow": "1", + "internal_bridge_flow": "1", + "bridge_speed": "250", + "internal_bridge_speed": "250", + "bridge_acceleration": "100%", + "thick_bridges": "0", + "thick_internal_bridges": "0", + "brim_type": "outer_only", + "brim_width": "1", + "brim_object_gap": "0", + "filter_out_gap_fill": "13", + "gap_fill_target": "nowhere", + "min_width_top_surface": "200%", + "minimum_sparse_infill_area": "0", + "infill_direction": "0", + "solid_infill_direction": "0", + "infill_wall_overlap": "15%", + "reduce_crossing_wall": "0", + "skirt_loops": "0", + "only_one_wall_top": "1", + "slow_down_layers": "1", + "wall_direction": "cw", + "initial_layer_speed": "300", + "initial_layer_infill_speed": "300", + "initial_layer_travel_speed": "100%", + "outer_wall_speed": "350", + "inner_wall_speed": "400", + "small_perimeter_speed": "100%", + "internal_solid_infill_speed": "400", + "top_surface_speed": "300", + "gap_infill_speed": "350", + "sparse_infill_speed": "500", + "support_speed": "100", + "travel_speed": "1200", + "default_acceleration": "40000", + "initial_layer_acceleration": "20000", + "outer_wall_acceleration": "40000", + "inner_wall_acceleration": "40000", + "top_surface_acceleration": "20000", + "internal_solid_infill_acceleration": "100%", + "travel_acceleration": "40000", + "accel_to_decel_factor": "50%", + "outer_wall_jerk": "20", + "inner_wall_jerk": "20", + "infill_jerk": "20", + "top_surface_jerk": "20", + "initial_layer_jerk": "20", + "travel_jerk": "20", + "overhang_1_4_speed": "160", + "overhang_2_4_speed": "100", + "overhang_3_4_speed": "60", + "overhang_4_4_speed": "40", + "support_top_z_distance": "0.235", + "support_bottom_z_distance": "0.235", + "compatible_printers": [ + "Sovol Zero 0.4 nozzle", + "Sovol Zero 0.4 Hardened Steel nozzle" + ] +} diff --git a/resources/profiles/Sovol/process/0.28mm Fast @Sovol Zero 0.4 nozzle.json b/resources/profiles/Sovol/process/0.28mm Fast @Sovol Zero 0.4 nozzle.json new file mode 100644 index 0000000000..1ad361e3e2 --- /dev/null +++ b/resources/profiles/Sovol/process/0.28mm Fast @Sovol Zero 0.4 nozzle.json @@ -0,0 +1,39 @@ +{ + "type": "process", + "name": "0.28mm Fast @Sovol Zero 0.4 nozzle", + "inherits": "fdm_process_zero", + "from": "system", + "setting_id": "1VoML2LGDk4TJgLI", + "instantiation": "true", + "layer_height": "0.28", + "bottom_shell_layers": "3", + "bottom_shell_thickness": "0", + "bridge_speed": "60", + "outer_wall_acceleration": "22000", + "top_surface_acceleration": "22000", + "outer_wall_line_width": "0.48", + "line_width": "0.48", + "sparse_infill_density": "10%", + "inner_wall_acceleration": "28000", + "initial_layer_print_height": "0.28", + "initial_layer_line_width": "0.6", + "sparse_infill_line_width": "0.48", + "inner_wall_line_width": "0.48", + "internal_solid_infill_line_width": "0.48", + "support_top_z_distance": "0.30", + "support_line_width": "0.48", + "tree_support_tip_diameter": "0.48", + "support_speed": "120", + "top_surface_line_width": "0.48", + "outer_wall_speed": "350", + "inner_wall_speed": "400", + "small_perimeter_speed": "50%", + "internal_solid_infill_speed": "200", + "top_surface_speed": "200", + "gap_infill_speed": "200", + "sparse_infill_speed": "500", + "compatible_printers": [ + "Sovol Zero 0.4 nozzle", + "Sovol Zero 0.4 Hardened Steel nozzle" + ] +} diff --git a/resources/profiles/Sovol/process/0.30mm Standard @Sovol Zero 0.6 nozzle.json b/resources/profiles/Sovol/process/0.30mm Standard @Sovol Zero 0.6 nozzle.json new file mode 100644 index 0000000000..4f1f487bdf --- /dev/null +++ b/resources/profiles/Sovol/process/0.30mm Standard @Sovol Zero 0.6 nozzle.json @@ -0,0 +1,35 @@ +{ + "type": "process", + "setting_id": "lTAs2USEP8D749K7", + "name": "0.30mm Standard @Sovol Zero 0.6 nozzle", + "from": "system", + "inherits": "fdm_process_zero", + "instantiation": "true", + "layer_height": "0.30", + "bottom_shell_layers": "4", + "bottom_shell_thickness": "0.8", + "bridge_speed": "50", + "outer_wall_acceleration": "10000", + "top_surface_acceleration": "5000", + "outer_wall_line_width": "0.66", + "line_width": "0.66", + "sparse_infill_density": "15%", + "inner_wall_acceleration": "12000", + "initial_layer_print_height": "0.36", + "initial_layer_line_width": "0.9", + "sparse_infill_line_width": "0.66", + "infill_wall_overlap": "20", + "inner_wall_line_width": "0.66", + "wall_loops": "2", + "support_top_z_distance": "0.30", + "support_line_width": "0.66", + "tree_support_tip_diameter": "0.66", + "support_speed": "100", + "top_surface_line_width": "0.66", + "top_shell_layers": "4", + "internal_solid_infill_line_width": "0.66", + "compatible_printers": [ + "Sovol Zero 0.6 nozzle", + "Sovol Zero 0.6 Hardened Steel nozzle" + ] +} diff --git a/resources/profiles/Sovol/process/0.40mm Standard @Sovol Zero 0.8 nozzle.json b/resources/profiles/Sovol/process/0.40mm Standard @Sovol Zero 0.8 nozzle.json new file mode 100644 index 0000000000..7eeecf4ece --- /dev/null +++ b/resources/profiles/Sovol/process/0.40mm Standard @Sovol Zero 0.8 nozzle.json @@ -0,0 +1,42 @@ +{ + "type": "process", + "name": "0.40mm Standard @Sovol Zero 0.8 nozzle", + "inherits": "fdm_process_zero", + "from": "system", + "setting_id": "8x4CsuqroC9HOdAN", + "instantiation": "true", + "layer_height": "0.40", + "bottom_shell_layers": "4", + "bottom_shell_thickness": "0.8", + "bridge_speed": "50", + "outer_wall_acceleration": "10000", + "top_surface_acceleration": "5000", + "outer_wall_line_width": "0.88", + "line_width": "0.88", + "sparse_infill_density": "15%", + "inner_wall_acceleration": "12000", + "initial_layer_print_height": "0.48", + "initial_layer_line_width": "1.2", + "sparse_infill_line_width": "0.88", + "infill_wall_overlap": "20", + "inner_wall_line_width": "0.88", + "wall_loops": "2", + "support_top_z_distance": "0.40", + "support_line_width": "0.88", + "tree_support_tip_diameter": "0.88", + "support_speed": "100", + "top_surface_line_width": "0.88", + "top_shell_layers": "4", + "outer_wall_speed": "350", + "inner_wall_speed": "400", + "small_perimeter_speed": "50%", + "internal_solid_infill_speed": "200", + "top_surface_speed": "200", + "gap_infill_speed": "200", + "sparse_infill_speed": "500", + "internal_solid_infill_line_width": "0.88", + "compatible_printers": [ + "Sovol Zero 0.8 nozzle", + "Sovol Zero 0.8 Hardened Steel nozzle" + ] +} diff --git a/resources/profiles/Sovol/process/0.42mm Fast @Sovol Zero 0.6 nozzle.json b/resources/profiles/Sovol/process/0.42mm Fast @Sovol Zero 0.6 nozzle.json new file mode 100644 index 0000000000..75a9522c62 --- /dev/null +++ b/resources/profiles/Sovol/process/0.42mm Fast @Sovol Zero 0.6 nozzle.json @@ -0,0 +1,39 @@ +{ + "type": "process", + "name": "0.42mm Fast @Sovol Zero 0.6 nozzle", + "inherits": "fdm_process_zero", + "from": "system", + "setting_id": "illqJAnGiA2pY0hw", + "instantiation": "true", + "layer_height": "0.42", + "bottom_shell_layers": "3", + "bottom_shell_thickness": "0", + "bridge_speed": "60", + "outer_wall_acceleration": "22000", + "top_surface_acceleration": "22000", + "outer_wall_line_width": "0.72", + "line_width": "0.72", + "sparse_infill_density": "10%", + "inner_wall_acceleration": "28000", + "initial_layer_print_height": "0.42", + "initial_layer_line_width": "0.9", + "sparse_infill_line_width": "0.72", + "inner_wall_line_width": "0.72", + "internal_solid_infill_line_width": "0.72", + "support_top_z_distance": "0.45", + "support_line_width": "0.72", + "tree_support_tip_diameter": "0.72", + "support_speed": "120", + "top_surface_line_width": "0.72", + "outer_wall_speed": "350", + "inner_wall_speed": "400", + "small_perimeter_speed": "50%", + "internal_solid_infill_speed": "200", + "top_surface_speed": "200", + "gap_infill_speed": "200", + "sparse_infill_speed": "500", + "compatible_printers": [ + "Sovol Zero 0.6 nozzle", + "Sovol Zero 0.6 Hardened Steel nozzle" + ] +} diff --git a/resources/profiles/Sovol/process/0.50mm Standard @Sovol Zero 1.0 nozzle.json b/resources/profiles/Sovol/process/0.50mm Standard @Sovol Zero 1.0 nozzle.json new file mode 100644 index 0000000000..c1446a6536 --- /dev/null +++ b/resources/profiles/Sovol/process/0.50mm Standard @Sovol Zero 1.0 nozzle.json @@ -0,0 +1,87 @@ +{ + "type": "process", + "name": "0.50mm Standard @Sovol Zero 1.0 nozzle", + "inherits": "fdm_process_zero", + "from": "system", + "setting_id": "E5K55O4RkMyYCAlt", + "instantiation": "true", + "layer_height": "0.50", + "bottom_shell_layers": "4", + "bottom_shell_thickness": "0.8", + "bridge_speed": "45", + "internal_bridge_speed": "200", + "default_acceleration": "22000", + "outer_wall_acceleration": "16000", + "top_surface_acceleration": "16000", + "outer_wall_line_width": "1.1", + "line_width": "1.1", + "sparse_infill_density": "15%", + "inner_wall_acceleration": "22000", + "initial_layer_print_height": "0.60", + "initial_layer_line_width": "1.5", + "infill_combination": "0", + "sparse_infill_line_width": "1.1", + "infill_wall_overlap": "20", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.25", + "ironing_speed": "15", + "ironing_type": "no ironing", + "filename_format": "{input_filename_base}_{nozzle_diameter[0]}n_{filament_type[0]}_{layer_height}_{print_time}.gcode", + "detect_overhang_wall": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "50", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "20", + "inner_wall_line_width": "1.1", + "wall_loops": "2", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "0.8", + "skirt_height": "1", + "skirt_loops": "1", + "minimum_sparse_infill_area": "15", + "internal_solid_infill_line_width": "1.1", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "tree(auto)", + "support_style": "snug", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.50", + "support_bottom_z_distance": "0.235", + "support_filament": "0", + "support_line_width": "1.1", + "tree_support_tip_diameter": "1.1", + "support_interface_loop_pattern": "0", + "support_interface_filament": "0", + "support_interface_top_layers": "5", + "support_interface_bottom_layers": "-1", + "support_interface_spacing": "0.2", + "support_bottom_interface_spacing": "0.2", + "support_interface_speed": "100%", + "support_interface_pattern": "grid", + "support_base_pattern": "rectilinear", + "support_base_pattern_spacing": "3.5", + "support_speed": "60", + "support_threshold_angle": "50", + "support_object_xy_distance": "0.35", + "tree_support_branch_angle": "40", + "top_surface_line_width": "1.1", + "top_shell_layers": "4", + "top_shell_thickness": "1", + "outer_wall_speed": "30", + "inner_wall_speed": "45", + "small_perimeter_speed": "45", + "internal_solid_infill_speed": "45", + "top_surface_speed": "35", + "gap_infill_speed": "35", + "sparse_infill_speed": "70", + "travel_acceleration": "38000", + "compatible_printers": [ + "Sovol Zero 1.0 nozzle", + "Sovol Zero 1.0 Hardened Steel nozzle" + ] +} diff --git a/resources/profiles/Sovol/process/0.56mm Fast @Sovol Zero 0.8 nozzle.json b/resources/profiles/Sovol/process/0.56mm Fast @Sovol Zero 0.8 nozzle.json new file mode 100644 index 0000000000..3bef013a12 --- /dev/null +++ b/resources/profiles/Sovol/process/0.56mm Fast @Sovol Zero 0.8 nozzle.json @@ -0,0 +1,40 @@ +{ + "type": "process", + "name": "0.56mm Fast @Sovol Zero 0.8 nozzle", + "inherits": "fdm_process_zero", + "from": "system", + "setting_id": "g9PPRM4FLMwjMUfy", + "instantiation": "true", + "layer_height": "0.56", + "bottom_shell_layers": "3", + "bottom_shell_thickness": "0", + "bridge_speed": "60", + "default_acceleration": "28000", + "outer_wall_acceleration": "22000", + "top_surface_acceleration": "22000", + "outer_wall_line_width": "0.96", + "line_width": "0.96", + "sparse_infill_density": "10%", + "inner_wall_acceleration": "28000", + "initial_layer_print_height": "0.56", + "initial_layer_line_width": "1.2", + "sparse_infill_line_width": "0.96", + "inner_wall_line_width": "0.96", + "internal_solid_infill_line_width": "0.96", + "support_top_z_distance": "0.60", + "support_line_width": "0.96", + "tree_support_tip_diameter": "0.96", + "top_surface_line_width": "0.96", + "top_shell_layers": "4", + "outer_wall_speed": "35", + "inner_wall_speed": "55", + "small_perimeter_speed": "60", + "internal_solid_infill_speed": "55", + "top_surface_speed": "40", + "gap_infill_speed": "40", + "sparse_infill_speed": "80", + "compatible_printers": [ + "Sovol Zero 0.8 nozzle", + "Sovol Zero 0.8 Hardened Steel nozzle" + ] +} diff --git a/resources/profiles/Sovol/process/0.70mm Fast @Sovol Zero 1.0 nozzle.json b/resources/profiles/Sovol/process/0.70mm Fast @Sovol Zero 1.0 nozzle.json new file mode 100644 index 0000000000..39d5309914 --- /dev/null +++ b/resources/profiles/Sovol/process/0.70mm Fast @Sovol Zero 1.0 nozzle.json @@ -0,0 +1,33 @@ +{ + "type": "process", + "name": "0.70mm Fast @Sovol Zero 1.0 nozzle", + "inherits": "fdm_process_zero", + "from": "system", + "setting_id": "fW5KJBVndgQE868q", + "instantiation": "true", + "layer_height": "0.70", + "bottom_shell_layers": "3", + "bottom_shell_thickness": "0", + "bridge_speed": "60", + "outer_wall_acceleration": "22000", + "top_surface_acceleration": "22000", + "outer_wall_line_width": "1.2", + "line_width": "1.2", + "sparse_infill_density": "10%", + "inner_wall_acceleration": "28000", + "initial_layer_print_height": "0.70", + "initial_layer_line_width": "1.5", + "sparse_infill_line_width": "1.2", + "inner_wall_line_width": "1.2", + "internal_solid_infill_line_width": "1.2", + "support_top_z_distance": "0.75", + "support_line_width": "1.2", + "tree_support_tip_diameter": "1.2", + "support_speed": "120", + "top_surface_line_width": "1.2", + "top_shell_layers": "3", + "compatible_printers": [ + "Sovol Zero 1.0 nozzle", + "Sovol Zero 1.0 Hardened Steel nozzle" + ] +} diff --git a/resources/profiles/Sovol/process/fdm_process_zero.json b/resources/profiles/Sovol/process/fdm_process_zero.json new file mode 100644 index 0000000000..da4df2686e --- /dev/null +++ b/resources/profiles/Sovol/process/fdm_process_zero.json @@ -0,0 +1,73 @@ +{ + "type": "process", + "name": "fdm_process_zero", + "inherits": "fdm_process_common", + "from": "system", + "instantiation": "false", + "reduce_crossing_wall": "1", + "max_travel_detour_distance": "10", + "bottom_surface_pattern": "monotonic", + "bridge_flow": "1.2", + "internal_bridge_flow": "1.2", + "brim_type": "auto_brim", + "brim_width": "5", + "brim_object_gap": "0", + "print_sequence": "by layer", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0.1", + "enable_arc_fitting": "0", + "exclude_object": "1", + "wall_infill_order": "inner wall/outer wall/infill", + "infill_direction": "45", + "sparse_infill_pattern": "grid", + "internal_solid_infill_acceleration": "50%", + "initial_layer_acceleration": "1000", + "travel_acceleration": "40000", + "outer_wall_jerk": "5", + "inner_wall_jerk": "5", + "infill_jerk": "5", + "top_surface_jerk": "5", + "initial_layer_jerk": "5", + "travel_jerk": "5", + "tree_support_wall_count": "0", + "reduce_infill_retraction": "1", + "detect_thin_wall": "1", + "top_surface_pattern": "monotonic", + "initial_layer_speed": "55", + "initial_layer_infill_speed": "105", + "initial_layer_travel_speed": "60%", + "outer_wall_speed": "350", + "inner_wall_speed": "400", + "small_perimeter_speed": "50%", + "internal_solid_infill_speed": "200", + "top_surface_speed": "200", + "gap_infill_speed": "200", + "sparse_infill_speed": "500", + "accel_to_decel_enable": "1", + "accel_to_decel_factor": "25%", + "travel_speed": "1000", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "bridge_acceleration": "50%", + "seam_gap": "10%", + "precise_outer_wall": "1", + "wall_generator": "classic", + "gcode_label_objects": "1", + "slow_down_layers": "3", + "top_solid_infill_flow_ratio": "0.9", + "only_one_wall_top": "1", + "top_bottom_infill_wall_overlap": "25%", + "filter_out_gap_fill": "0", + "detect_narrow_internal_solid_infill": "1", + "thick_bridges": "1", + "bridge_angle": "0", + "initial_layer_line_width": "150%", + "default_acceleration": "40000", + "compatible_printers": [], + "internal_bridge_speed": "150", + "filename_format": "{input_filename_base}_{nozzle_diameter[0]}n_{filament_type[0]}_{layer_height}_{print_time}.gcode" +} diff --git a/resources/profiles/UltiMaker.json b/resources/profiles/UltiMaker.json index d437ce7191..5d55de2c8d 100644 --- a/resources/profiles/UltiMaker.json +++ b/resources/profiles/UltiMaker.json @@ -1,7 +1,7 @@ { "name": "UltiMaker", "url": "", - "version": "02.04.00.03", + "version": "02.04.00.04", "force_update": "0", "description": "UltiMaker configurations", "machine_model_list": [ @@ -9,6 +9,14 @@ "name": "UltiMaker 2", "sub_path": "machine/UltiMaker 2.json" }, + { + "name": "UltiMaker 2 extended+", + "sub_path": "machine/UltiMaker 2 extended+.json" + }, + { + "name": "UltiMaker 2+", + "sub_path": "machine/UltiMaker 2+.json" + }, { "name": "UltiMaker S5", "sub_path": "machine/UltiMaker S5.json" @@ -20,27 +28,184 @@ "sub_path": "process/fdm_process_common.json" }, { - "name": "0.12mm Fine @UltiMaker 2", - "sub_path": "process/0.12mm Fine @UltiMaker 2.json" + "name": "0.10mm Fine @UltiMaker 2", + "sub_path": "process/0.10mm Fine @UltiMaker 2.json" }, { - "name": "0.18mm Standard @UltiMaker 2", - "sub_path": "process/0.18mm Standard @UltiMaker 2.json" + "name": "0.15mm Standard @UltiMaker 2", + "sub_path": "process/0.15mm Standard @UltiMaker 2.json" + }, + { + "name": "0.15mm Standard @UltiMaker 2 0.6 nozzle", + "sub_path": "process/0.15mm Standard @UltiMaker 2 0.6 nozzle.json" }, { "name": "0.18mm Standard @UltiMaker S5", "sub_path": "process/0.18mm Standard @UltiMaker S5.json" }, { - "name": "0.25mm Draft @UltiMaker 2", - "sub_path": "process/0.25mm Darft @UltiMaker 2.json" + "name": "0.20mm Draft @UltiMaker 2", + "sub_path": "process/0.20mm Draft @UltiMaker 2.json" + }, + { + "name": "0.20mm Standard @UltiMaker 2 0.8 nozzle", + "sub_path": "process/0.20mm Standard @UltiMaker 2 0.8 nozzle.json" + }, + { + "name": "0.10mm Fine @UltiMaker 2+", + "sub_path": "process/0.10mm Fine @UltiMaker 2+.json" + }, + { + "name": "0.15mm Standard @UltiMaker 2+", + "sub_path": "process/0.15mm Standard @UltiMaker 2+.json" + }, + { + "name": "0.15mm Standard @UltiMaker 2+ 0.6 nozzle", + "sub_path": "process/0.15mm Standard @UltiMaker 2+ 0.6 nozzle.json" }, { "name": "0.2mm Fast @UltiMaker S5", "sub_path": "process/0.2mm Fast @UltiMaker S5.json" + }, + { + "name": "0.20mm Draft @UltiMaker 2+", + "sub_path": "process/0.20mm Draft @UltiMaker 2+.json" + }, + { + "name": "0.20mm Standard @UltiMaker 2+ 0.8 nozzle", + "sub_path": "process/0.20mm Standard @UltiMaker 2+ 0.8 nozzle.json" + }, + { + "name": "0.10mm Fine @UltiMaker 2 extended+", + "sub_path": "process/0.10mm Fine @UltiMaker 2 extended+.json" + }, + { + "name": "0.15mm Standard @UltiMaker 2 extended+", + "sub_path": "process/0.15mm Standard @UltiMaker 2 extended+.json" + }, + { + "name": "0.15mm Standard @UltiMaker 2 extended+ 0.6 nozzle", + "sub_path": "process/0.15mm Standard @UltiMaker 2 extended+ 0.6 nozzle.json" + }, + { + "name": "0.20mm Draft @UltiMaker 2 extended+", + "sub_path": "process/0.20mm Draft @UltiMaker 2 extended+.json" + }, + { + "name": "0.20mm Standard @UltiMaker 2 extended+ 0.8 nozzle", + "sub_path": "process/0.20mm Standard @UltiMaker 2 extended+ 0.8 nozzle.json" + } + ], + "filament_list": [ + { + "name": "Generic ABS @UltiMaker 2 0.4 nozzle", + "sub_path": "filament/Generic ABS @UltiMaker 2 0.4 nozzle.json" + }, + { + "name": "Generic PETG @UltiMaker 2 0.4 nozzle", + "sub_path": "filament/Generic PETG @UltiMaker 2 0.4 nozzle.json" + }, + { + "name": "Generic PLA @UltiMaker 2 0.4 nozzle", + "sub_path": "filament/Generic PLA @UltiMaker 2 0.4 nozzle.json" + }, + { + "name": "Generic ABS @UltiMaker 2 0.6 nozzle", + "sub_path": "filament/Generic ABS @UltiMaker 2 0.6 nozzle.json" + }, + { + "name": "Generic ABS @UltiMaker 2 0.8 nozzle", + "sub_path": "filament/Generic ABS @UltiMaker 2 0.8 nozzle.json" + }, + { + "name": "Generic ABS @UltiMaker 2+ 0.4 nozzle", + "sub_path": "filament/Generic ABS @UltiMaker 2+ 0.4 nozzle.json" + }, + { + "name": "Generic PETG @UltiMaker 2 0.6 nozzle", + "sub_path": "filament/Generic PETG @UltiMaker 2 0.6 nozzle.json" + }, + { + "name": "Generic PETG @UltiMaker 2 0.8 nozzle", + "sub_path": "filament/Generic PETG @UltiMaker 2 0.8 nozzle.json" + }, + { + "name": "Generic PETG @UltiMaker 2+ 0.4 nozzle", + "sub_path": "filament/Generic PETG @UltiMaker 2+ 0.4 nozzle.json" + }, + { + "name": "Generic PLA @UltiMaker 2 0.6 nozzle", + "sub_path": "filament/Generic PLA @UltiMaker 2 0.6 nozzle.json" + }, + { + "name": "Generic PLA @UltiMaker 2 0.8 nozzle", + "sub_path": "filament/Generic PLA @UltiMaker 2 0.8 nozzle.json" + }, + { + "name": "Generic PLA @UltiMaker 2+ 0.4 nozzle", + "sub_path": "filament/Generic PLA @UltiMaker 2+ 0.4 nozzle.json" + }, + { + "name": "Generic ABS @UltiMaker 2+ 0.6 nozzle", + "sub_path": "filament/Generic ABS @UltiMaker 2+ 0.6 nozzle.json" + }, + { + "name": "Generic ABS @UltiMaker 2+ 0.8 nozzle", + "sub_path": "filament/Generic ABS @UltiMaker 2+ 0.8 nozzle.json" + }, + { + "name": "Generic ABS @UltiMaker 2 extended+ 0.4 nozzle", + "sub_path": "filament/Generic ABS @UltiMaker 2 extended+ 0.4 nozzle.json" + }, + { + "name": "Generic PETG @UltiMaker 2+ 0.6 nozzle", + "sub_path": "filament/Generic PETG @UltiMaker 2+ 0.6 nozzle.json" + }, + { + "name": "Generic PETG @UltiMaker 2+ 0.8 nozzle", + "sub_path": "filament/Generic PETG @UltiMaker 2+ 0.8 nozzle.json" + }, + { + "name": "Generic PETG @UltiMaker 2 extended+ 0.4 nozzle", + "sub_path": "filament/Generic PETG @UltiMaker 2 extended+ 0.4 nozzle.json" + }, + { + "name": "Generic PLA @UltiMaker 2+ 0.6 nozzle", + "sub_path": "filament/Generic PLA @UltiMaker 2+ 0.6 nozzle.json" + }, + { + "name": "Generic PLA @UltiMaker 2+ 0.8 nozzle", + "sub_path": "filament/Generic PLA @UltiMaker 2+ 0.8 nozzle.json" + }, + { + "name": "Generic PLA @UltiMaker 2 extended+ 0.4 nozzle", + "sub_path": "filament/Generic PLA @UltiMaker 2 extended+ 0.4 nozzle.json" + }, + { + "name": "Generic ABS @UltiMaker 2 extended+ 0.6 nozzle", + "sub_path": "filament/Generic ABS @UltiMaker 2 extended+ 0.6 nozzle.json" + }, + { + "name": "Generic ABS @UltiMaker 2 extended+ 0.8 nozzle", + "sub_path": "filament/Generic ABS @UltiMaker 2 extended+ 0.8 nozzle.json" + }, + { + "name": "Generic PETG @UltiMaker 2 extended+ 0.6 nozzle", + "sub_path": "filament/Generic PETG @UltiMaker 2 extended+ 0.6 nozzle.json" + }, + { + "name": "Generic PETG @UltiMaker 2 extended+ 0.8 nozzle", + "sub_path": "filament/Generic PETG @UltiMaker 2 extended+ 0.8 nozzle.json" + }, + { + "name": "Generic PLA @UltiMaker 2 extended+ 0.6 nozzle", + "sub_path": "filament/Generic PLA @UltiMaker 2 extended+ 0.6 nozzle.json" + }, + { + "name": "Generic PLA @UltiMaker 2 extended+ 0.8 nozzle", + "sub_path": "filament/Generic PLA @UltiMaker 2 extended+ 0.8 nozzle.json" } ], - "filament_list": [], "machine_list": [ { "name": "fdm_machine_common", @@ -54,9 +219,41 @@ "name": "UltiMaker S5 0.4 nozzle", "sub_path": "machine/UltiMaker S5 0.4 nozzle.json" }, + { + "name": "UltiMaker 2 0.6 nozzle", + "sub_path": "machine/UltiMaker 2 0.6 nozzle.json" + }, + { + "name": "UltiMaker 2 0.8 nozzle", + "sub_path": "machine/UltiMaker 2 0.8 nozzle.json" + }, + { + "name": "UltiMaker 2+ 0.4 nozzle", + "sub_path": "machine/UltiMaker 2+ 0.4 nozzle.json" + }, { "name": "UltiMaker S5 0.4 nozzle - Single Extruder", "sub_path": "machine/UltiMaker S5 0.4 nozzle Single Extruder.json" + }, + { + "name": "UltiMaker 2+ 0.6 nozzle", + "sub_path": "machine/UltiMaker 2+ 0.6 nozzle.json" + }, + { + "name": "UltiMaker 2+ 0.8 nozzle", + "sub_path": "machine/UltiMaker 2+ 0.8 nozzle.json" + }, + { + "name": "UltiMaker 2 extended+ 0.4 nozzle", + "sub_path": "machine/UltiMaker 2 extended+ 0.4 nozzle.json" + }, + { + "name": "UltiMaker 2 extended+ 0.6 nozzle", + "sub_path": "machine/UltiMaker 2 extended+ 0.6 nozzle.json" + }, + { + "name": "UltiMaker 2 extended+ 0.8 nozzle", + "sub_path": "machine/UltiMaker 2 extended+ 0.8 nozzle.json" } ] } diff --git a/resources/profiles/UltiMaker/UltiMaker 2 extended+_cover.png b/resources/profiles/UltiMaker/UltiMaker 2 extended+_cover.png new file mode 100644 index 0000000000..b414d18fc6 Binary files /dev/null and b/resources/profiles/UltiMaker/UltiMaker 2 extended+_cover.png differ diff --git a/resources/profiles/UltiMaker/UltiMaker 2+_cover.png b/resources/profiles/UltiMaker/UltiMaker 2+_cover.png new file mode 100644 index 0000000000..3007c8b28e Binary files /dev/null and b/resources/profiles/UltiMaker/UltiMaker 2+_cover.png differ diff --git a/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2 0.4 nozzle.json b/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2 0.4 nozzle.json new file mode 100644 index 0000000000..2d35c6e350 --- /dev/null +++ b/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2 0.4 nozzle.json @@ -0,0 +1,42 @@ +{ + "type": "filament", + "name": "Generic ABS @UltiMaker 2 0.4 nozzle", + "inherits": "Generic ABS @System", + "from": "system", + "setting_id": "z65YPRPvIareA5TJ", + "filament_id": "OFY9muEs", + "instantiation": "true", + "filament_diameter": [ + "2.85" + ], + "filament_max_volumetric_speed": [ + "6" + ], + "hot_plate_temp_initial_layer": [ + "100" + ], + "nozzle_temperature": [ + "250" + ], + "nozzle_temperature_initial_layer": [ + "250" + ], + "fan_max_speed": [ + "50" + ], + "overhang_fan_speed": [ + "50" + ], + "fan_cooling_layer_time": [ + "15" + ], + "reduce_fan_stop_start_freq": [ + "0" + ], + "filament_flow_ratio": [ + "1" + ], + "compatible_printers": [ + "UltiMaker 2 0.4 nozzle" + ] +} diff --git a/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2 0.6 nozzle.json b/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2 0.6 nozzle.json new file mode 100644 index 0000000000..3f10cf2170 --- /dev/null +++ b/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2 0.6 nozzle.json @@ -0,0 +1,18 @@ +{ + "type": "filament", + "name": "Generic ABS @UltiMaker 2 0.6 nozzle", + "inherits": "Generic ABS @UltiMaker 2 0.4 nozzle", + "from": "system", + "setting_id": "eo9lcJAw8yrGBWr8", + "filament_id": "OFY9muEs", + "instantiation": "true", + "filament_diameter": [ + "2.85" + ], + "filament_max_volumetric_speed": [ + "6" + ], + "compatible_printers": [ + "UltiMaker 2 0.6 nozzle" + ] +} diff --git a/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2 0.8 nozzle.json b/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2 0.8 nozzle.json new file mode 100644 index 0000000000..e445d8afd2 --- /dev/null +++ b/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2 0.8 nozzle.json @@ -0,0 +1,18 @@ +{ + "type": "filament", + "name": "Generic ABS @UltiMaker 2 0.8 nozzle", + "inherits": "Generic ABS @UltiMaker 2 0.4 nozzle", + "from": "system", + "setting_id": "1VE4ie9s2gYKUx7r", + "filament_id": "OFY9muEs", + "instantiation": "true", + "filament_diameter": [ + "2.85" + ], + "filament_max_volumetric_speed": [ + "6" + ], + "compatible_printers": [ + "UltiMaker 2 0.8 nozzle" + ] +} diff --git a/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2 extended+ 0.4 nozzle.json b/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2 extended+ 0.4 nozzle.json new file mode 100644 index 0000000000..4117cc85a4 --- /dev/null +++ b/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2 extended+ 0.4 nozzle.json @@ -0,0 +1,9 @@ +{ + "type": "filament", + "name": "Generic ABS @UltiMaker 2 extended+ 0.4 nozzle", + "inherits": "Generic ABS @UltiMaker 2+ 0.4 nozzle", + "from": "system", + "setting_id": "tVIm7URv58VeDdQw", + "instantiation": "true", + "compatible_printers": ["UltiMaker 2 extended+ 0.4 nozzle"] +} diff --git a/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2 extended+ 0.6 nozzle.json b/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2 extended+ 0.6 nozzle.json new file mode 100644 index 0000000000..29b72e2ef3 --- /dev/null +++ b/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2 extended+ 0.6 nozzle.json @@ -0,0 +1,9 @@ +{ + "type": "filament", + "name": "Generic ABS @UltiMaker 2 extended+ 0.6 nozzle", + "inherits": "Generic ABS @UltiMaker 2+ 0.6 nozzle", + "from": "system", + "setting_id": "YtLYCadAif8luymA", + "instantiation": "true", + "compatible_printers": ["UltiMaker 2 extended+ 0.6 nozzle"] +} diff --git a/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2 extended+ 0.8 nozzle.json b/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2 extended+ 0.8 nozzle.json new file mode 100644 index 0000000000..d79dde7218 --- /dev/null +++ b/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2 extended+ 0.8 nozzle.json @@ -0,0 +1,9 @@ +{ + "type": "filament", + "name": "Generic ABS @UltiMaker 2 extended+ 0.8 nozzle", + "inherits": "Generic ABS @UltiMaker 2+ 0.8 nozzle", + "from": "system", + "setting_id": "VgBNyDQx42vL1rLK", + "instantiation": "true", + "compatible_printers": ["UltiMaker 2 extended+ 0.8 nozzle"] +} diff --git a/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2+ 0.4 nozzle.json b/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2+ 0.4 nozzle.json new file mode 100644 index 0000000000..8a091b2f2b --- /dev/null +++ b/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2+ 0.4 nozzle.json @@ -0,0 +1,11 @@ +{ + "type": "filament", + "name": "Generic ABS @UltiMaker 2+ 0.4 nozzle", + "inherits": "Generic ABS @UltiMaker 2 0.4 nozzle", + "from": "system", + "setting_id": "x2noNNHwbDanbr82", + "instantiation": "true", + "compatible_printers": [ + "UltiMaker 2+ 0.4 nozzle" + ] +} diff --git a/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2+ 0.6 nozzle.json b/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2+ 0.6 nozzle.json new file mode 100644 index 0000000000..df75ca752c --- /dev/null +++ b/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2+ 0.6 nozzle.json @@ -0,0 +1,11 @@ +{ + "type": "filament", + "name": "Generic ABS @UltiMaker 2+ 0.6 nozzle", + "inherits": "Generic ABS @UltiMaker 2 0.6 nozzle", + "from": "system", + "setting_id": "ZSQbLmnKDtdZQN0H", + "instantiation": "true", + "compatible_printers": [ + "UltiMaker 2+ 0.6 nozzle" + ] +} diff --git a/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2+ 0.8 nozzle.json b/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2+ 0.8 nozzle.json new file mode 100644 index 0000000000..4b621ff276 --- /dev/null +++ b/resources/profiles/UltiMaker/filament/Generic ABS @UltiMaker 2+ 0.8 nozzle.json @@ -0,0 +1,11 @@ +{ + "type": "filament", + "name": "Generic ABS @UltiMaker 2+ 0.8 nozzle", + "inherits": "Generic ABS @UltiMaker 2 0.8 nozzle", + "from": "system", + "setting_id": "DHWugcEJWHQQ6EZH", + "instantiation": "true", + "compatible_printers": [ + "UltiMaker 2+ 0.8 nozzle" + ] +} diff --git a/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2 0.4 nozzle.json b/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2 0.4 nozzle.json new file mode 100644 index 0000000000..ff74b46449 --- /dev/null +++ b/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2 0.4 nozzle.json @@ -0,0 +1,33 @@ +{ + "type": "filament", + "name": "Generic PETG @UltiMaker 2 0.4 nozzle", + "inherits": "Generic PETG @System", + "from": "system", + "setting_id": "WR3y0y8gmWH40llb", + "filament_id": "OFYPdQJh", + "instantiation": "true", + "filament_diameter": [ + "2.85" + ], + "filament_max_volumetric_speed": [ + "6" + ], + "hot_plate_temp": [ + "85" + ], + "hot_plate_temp_initial_layer": [ + "85" + ], + "nozzle_temperature": [ + "240" + ], + "nozzle_temperature_initial_layer": [ + "240" + ], + "reduce_fan_stop_start_freq": [ + "0" + ], + "compatible_printers": [ + "UltiMaker 2 0.4 nozzle" + ] +} diff --git a/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2 0.6 nozzle.json b/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2 0.6 nozzle.json new file mode 100644 index 0000000000..a0a8efb1e3 --- /dev/null +++ b/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2 0.6 nozzle.json @@ -0,0 +1,18 @@ +{ + "type": "filament", + "name": "Generic PETG @UltiMaker 2 0.6 nozzle", + "inherits": "Generic PETG @UltiMaker 2 0.4 nozzle", + "from": "system", + "setting_id": "koLquuN6eQo8Zn5V", + "filament_id": "OFYPdQJh", + "instantiation": "true", + "filament_diameter": [ + "2.85" + ], + "filament_max_volumetric_speed": [ + "6" + ], + "compatible_printers": [ + "UltiMaker 2 0.6 nozzle" + ] +} diff --git a/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2 0.8 nozzle.json b/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2 0.8 nozzle.json new file mode 100644 index 0000000000..10590aa46a --- /dev/null +++ b/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2 0.8 nozzle.json @@ -0,0 +1,18 @@ +{ + "type": "filament", + "name": "Generic PETG @UltiMaker 2 0.8 nozzle", + "inherits": "Generic PETG @UltiMaker 2 0.4 nozzle", + "from": "system", + "setting_id": "ZtVG7edcUktSNI0P", + "filament_id": "OFYPdQJh", + "instantiation": "true", + "filament_diameter": [ + "2.85" + ], + "filament_max_volumetric_speed": [ + "6" + ], + "compatible_printers": [ + "UltiMaker 2 0.8 nozzle" + ] +} diff --git a/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2 extended+ 0.4 nozzle.json b/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2 extended+ 0.4 nozzle.json new file mode 100644 index 0000000000..b17e6e16cb --- /dev/null +++ b/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2 extended+ 0.4 nozzle.json @@ -0,0 +1,9 @@ +{ + "type": "filament", + "name": "Generic PETG @UltiMaker 2 extended+ 0.4 nozzle", + "inherits": "Generic PETG @UltiMaker 2+ 0.4 nozzle", + "from": "system", + "setting_id": "yk4J40ItJ5NRDjMp", + "instantiation": "true", + "compatible_printers": ["UltiMaker 2 extended+ 0.4 nozzle"] +} diff --git a/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2 extended+ 0.6 nozzle.json b/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2 extended+ 0.6 nozzle.json new file mode 100644 index 0000000000..7345d479ec --- /dev/null +++ b/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2 extended+ 0.6 nozzle.json @@ -0,0 +1,9 @@ +{ + "type": "filament", + "name": "Generic PETG @UltiMaker 2 extended+ 0.6 nozzle", + "inherits": "Generic PETG @UltiMaker 2+ 0.6 nozzle", + "from": "system", + "setting_id": "WLi5JuZM7vsLgW16", + "instantiation": "true", + "compatible_printers": ["UltiMaker 2 extended+ 0.6 nozzle"] +} diff --git a/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2 extended+ 0.8 nozzle.json b/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2 extended+ 0.8 nozzle.json new file mode 100644 index 0000000000..cbb2074697 --- /dev/null +++ b/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2 extended+ 0.8 nozzle.json @@ -0,0 +1,9 @@ +{ + "type": "filament", + "name": "Generic PETG @UltiMaker 2 extended+ 0.8 nozzle", + "inherits": "Generic PETG @UltiMaker 2+ 0.8 nozzle", + "from": "system", + "setting_id": "SKoqZdKJH3MyHy7n", + "instantiation": "true", + "compatible_printers": ["UltiMaker 2 extended+ 0.8 nozzle"] +} diff --git a/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2+ 0.4 nozzle.json b/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2+ 0.4 nozzle.json new file mode 100644 index 0000000000..51eef5e94c --- /dev/null +++ b/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2+ 0.4 nozzle.json @@ -0,0 +1,11 @@ +{ + "type": "filament", + "name": "Generic PETG @UltiMaker 2+ 0.4 nozzle", + "inherits": "Generic PETG @UltiMaker 2 0.4 nozzle", + "from": "system", + "setting_id": "JbOqQrFc6Jv7rZrn", + "instantiation": "true", + "compatible_printers": [ + "UltiMaker 2+ 0.4 nozzle" + ] +} diff --git a/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2+ 0.6 nozzle.json b/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2+ 0.6 nozzle.json new file mode 100644 index 0000000000..1d2f250799 --- /dev/null +++ b/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2+ 0.6 nozzle.json @@ -0,0 +1,11 @@ +{ + "type": "filament", + "name": "Generic PETG @UltiMaker 2+ 0.6 nozzle", + "inherits": "Generic PETG @UltiMaker 2 0.6 nozzle", + "from": "system", + "setting_id": "jFSKG5pAy9bhdQvN", + "instantiation": "true", + "compatible_printers": [ + "UltiMaker 2+ 0.6 nozzle" + ] +} diff --git a/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2+ 0.8 nozzle.json b/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2+ 0.8 nozzle.json new file mode 100644 index 0000000000..3069133ea1 --- /dev/null +++ b/resources/profiles/UltiMaker/filament/Generic PETG @UltiMaker 2+ 0.8 nozzle.json @@ -0,0 +1,11 @@ +{ + "type": "filament", + "name": "Generic PETG @UltiMaker 2+ 0.8 nozzle", + "inherits": "Generic PETG @UltiMaker 2 0.8 nozzle", + "from": "system", + "setting_id": "Es1GCPcmcxB7vZj9", + "instantiation": "true", + "compatible_printers": [ + "UltiMaker 2+ 0.8 nozzle" + ] +} diff --git a/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2 0.4 nozzle.json b/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2 0.4 nozzle.json new file mode 100644 index 0000000000..c2c9b67fb9 --- /dev/null +++ b/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2 0.4 nozzle.json @@ -0,0 +1,30 @@ +{ + "type": "filament", + "name": "Generic PLA @UltiMaker 2 0.4 nozzle", + "inherits": "Generic PLA @System", + "from": "system", + "setting_id": "3i42yTge4Nm6R2Yo", + "filament_id": "OFDSrzZ8", + "instantiation": "true", + "filament_diameter": [ + "2.85" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature": [ + "200" + ], + "nozzle_temperature_initial_layer": [ + "200" + ], + "compatible_printers": [ + "UltiMaker 2 0.4 nozzle" + ] +} diff --git a/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2 0.6 nozzle.json b/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2 0.6 nozzle.json new file mode 100644 index 0000000000..3f4c74f8ab --- /dev/null +++ b/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2 0.6 nozzle.json @@ -0,0 +1,18 @@ +{ + "type": "filament", + "name": "Generic PLA @UltiMaker 2 0.6 nozzle", + "inherits": "Generic PLA @UltiMaker 2 0.4 nozzle", + "from": "system", + "setting_id": "yvWYFuY9SPIwwSVG", + "filament_id": "OFDSrzZ8", + "instantiation": "true", + "filament_diameter": [ + "2.85" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "compatible_printers": [ + "UltiMaker 2 0.6 nozzle" + ] +} diff --git a/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2 0.8 nozzle.json b/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2 0.8 nozzle.json new file mode 100644 index 0000000000..91aaf5f1dc --- /dev/null +++ b/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2 0.8 nozzle.json @@ -0,0 +1,18 @@ +{ + "type": "filament", + "name": "Generic PLA @UltiMaker 2 0.8 nozzle", + "inherits": "Generic PLA @UltiMaker 2 0.4 nozzle", + "from": "system", + "setting_id": "4yvMTmMYkCvggt0f", + "filament_id": "OFDSrzZ8", + "instantiation": "true", + "filament_diameter": [ + "2.85" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "compatible_printers": [ + "UltiMaker 2 0.8 nozzle" + ] +} diff --git a/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2 extended+ 0.4 nozzle.json b/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2 extended+ 0.4 nozzle.json new file mode 100644 index 0000000000..ea8c94f19e --- /dev/null +++ b/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2 extended+ 0.4 nozzle.json @@ -0,0 +1,9 @@ +{ + "type": "filament", + "name": "Generic PLA @UltiMaker 2 extended+ 0.4 nozzle", + "inherits": "Generic PLA @UltiMaker 2+ 0.4 nozzle", + "from": "system", + "setting_id": "O8jPrL7F3lEkG6qw", + "instantiation": "true", + "compatible_printers": ["UltiMaker 2 extended+ 0.4 nozzle"] +} diff --git a/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2 extended+ 0.6 nozzle.json b/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2 extended+ 0.6 nozzle.json new file mode 100644 index 0000000000..993d8be5a9 --- /dev/null +++ b/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2 extended+ 0.6 nozzle.json @@ -0,0 +1,9 @@ +{ + "type": "filament", + "name": "Generic PLA @UltiMaker 2 extended+ 0.6 nozzle", + "inherits": "Generic PLA @UltiMaker 2+ 0.6 nozzle", + "from": "system", + "setting_id": "6dXfh6ORD4bBIj4K", + "instantiation": "true", + "compatible_printers": ["UltiMaker 2 extended+ 0.6 nozzle"] +} diff --git a/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2 extended+ 0.8 nozzle.json b/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2 extended+ 0.8 nozzle.json new file mode 100644 index 0000000000..447a58f87a --- /dev/null +++ b/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2 extended+ 0.8 nozzle.json @@ -0,0 +1,9 @@ +{ + "type": "filament", + "name": "Generic PLA @UltiMaker 2 extended+ 0.8 nozzle", + "inherits": "Generic PLA @UltiMaker 2+ 0.8 nozzle", + "from": "system", + "setting_id": "25cn8lVM0gKyKMJJ", + "instantiation": "true", + "compatible_printers": ["UltiMaker 2 extended+ 0.8 nozzle"] +} diff --git a/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2+ 0.4 nozzle.json b/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2+ 0.4 nozzle.json new file mode 100644 index 0000000000..ccf80896a9 --- /dev/null +++ b/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2+ 0.4 nozzle.json @@ -0,0 +1,11 @@ +{ + "type": "filament", + "name": "Generic PLA @UltiMaker 2+ 0.4 nozzle", + "inherits": "Generic PLA @UltiMaker 2 0.4 nozzle", + "from": "system", + "setting_id": "lwzg1neqQdELxzHx", + "instantiation": "true", + "compatible_printers": [ + "UltiMaker 2+ 0.4 nozzle" + ] +} diff --git a/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2+ 0.6 nozzle.json b/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2+ 0.6 nozzle.json new file mode 100644 index 0000000000..b08163a85f --- /dev/null +++ b/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2+ 0.6 nozzle.json @@ -0,0 +1,11 @@ +{ + "type": "filament", + "name": "Generic PLA @UltiMaker 2+ 0.6 nozzle", + "inherits": "Generic PLA @UltiMaker 2 0.6 nozzle", + "from": "system", + "setting_id": "bouWalAyezeLuqzh", + "instantiation": "true", + "compatible_printers": [ + "UltiMaker 2+ 0.6 nozzle" + ] +} diff --git a/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2+ 0.8 nozzle.json b/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2+ 0.8 nozzle.json new file mode 100644 index 0000000000..52cf962376 --- /dev/null +++ b/resources/profiles/UltiMaker/filament/Generic PLA @UltiMaker 2+ 0.8 nozzle.json @@ -0,0 +1,11 @@ +{ + "type": "filament", + "name": "Generic PLA @UltiMaker 2+ 0.8 nozzle", + "inherits": "Generic PLA @UltiMaker 2 0.8 nozzle", + "from": "system", + "setting_id": "Z5vNrOdmFhuVIGpL", + "instantiation": "true", + "compatible_printers": [ + "UltiMaker 2+ 0.8 nozzle" + ] +} diff --git a/resources/profiles/UltiMaker/machine/UltiMaker 2 0.4 nozzle.json b/resources/profiles/UltiMaker/machine/UltiMaker 2 0.4 nozzle.json index b02da9ca09..5b6d4aab1a 100644 --- a/resources/profiles/UltiMaker/machine/UltiMaker 2 0.4 nozzle.json +++ b/resources/profiles/UltiMaker/machine/UltiMaker 2 0.4 nozzle.json @@ -1,119 +1,30 @@ { - "type": "machine", - "name": "UltiMaker 2 0.4 nozzle", - "inherits": "fdm_machine_common", - "from": "system", - "setting_id": "Jl8sUeuACVyrnrst", - "instantiation": "true", - "printer_model": "UltiMaker 2", - "default_print_profile": "0.18mm Standard @UltiMaker 2", - "nozzle_diameter": [ - "0.4" - ], - "printable_area": [ - "0x0", - "224x0", - "224x225", - "0x225" - ], - "printable_height": "212", - "nozzle_type": "undefine", - "auxiliary_fan": "0", - "machine_max_acceleration_extruding": [ - "1500", - "1500" - ], - "machine_max_acceleration_retracting": [ - "1500", - "1500" - ], - "machine_max_acceleration_travel": [ - "3000", - "3000" - ], - "machine_max_acceleration_x": [ - "3000", - "3000" - ], - "machine_max_acceleration_y": [ - "3000", - "3000" - ], - "machine_max_acceleration_z": [ - "500", - "500" - ], - "machine_max_speed_e": [ - "120", - "120" - ], - "machine_max_speed_x": [ - "500", - "500" - ], - "machine_max_speed_y": [ - "500", - "500" - ], - "machine_max_speed_z": [ - "12", - "12" - ], - "machine_max_jerk_e": [ - "2.5", - "2.5" - ], - "machine_max_jerk_x": [ - "20", - "20" - ], - "machine_max_jerk_y": [ - "20", - "20" - ], - "machine_max_jerk_z": [ - "0.4", - "0.4" - ], - "machine_max_junction_deviation": [ - "0.013", - "0" - ], - "max_layer_height": [ - "0.3" - ], - "min_layer_height": [ - "0.08" - ], - "printer_settings_id": "Qidi", - "retraction_minimum_travel": [ - "5" - ], - "retract_before_wipe": [ - "70%" - ], - "retraction_length": [ - "4.5" - ], - "retract_length_toolchange": [ - "10" - ], - "retraction_speed": [ - "35" - ], - "deretraction_speed": [ - "0" - ], - "wipe_distance": [ - "0.2" - ], - "single_extruder_multi_material": "1", - "change_filament_gcode": "", - "machine_pause_gcode": "M0", - "default_filament_profile": [ - "Generic PLA @System" - ], - "machine_start_gcode": "; # # # # # # START Header\nG21; metric values\nG90; absolute positioning\nM82 ; set extruder to absolute mode\nM107; start with the fan off\n\nM140 S[bed_temperature_initial_layer_single]; start bed heating\n\nG28 X0 Y0 Z0; move X/Y/Z to endstops\nG1 X1 Y6 F15000; move X/Y to start position\nG1 Z35 F9000; move Z to start position\n\n; Wait for bed and nozzle temperatures\nM190 S{hot_plate_temp_initial_layer[0] - 5}; wait for bed temperature - 5\nM140 S[bed_temperature_initial_layer_single]; continue bed heating\nM109 S[nozzle_temperature_initial_layer]; wait for nozzle temperature\n\n; Purge and prime\nM83; set extruder to relative mode\nG92 E0; reset extrusion distance\nG0 X0 Y1 F10000\nG1 F150 E20 ; compress the bowden tube\nG1 E-8 F1200\nG0 X30 Y1 F5000\nG0 F1200 Z{initial_layer_print_height/2}; Cut the connection to priming blob\nG0 X100 F10000; disconnect with the prime blob\nG0 X50; Avoid the metal clip holding the Ultimaker glass plate\nG0 Z0.2 F720\nG1 E8 F1200\nG1 X80 E3 F1000; intro line 1\nG1 X110 E4 F1000 ; intro line 2\nG1 X140 F600; drag filament to decompress bowden tube\nG1 X100 F3200; wipe backwards a bit\nG1 X150 F3200; back to where there is no plastic: avoid dragging\nG92 E0; reset extruder reference\nM82; set extruder to absolute mode\n\n; # # # # # # END Header", - "machine_end_gcode": "; # # # # # # START Footer\nG91; relative coordinates\n;G1 E-1 F1200; retract the filament\nG1 Z+15 X-10 Y-10 E-7 F6000; move Z a bit\n; G1 X-10 Y-10 F6000; move XY a bit\nG1 E-5.5 F300; retract the filament\nG28 X0 Y0; move X/Y to min endstops, so the head is out of the way\nM104 S0; extruder heater off\nM140 S0; heated bed heater off (if you have it)\nM84; disable motors\n; # # # # # # END Footer\n", - "scan_first_layer": "0" + "type": "machine", + "name": "UltiMaker 2 0.4 nozzle", + "inherits": "fdm_machine_common", + "from": "system", + "setting_id": "Jl8sUeuACVyrnrst", + "instantiation": "true", + + "printer_model": "UltiMaker 2", + "default_print_profile": "0.15mm Standard @UltiMaker 2", + "nozzle_diameter": [ + "0.4" + ], + "printable_area": [ + "0x0", + "223x0", + "223x223", + "0x223" + ], + "printable_height": "205", + "nozzle_type": "undefine", + "default_filament_profile": [ + "Generic PLA @UltiMaker 2 0.4 nozzle" + ], + "scan_first_layer": "0", + "printer_variant": "0.4", + "extruder_clearance_radius": "65", + "extruder_clearance_height_to_rod": "36", + "extruder_clearance_height_to_lid": "140" } diff --git a/resources/profiles/UltiMaker/machine/UltiMaker 2 0.6 nozzle.json b/resources/profiles/UltiMaker/machine/UltiMaker 2 0.6 nozzle.json new file mode 100644 index 0000000000..1a8fb93c8a --- /dev/null +++ b/resources/profiles/UltiMaker/machine/UltiMaker 2 0.6 nozzle.json @@ -0,0 +1,23 @@ +{ + "type": "machine", + "name": "UltiMaker 2 0.6 nozzle", + "inherits": "UltiMaker 2 0.4 nozzle", + "from": "system", + "setting_id": "p3SYqB6dpxEMo1pb", + "instantiation": "true", + "printer_model": "UltiMaker 2", + "default_print_profile": "0.15mm Standard @UltiMaker 2 0.6 nozzle", + "nozzle_diameter": [ + "0.6" + ], + "max_layer_height": [ + "0.45" + ], + "min_layer_height": [ + "0.12" + ], + "default_filament_profile": [ + "Generic PLA @UltiMaker 2 0.6 nozzle" + ], + "printer_variant": "0.6" +} diff --git a/resources/profiles/UltiMaker/machine/UltiMaker 2 0.8 nozzle.json b/resources/profiles/UltiMaker/machine/UltiMaker 2 0.8 nozzle.json new file mode 100644 index 0000000000..2528d3918c --- /dev/null +++ b/resources/profiles/UltiMaker/machine/UltiMaker 2 0.8 nozzle.json @@ -0,0 +1,23 @@ +{ + "type": "machine", + "name": "UltiMaker 2 0.8 nozzle", + "inherits": "UltiMaker 2 0.4 nozzle", + "from": "system", + "setting_id": "ratwIj4y2pWpLaWJ", + "instantiation": "true", + "printer_model": "UltiMaker 2", + "default_print_profile": "0.20mm Standard @UltiMaker 2 0.8 nozzle", + "nozzle_diameter": [ + "0.8" + ], + "max_layer_height": [ + "0.6" + ], + "min_layer_height": [ + "0.16" + ], + "default_filament_profile": [ + "Generic PLA @UltiMaker 2 0.8 nozzle" + ], + "printer_variant": "0.8" +} diff --git a/resources/profiles/UltiMaker/machine/UltiMaker 2 extended+ 0.4 nozzle.json b/resources/profiles/UltiMaker/machine/UltiMaker 2 extended+ 0.4 nozzle.json new file mode 100644 index 0000000000..0818fd46f6 --- /dev/null +++ b/resources/profiles/UltiMaker/machine/UltiMaker 2 extended+ 0.4 nozzle.json @@ -0,0 +1,13 @@ +{ + "type": "machine", + "name": "UltiMaker 2 extended+ 0.4 nozzle", + "inherits": "UltiMaker 2+ 0.4 nozzle", + "from": "system", + "setting_id": "ENBg9JsL2eTECvzU", + "instantiation": "true", + "printer_model": "UltiMaker 2 extended+", + "printable_height": "305", + "default_print_profile": "0.15mm Standard @UltiMaker 2 extended+", + "default_filament_profile": ["Generic PLA @UltiMaker 2 extended+ 0.4 nozzle"], + "printer_variant": "0.4" +} diff --git a/resources/profiles/UltiMaker/machine/UltiMaker 2 extended+ 0.6 nozzle.json b/resources/profiles/UltiMaker/machine/UltiMaker 2 extended+ 0.6 nozzle.json new file mode 100644 index 0000000000..868fc5b456 --- /dev/null +++ b/resources/profiles/UltiMaker/machine/UltiMaker 2 extended+ 0.6 nozzle.json @@ -0,0 +1,13 @@ +{ + "type": "machine", + "name": "UltiMaker 2 extended+ 0.6 nozzle", + "inherits": "UltiMaker 2+ 0.6 nozzle", + "from": "system", + "setting_id": "qwIYJqwmxmiBX1ow", + "instantiation": "true", + "printer_model": "UltiMaker 2 extended+", + "printable_height": "305", + "default_print_profile": "0.15mm Standard @UltiMaker 2 extended+ 0.6 nozzle", + "default_filament_profile": ["Generic PLA @UltiMaker 2 extended+ 0.6 nozzle"], + "printer_variant": "0.6" +} diff --git a/resources/profiles/UltiMaker/machine/UltiMaker 2 extended+ 0.8 nozzle.json b/resources/profiles/UltiMaker/machine/UltiMaker 2 extended+ 0.8 nozzle.json new file mode 100644 index 0000000000..9e9c2a8105 --- /dev/null +++ b/resources/profiles/UltiMaker/machine/UltiMaker 2 extended+ 0.8 nozzle.json @@ -0,0 +1,13 @@ +{ + "type": "machine", + "name": "UltiMaker 2 extended+ 0.8 nozzle", + "inherits": "UltiMaker 2+ 0.8 nozzle", + "from": "system", + "setting_id": "MNYwZSVqB1rrYo2g", + "instantiation": "true", + "printer_model": "UltiMaker 2 extended+", + "printable_height": "305", + "default_print_profile": "0.20mm Standard @UltiMaker 2 extended+ 0.8 nozzle", + "default_filament_profile": ["Generic PLA @UltiMaker 2 extended+ 0.8 nozzle"], + "printer_variant": "0.8" +} diff --git a/resources/profiles/UltiMaker/machine/UltiMaker 2 extended+.json b/resources/profiles/UltiMaker/machine/UltiMaker 2 extended+.json new file mode 100644 index 0000000000..43f2c765ea --- /dev/null +++ b/resources/profiles/UltiMaker/machine/UltiMaker 2 extended+.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "UltiMaker 2 extended+", + "model_id": "UltiMaker-2-extended-plus", + "nozzle_diameter": "0.4;0.6;0.8", + "machine_tech": "FFF", + "family": "UltiMaker", + "bed_model": "ultimaker_2_buildplate_model.stl", + "bed_texture": "ultimaker_2_buildplate_texture.png", + "hotend_model": "ultimaker_hotend.stl", + "default_materials": "Generic ABS @UltiMaker 2 extended+ 0.4 nozzle;Generic PETG @UltiMaker 2 extended+ 0.4 nozzle;Generic PLA @UltiMaker 2 extended+ 0.4 nozzle;Generic ABS @UltiMaker 2 extended+ 0.6 nozzle;Generic PETG @UltiMaker 2 extended+ 0.6 nozzle;Generic PLA @UltiMaker 2 extended+ 0.6 nozzle;Generic ABS @UltiMaker 2 extended+ 0.8 nozzle;Generic PETG @UltiMaker 2 extended+ 0.8 nozzle;Generic PLA @UltiMaker 2 extended+ 0.8 nozzle" +} diff --git a/resources/profiles/UltiMaker/machine/UltiMaker 2+ 0.4 nozzle.json b/resources/profiles/UltiMaker/machine/UltiMaker 2+ 0.4 nozzle.json new file mode 100644 index 0000000000..a1b0469a9c --- /dev/null +++ b/resources/profiles/UltiMaker/machine/UltiMaker 2+ 0.4 nozzle.json @@ -0,0 +1,14 @@ +{ + "type": "machine", + "name": "UltiMaker 2+ 0.4 nozzle", + "inherits": "UltiMaker 2 0.4 nozzle", + "from": "system", + "setting_id": "onhBJPgqLsVGTqir", + "instantiation": "true", + "printer_model": "UltiMaker 2+", + "default_print_profile": "0.15mm Standard @UltiMaker 2+", + "default_filament_profile": [ + "Generic PLA @UltiMaker 2+ 0.4 nozzle" + ], + "printer_variant": "0.4" +} diff --git a/resources/profiles/UltiMaker/machine/UltiMaker 2+ 0.6 nozzle.json b/resources/profiles/UltiMaker/machine/UltiMaker 2+ 0.6 nozzle.json new file mode 100644 index 0000000000..e6f8e4de06 --- /dev/null +++ b/resources/profiles/UltiMaker/machine/UltiMaker 2+ 0.6 nozzle.json @@ -0,0 +1,14 @@ +{ + "type": "machine", + "name": "UltiMaker 2+ 0.6 nozzle", + "inherits": "UltiMaker 2 0.6 nozzle", + "from": "system", + "setting_id": "5leVdHeUMDFDmNq3", + "instantiation": "true", + "printer_model": "UltiMaker 2+", + "default_print_profile": "0.15mm Standard @UltiMaker 2+ 0.6 nozzle", + "default_filament_profile": [ + "Generic PLA @UltiMaker 2+ 0.6 nozzle" + ], + "printer_variant": "0.6" +} diff --git a/resources/profiles/UltiMaker/machine/UltiMaker 2+ 0.8 nozzle.json b/resources/profiles/UltiMaker/machine/UltiMaker 2+ 0.8 nozzle.json new file mode 100644 index 0000000000..71cbc26d1c --- /dev/null +++ b/resources/profiles/UltiMaker/machine/UltiMaker 2+ 0.8 nozzle.json @@ -0,0 +1,14 @@ +{ + "type": "machine", + "name": "UltiMaker 2+ 0.8 nozzle", + "inherits": "UltiMaker 2 0.8 nozzle", + "from": "system", + "setting_id": "1KcSsT7oyjqv2yei", + "instantiation": "true", + "printer_model": "UltiMaker 2+", + "default_print_profile": "0.20mm Standard @UltiMaker 2+ 0.8 nozzle", + "default_filament_profile": [ + "Generic PLA @UltiMaker 2+ 0.8 nozzle" + ], + "printer_variant": "0.8" +} diff --git a/resources/profiles/UltiMaker/machine/UltiMaker 2+.json b/resources/profiles/UltiMaker/machine/UltiMaker 2+.json new file mode 100644 index 0000000000..f116cdfc4e --- /dev/null +++ b/resources/profiles/UltiMaker/machine/UltiMaker 2+.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "UltiMaker 2+", + "model_id": "UltiMaker-2-plus", + "nozzle_diameter": "0.4;0.6;0.8", + "machine_tech": "FFF", + "family": "UltiMaker", + "bed_model": "ultimaker_2_buildplate_model.stl", + "bed_texture": "ultimaker_2_buildplate_texture.png", + "hotend_model": "ultimaker_hotend.stl", + "default_materials": "Generic ABS @UltiMaker 2+ 0.4 nozzle;Generic PETG @UltiMaker 2+ 0.4 nozzle;Generic PLA @UltiMaker 2+ 0.4 nozzle;Generic ABS @UltiMaker 2+ 0.6 nozzle;Generic PETG @UltiMaker 2+ 0.6 nozzle;Generic PLA @UltiMaker 2+ 0.6 nozzle;Generic ABS @UltiMaker 2+ 0.8 nozzle;Generic PETG @UltiMaker 2+ 0.8 nozzle;Generic PLA @UltiMaker 2+ 0.8 nozzle" +} diff --git a/resources/profiles/UltiMaker/machine/UltiMaker 2.json b/resources/profiles/UltiMaker/machine/UltiMaker 2.json index eac25a733c..aa01814874 100644 --- a/resources/profiles/UltiMaker/machine/UltiMaker 2.json +++ b/resources/profiles/UltiMaker/machine/UltiMaker 2.json @@ -1,12 +1,12 @@ { "type": "machine_model", - "name": "UltiMaker 2", - "model_id": "UltiMaker-2", - "nozzle_diameter": "0.4", + "name": "UltiMaker 2", + "model_id": "UltiMaker-2", + "nozzle_diameter": "0.4;0.6;0.8", "machine_tech": "FFF", "family": "UltiMaker", "bed_model": "ultimaker_2_buildplate_model.stl", "bed_texture": "ultimaker_2_buildplate_texture.png", "hotend_model": "ultimaker_hotend.stl", - "default_materials": "Generic ABS @System;Generic PETG @System;Generic PLA @System" + "default_materials": "Generic ABS @UltiMaker 2 0.4 nozzle;Generic PETG @UltiMaker 2 0.4 nozzle;Generic PLA @UltiMaker 2 0.4 nozzle;Generic ABS @UltiMaker 2 0.6 nozzle;Generic PETG @UltiMaker 2 0.6 nozzle;Generic PLA @UltiMaker 2 0.6 nozzle;Generic ABS @UltiMaker 2 0.8 nozzle;Generic PETG @UltiMaker 2 0.8 nozzle;Generic PLA @UltiMaker 2 0.8 nozzle" } diff --git a/resources/profiles/UltiMaker/machine/fdm_machine_common.json b/resources/profiles/UltiMaker/machine/fdm_machine_common.json index 2f5795627a..c1536f7f7d 100644 --- a/resources/profiles/UltiMaker/machine/fdm_machine_common.json +++ b/resources/profiles/UltiMaker/machine/fdm_machine_common.json @@ -1,117 +1,135 @@ { - "type": "machine", - "name": "fdm_machine_common", - "from": "system", - "instantiation": "false", - "printer_technology": "FFF", - "deretraction_speed": [ - "40" - ], - "extruder_colour": [ - "#FCE94F" - ], - "extruder_offset": [ - "0x0" - ], - "gcode_flavor": "marlin", - "machine_max_acceleration_e": [ - "10000" - ], - "machine_max_acceleration_extruding": [ - "1500" - ], - "machine_max_acceleration_retracting": [ - "1500" - ], - "machine_max_acceleration_x": [ - "3000" - ], - "machine_max_acceleration_y": [ - "3000" - ], - "machine_max_acceleration_z": [ - "500" - ], - "machine_max_speed_e": [ - "120" - ], - "machine_max_speed_x": [ - "500" - ], - "machine_max_speed_y": [ - "500" - ], - "machine_max_speed_z": [ - "12" - ], - "machine_max_jerk_e": [ - "2.5" - ], - "machine_max_jerk_x": [ - "20" - ], - "machine_max_jerk_y": [ - "20" - ], - "machine_max_jerk_z": [ - "0.4" - ], - "machine_min_extruding_rate": [ - "0" - ], - "machine_min_travel_rate": [ - "0" - ], - "max_layer_height": [ - "0.3" - ], - "min_layer_height": [ - "0.07" - ], - "printable_height": "212", - "extruder_clearance_radius": "65", - "extruder_clearance_height_to_rod": "36", - "extruder_clearance_height_to_lid": "140", - "nozzle_diameter": [ - "0.4" - ], - "printer_settings_id": "", - "printer_variant": "0.4", - "retraction_minimum_travel": [ - "2" - ], - "retract_before_wipe": [ - "0%" - ], - "retract_when_changing_layer": [ - "1" - ], - "retraction_length": [ - "6" - ], - "retract_length_toolchange": [ - "10" - ], - "z_hop": [ - "0" - ], - "retract_restart_extra": [ - "0" - ], - "retract_restart_extra_toolchange": [ - "0" - ], - "retraction_speed": [ - "50" - ], - "single_extruder_multi_material": "1", - "change_filament_gcode": "", - "wipe": [ - "1" - ], - "default_print_profile": "", - "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", - "machine_start_gcode": "", - "machine_end_gcode": "", - "thumbnails": "" + "type": "machine", + "name": "fdm_machine_common", + "from": "system", + "instantiation": "false", + "printer_technology": "FFF", + "deretraction_speed": [ + "40" + ], + "extruder_colour": [ + "#FCE94F" + ], + "extruder_offset": [ + "0x0" + ], + "gcode_flavor": "marlin", + "auxiliary_fan": "0", + "machine_max_acceleration_travel": [ + "3000", + "3000" + ], + "machine_max_junction_deviation": [ + "0.013", + "0" + ], + "machine_max_acceleration_e": [ + "5000" + ], + "machine_max_acceleration_extruding": [ + "1500", + "1500" + ], + "machine_max_acceleration_retracting": [ + "1500", + "1500" + ], + "machine_max_acceleration_x": [ + "3000", + "3000" + ], + "machine_max_acceleration_y": [ + "3000", + "3000" + ], + "machine_max_acceleration_z": [ + "500", + "500" + ], + "machine_max_speed_e": [ + "100", + "100" + ], + "machine_max_speed_x": [ + "300", + "300" + ], + "machine_max_speed_y": [ + "300", + "300" + ], + "machine_max_speed_z": [ + "40", + "40" + ], + "machine_max_jerk_e": [ + "2.5", + "2.5" + ], + "machine_max_jerk_x": [ + "20", + "20" + ], + "machine_max_jerk_y": [ + "20", + "20" + ], + "machine_max_jerk_z": [ + "0.4", + "0.4" + ], + "machine_min_extruding_rate": [ + "0" + ], + "machine_min_travel_rate": [ + "0" + ], + "max_layer_height": [ + "0.3" + ], + "min_layer_height": [ + "0.08" + ], + "printer_settings_id": "", + "printer_variant": "0.4", + "retraction_minimum_travel": [ + "2" + ], + "retract_before_wipe": [ + "0%" + ], + "retract_when_changing_layer": [ + "1" + ], + "retraction_length": [ + "6" + ], + "retract_length_toolchange": [ + "25" + ], + "z_hop": [ + "0" + ], + "retract_restart_extra": [ + "0" + ], + "retract_restart_extra_toolchange": [ + "0" + ], + "retraction_speed": [ + "50" + ], + "single_extruder_multi_material": "1", + "change_filament_gcode": "", + "wipe": [ + "1" + ], + "wipe_distance": [ + "0.2" + ], + "machine_pause_gcode": "M0", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", + "machine_start_gcode": "; # # # # # # START Header\nG21; metric values\nG90; absolute positioning\nM82 ; set extruder to absolute mode\nM107; start with the fan off\n\nM140 S[bed_temperature_initial_layer_single]; start bed heating\n\nG28 X0 Y0 Z0; move X/Y/Z to endstops\nG1 X1 Y6 F15000; move X/Y to start position\nG1 Z35 F9000; move Z to start position\n\n; Wait for bed and nozzle temperatures\nM190 S{hot_plate_temp_initial_layer[0] - 5}; wait for bed temperature - 5\nM140 S[bed_temperature_initial_layer_single]; continue bed heating\nM109 S[nozzle_temperature_initial_layer]; wait for nozzle temperature\n\n; Purge and prime\nM83; set extruder to relative mode\nG92 E0; reset extrusion distance\nG0 X0 Y1 F10000\nG1 F150 E20 ; compress the bowden tube\nG1 E-8 F1200\nG0 X30 Y1 F5000\nG0 F1200 Z{initial_layer_print_height/2}; Cut the connection to priming blob\nG0 X100 F10000; disconnect with the prime blob\nG0 X50; Avoid the metal clip holding the Ultimaker glass plate\nG0 Z0.2 F720\nG1 E8 F1200\nG1 X80 E3 F1000; intro line 1\nG1 X110 E4 F1000 ; intro line 2\nG1 X140 F600; drag filament to decompress bowden tube\nG1 X100 F3200; wipe backwards a bit\nG1 X150 F3200; back to where there is no plastic: avoid dragging\nG92 E0; reset extruder reference\nM82; set extruder to absolute mode\n\n; # # # # # # END Header", + "machine_end_gcode": "; # # # # # # START Footer\nG91; relative coordinates\n;G1 E-1 F1200; retract the filament\nG1 Z+15 X-10 Y-10 E-7 F6000; move Z a bit\n; G1 X-10 Y-10 F6000; move XY a bit\nG1 E-5.5 F300; retract the filament\nG28 X0 Y0; move X/Y to min endstops, so the head is out of the way\nM104 S0; extruder heater off\nM140 S0; heated bed heater off (if you have it)\nM84; disable motors\n; # # # # # # END Footer\n", + "thumbnails": "" } diff --git a/resources/profiles/UltiMaker/process/0.10mm Fine @UltiMaker 2 extended+.json b/resources/profiles/UltiMaker/process/0.10mm Fine @UltiMaker 2 extended+.json new file mode 100644 index 0000000000..fd008304f7 --- /dev/null +++ b/resources/profiles/UltiMaker/process/0.10mm Fine @UltiMaker 2 extended+.json @@ -0,0 +1,9 @@ +{ + "type": "process", + "name": "0.10mm Fine @UltiMaker 2 extended+", + "inherits": "0.10mm Fine @UltiMaker 2+", + "from": "system", + "setting_id": "unx8qKjXQzjX8IL1", + "instantiation": "true", + "compatible_printers": ["UltiMaker 2 extended+ 0.4 nozzle"] +} diff --git a/resources/profiles/UltiMaker/process/0.10mm Fine @UltiMaker 2+.json b/resources/profiles/UltiMaker/process/0.10mm Fine @UltiMaker 2+.json new file mode 100644 index 0000000000..aa6fb2f3ed --- /dev/null +++ b/resources/profiles/UltiMaker/process/0.10mm Fine @UltiMaker 2+.json @@ -0,0 +1,11 @@ +{ + "type": "process", + "name": "0.10mm Fine @UltiMaker 2+", + "inherits": "0.10mm Fine @UltiMaker 2", + "from": "system", + "setting_id": "NunkyT8BK1PXysFl", + "instantiation": "true", + "compatible_printers": [ + "UltiMaker 2+ 0.4 nozzle" + ] +} diff --git a/resources/profiles/UltiMaker/process/0.10mm Fine @UltiMaker 2.json b/resources/profiles/UltiMaker/process/0.10mm Fine @UltiMaker 2.json new file mode 100644 index 0000000000..436df6e85b --- /dev/null +++ b/resources/profiles/UltiMaker/process/0.10mm Fine @UltiMaker 2.json @@ -0,0 +1,41 @@ +{ + "type": "process", + "name": "0.10mm Fine @UltiMaker 2", + "renamed_from": "0.12mm Fine @UltiMaker 2", + + "inherits": "fdm_process_common", + "from": "system", + "setting_id": "S211pmrcTyysKIZ4", + "instantiation": "true", + "layer_height": "0.10", + "initial_layer_infill_speed": [ + "45" + ], + "inner_wall_speed": [ + "30" + ], + "internal_solid_infill_speed": [ + "45" + ], + "outer_wall_speed": [ + "20" + ], + "small_perimeter_speed": [ + "20" + ], + "sparse_infill_speed": [ + "45" + ], + "support_interface_speed": [ + "50" + ], + "support_speed": [ + "50" + ], + "top_surface_speed": [ + "20" + ], + "compatible_printers": [ + "UltiMaker 2 0.4 nozzle" + ] +} diff --git a/resources/profiles/UltiMaker/process/0.12mm Fine @UltiMaker 2.json b/resources/profiles/UltiMaker/process/0.12mm Fine @UltiMaker 2.json deleted file mode 100644 index a71eed1b78..0000000000 --- a/resources/profiles/UltiMaker/process/0.12mm Fine @UltiMaker 2.json +++ /dev/null @@ -1,107 +0,0 @@ -{ - "type": "process", - "name": "0.12mm Fine @UltiMaker 2", - "inherits": "fdm_process_common", - "from": "system", - "setting_id": "4iVomDxutraufw6B", - "instantiation": "true", - "reduce_crossing_wall": "0", - "layer_height": "0.12", - "max_travel_detour_distance": "0", - "bottom_surface_pattern": "monotonic", - "bottom_shell_layers": "6", - "bottom_shell_thickness": "0", - "bridge_flow": "1", - "bridge_speed": "60", - "brim_width": "0", - "brim_object_gap": "0", - "compatible_printers_condition": "", - "print_sequence": "by layer", - "default_acceleration": "0", - "top_surface_acceleration": "0", - "bridge_no_support": "0", - "draft_shield": "disabled", - "elefant_foot_compensation": "0", - "enable_arc_fitting": "0", - "outer_wall_line_width": "0.4", - "wall_infill_order": "inner wall/outer wall/infill", - "line_width": "0.45", - "infill_direction": "45", - "sparse_infill_density": "15%", - "sparse_infill_pattern": "crosshatch", - "initial_layer_acceleration": "500", - "travel_acceleration": "0", - "inner_wall_acceleration": "0", - "initial_layer_line_width": "0.42", - "initial_layer_print_height": "0.3", - "infill_combination": "0", - "sparse_infill_line_width": "0.45", - "infill_wall_overlap": "35%", - "interface_shells": "0", - "ironing_flow": "15%", - "ironing_spacing": "0.1", - "ironing_speed": "15", - "ironing_type": "no ironing", - "reduce_infill_retraction": "1", - "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", - "detect_overhang_wall": "1", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "20", - "overhang_3_4_speed": "15", - "overhang_4_4_speed": "10", - "inner_wall_line_width": "0.45", - "wall_loops": "2", - "print_settings_id": "", - "raft_layers": "0", - "seam_position": "aligned", - "skirt_distance": "3", - "skirt_height": "1", - "skirt_loops": "2", - "minimum_sparse_infill_area": "10", - "internal_solid_infill_line_width": "0", - "spiral_mode": "0", - "standby_temperature_delta": "-5", - "enable_support": "0", - "resolution": "0.012", - "support_type": "normal(auto)", - "support_style": "grid", - "support_on_build_plate_only": "0", - "support_top_z_distance": "0.2", - "support_filament": "0", - "support_line_width": "0.4", - "support_interface_loop_pattern": "0", - "support_interface_filament": "0", - "support_interface_top_layers": "3", - "support_interface_bottom_layers": "-1", - "support_interface_spacing": "0.2", - "support_interface_speed": "100%", - "support_base_pattern": "rectilinear", - "support_base_pattern_spacing": "0.2", - "support_speed": "60", - "support_threshold_angle": "30", - "support_object_xy_distance": "50%", - "tree_support_branch_angle": "40", - "tree_support_wall_count": "0", - "detect_thin_wall": "1", - "top_surface_pattern": "monotonicline", - "top_surface_line_width": "0.4", - "top_shell_layers": "7", - "top_shell_thickness": "0.8", - "initial_layer_speed": "35%", - "initial_layer_infill_speed": "35%", - "outer_wall_speed": "200", - "inner_wall_speed": "300", - "internal_solid_infill_speed": "250", - "top_surface_speed": "200", - "gap_infill_speed": "250", - "sparse_infill_speed": "270", - "travel_speed": "150", - "enable_prime_tower": "1", - "wipe_tower_no_sparse_layers": "0", - "prime_tower_width": "60", - "xy_hole_compensation": "0", - "xy_contour_compensation": "0", - "compatible_printers": [ - "UltiMaker 2 0.4 nozzle" - ] -} diff --git a/resources/profiles/UltiMaker/process/0.15mm Standard @UltiMaker 2 0.6 nozzle.json b/resources/profiles/UltiMaker/process/0.15mm Standard @UltiMaker 2 0.6 nozzle.json new file mode 100644 index 0000000000..5dfed2142f --- /dev/null +++ b/resources/profiles/UltiMaker/process/0.15mm Standard @UltiMaker 2 0.6 nozzle.json @@ -0,0 +1,18 @@ +{ + "type": "process", + "name": "0.15mm Standard @UltiMaker 2 0.6 nozzle", + "inherits": "fdm_process_common", + "from": "system", + "setting_id": "MDKnppk0uwm6HnKz", + "instantiation": "true", + "layer_height": "0.15", + "initial_layer_line_width": "0.6", + "inner_wall_line_width": "0.6", + "internal_solid_infill_line_width": "0.6", + "line_width": "0.6", + "outer_wall_line_width": "0.6", + "sparse_infill_line_width": "0.6", + "support_line_width": "0.55", + "top_surface_line_width": "0.6", + "compatible_printers": ["UltiMaker 2 0.6 nozzle"] +} diff --git a/resources/profiles/UltiMaker/process/0.15mm Standard @UltiMaker 2 extended+ 0.6 nozzle.json b/resources/profiles/UltiMaker/process/0.15mm Standard @UltiMaker 2 extended+ 0.6 nozzle.json new file mode 100644 index 0000000000..d41516f825 --- /dev/null +++ b/resources/profiles/UltiMaker/process/0.15mm Standard @UltiMaker 2 extended+ 0.6 nozzle.json @@ -0,0 +1,9 @@ +{ + "type": "process", + "name": "0.15mm Standard @UltiMaker 2 extended+ 0.6 nozzle", + "inherits": "0.15mm Standard @UltiMaker 2+ 0.6 nozzle", + "from": "system", + "setting_id": "ODmg35VjyLPysmRm", + "instantiation": "true", + "compatible_printers": ["UltiMaker 2 extended+ 0.6 nozzle"] +} diff --git a/resources/profiles/UltiMaker/process/0.15mm Standard @UltiMaker 2 extended+.json b/resources/profiles/UltiMaker/process/0.15mm Standard @UltiMaker 2 extended+.json new file mode 100644 index 0000000000..e7bf5cfe7a --- /dev/null +++ b/resources/profiles/UltiMaker/process/0.15mm Standard @UltiMaker 2 extended+.json @@ -0,0 +1,9 @@ +{ + "type": "process", + "name": "0.15mm Standard @UltiMaker 2 extended+", + "inherits": "0.15mm Standard @UltiMaker 2+", + "from": "system", + "setting_id": "hThxh6XoFAmcRMeW", + "instantiation": "true", + "compatible_printers": ["UltiMaker 2 extended+ 0.4 nozzle"] +} diff --git a/resources/profiles/UltiMaker/process/0.15mm Standard @UltiMaker 2+ 0.6 nozzle.json b/resources/profiles/UltiMaker/process/0.15mm Standard @UltiMaker 2+ 0.6 nozzle.json new file mode 100644 index 0000000000..11110c24bb --- /dev/null +++ b/resources/profiles/UltiMaker/process/0.15mm Standard @UltiMaker 2+ 0.6 nozzle.json @@ -0,0 +1,11 @@ +{ + "type": "process", + "name": "0.15mm Standard @UltiMaker 2+ 0.6 nozzle", + "inherits": "0.15mm Standard @UltiMaker 2 0.6 nozzle", + "from": "system", + "setting_id": "WhWdCNGc5WJC2wPy", + "instantiation": "true", + "compatible_printers": [ + "UltiMaker 2+ 0.6 nozzle" + ] +} diff --git a/resources/profiles/UltiMaker/process/0.15mm Standard @UltiMaker 2+.json b/resources/profiles/UltiMaker/process/0.15mm Standard @UltiMaker 2+.json new file mode 100644 index 0000000000..c71005b5c5 --- /dev/null +++ b/resources/profiles/UltiMaker/process/0.15mm Standard @UltiMaker 2+.json @@ -0,0 +1,11 @@ +{ + "type": "process", + "name": "0.15mm Standard @UltiMaker 2+", + "inherits": "0.15mm Standard @UltiMaker 2", + "from": "system", + "setting_id": "B1wRaMeJfyNAYxjk", + "instantiation": "true", + "compatible_printers": [ + "UltiMaker 2+ 0.4 nozzle" + ] +} diff --git a/resources/profiles/UltiMaker/process/0.15mm Standard @UltiMaker 2.json b/resources/profiles/UltiMaker/process/0.15mm Standard @UltiMaker 2.json new file mode 100644 index 0000000000..897abb33c8 --- /dev/null +++ b/resources/profiles/UltiMaker/process/0.15mm Standard @UltiMaker 2.json @@ -0,0 +1,14 @@ +{ + "type": "process", + "name": "0.15mm Standard @UltiMaker 2", + "renamed_from": "0.18mm Standard @UltiMaker 2", + + "inherits": "fdm_process_common", + "from": "system", + "setting_id": "DMwYsBx9nEttVhhP", + "instantiation": "true", + "layer_height": "0.15", + "compatible_printers": [ + "UltiMaker 2 0.4 nozzle" + ] +} diff --git a/resources/profiles/UltiMaker/process/0.18mm Standard @UltiMaker 2.json b/resources/profiles/UltiMaker/process/0.18mm Standard @UltiMaker 2.json deleted file mode 100644 index 5026572ee8..0000000000 --- a/resources/profiles/UltiMaker/process/0.18mm Standard @UltiMaker 2.json +++ /dev/null @@ -1,108 +0,0 @@ -{ - "type": "process", - "name": "0.18mm Standard @UltiMaker 2", - "inherits": "fdm_process_common", - "from": "system", - "setting_id": "Mo2NUdUehA5y4OwV", - "instantiation": "true", - "reduce_crossing_wall": "0", - "layer_height": "0.18", - "max_travel_detour_distance": "0", - "bottom_surface_pattern": "monotonic", - "bottom_shell_layers": "4", - "bottom_shell_thickness": "0.8", - "bridge_flow": "1", - "bridge_speed": "60", - "brim_width": "0", - "brim_object_gap": "0", - "compatible_printers_condition": "", - "print_sequence": "by layer", - "default_acceleration": "0", - "top_surface_acceleration": "0", - "bridge_no_support": "0", - "draft_shield": "disabled", - "elefant_foot_compensation": "0", - "enable_arc_fitting": "0", - "outer_wall_line_width": "0.4", - "wall_infill_order": "inner wall/outer wall/infill", - "line_width": "0.45", - "infill_direction": "45", - "sparse_infill_density": "20%", - "sparse_infill_pattern": "crosshatch", - "initial_layer_acceleration": "500", - "travel_acceleration": "0", - "inner_wall_acceleration": "0", - "initial_layer_line_width": "0.45", - "initial_layer_print_height": "0.25", - "infill_combination": "0", - "sparse_infill_line_width": "0.5", - "infill_wall_overlap": "35%", - "interface_shells": "0", - "ironing_flow": "15%", - "ironing_spacing": "0.1", - "ironing_speed": "15", - "ironing_type": "no ironing", - "reduce_infill_retraction": "1", - "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", - "detect_overhang_wall": "1", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "20", - "overhang_3_4_speed": "15", - "overhang_4_4_speed": "10", - "inner_wall_line_width": "0.45", - "wall_loops": "3", - "print_settings_id": "", - "raft_layers": "0", - "seam_position": "aligned", - "skirt_distance": "3", - "skirt_height": "1", - "skirt_loops": "2", - "minimum_sparse_infill_area": "10", - "internal_solid_infill_line_width": "0.45", - "spiral_mode": "0", - "standby_temperature_delta": "-5", - "enable_support": "0", - "resolution": "0.012", - "support_type": "normal(auto)", - "support_style": "grid", - "support_on_build_plate_only": "0", - "support_top_z_distance": "0.2", - "support_filament": "0", - "support_line_width": "0.45", - "support_interface_loop_pattern": "0", - "support_interface_filament": "0", - "support_interface_top_layers": "3", - "support_interface_bottom_layers": "-1", - "support_interface_spacing": "0.2", - "support_interface_speed": "100%", - "support_base_pattern": "rectilinear", - "support_base_pattern_spacing": "0.2", - "support_speed": "45", - "support_threshold_angle": "30", - "support_object_xy_distance": "50%", - "tree_support_branch_angle": "40", - "tree_support_wall_count": "0", - "detect_thin_wall": "1", - "top_surface_pattern": "monotonicline", - "top_surface_line_width": "0.4", - "top_shell_layers": "5", - "top_shell_thickness": "0.8", - "initial_layer_speed": "15", - "initial_layer_infill_speed": "30", - "initial_layer_travel_speed": "60", - "outer_wall_speed": "30", - "inner_wall_speed": "40", - "internal_solid_infill_speed": "40", - "top_surface_speed": "15", - "gap_infill_speed": "20", - "sparse_infill_speed": "40", - "travel_speed": "120", - "enable_prime_tower": "1", - "wipe_tower_no_sparse_layers": "0", - "prime_tower_width": "60", - "xy_hole_compensation": "0", - "xy_contour_compensation": "0", - "compatible_printers": [ - "UltiMaker 2 0.4 nozzle" - ] -} diff --git a/resources/profiles/UltiMaker/process/0.20mm Draft @UltiMaker 2 extended+.json b/resources/profiles/UltiMaker/process/0.20mm Draft @UltiMaker 2 extended+.json new file mode 100644 index 0000000000..5ca0914ab7 --- /dev/null +++ b/resources/profiles/UltiMaker/process/0.20mm Draft @UltiMaker 2 extended+.json @@ -0,0 +1,9 @@ +{ + "type": "process", + "name": "0.20mm Draft @UltiMaker 2 extended+", + "inherits": "0.20mm Draft @UltiMaker 2+", + "from": "system", + "setting_id": "WOioHgeBkOd6k8xv", + "instantiation": "true", + "compatible_printers": ["UltiMaker 2 extended+ 0.4 nozzle"] +} diff --git a/resources/profiles/UltiMaker/process/0.20mm Draft @UltiMaker 2+.json b/resources/profiles/UltiMaker/process/0.20mm Draft @UltiMaker 2+.json new file mode 100644 index 0000000000..985d6cbb39 --- /dev/null +++ b/resources/profiles/UltiMaker/process/0.20mm Draft @UltiMaker 2+.json @@ -0,0 +1,11 @@ +{ + "type": "process", + "name": "0.20mm Draft @UltiMaker 2+", + "inherits": "0.20mm Draft @UltiMaker 2", + "from": "system", + "setting_id": "YYBsvqtDRBbOVymM", + "instantiation": "true", + "compatible_printers": [ + "UltiMaker 2+ 0.4 nozzle" + ] +} diff --git a/resources/profiles/UltiMaker/process/0.20mm Draft @UltiMaker 2.json b/resources/profiles/UltiMaker/process/0.20mm Draft @UltiMaker 2.json new file mode 100644 index 0000000000..ffe05bcd0f --- /dev/null +++ b/resources/profiles/UltiMaker/process/0.20mm Draft @UltiMaker 2.json @@ -0,0 +1,14 @@ +{ + "type": "process", + "name": "0.20mm Draft @UltiMaker 2", + "renamed_from": "0.25mm Draft @UltiMaker 2;0.25mm Darft @UltiMaker 2", + + "inherits": "fdm_process_common", + "from": "system", + "setting_id": "0ER4fay08CyW7RBE", + "instantiation": "true", + "layer_height": "0.2", + "compatible_printers": [ + "UltiMaker 2 0.4 nozzle" + ] +} diff --git a/resources/profiles/UltiMaker/process/0.20mm Standard @UltiMaker 2 0.8 nozzle.json b/resources/profiles/UltiMaker/process/0.20mm Standard @UltiMaker 2 0.8 nozzle.json new file mode 100644 index 0000000000..3a2c5b0ac1 --- /dev/null +++ b/resources/profiles/UltiMaker/process/0.20mm Standard @UltiMaker 2 0.8 nozzle.json @@ -0,0 +1,20 @@ +{ + "type": "process", + "name": "0.20mm Standard @UltiMaker 2 0.8 nozzle", + "inherits": "fdm_process_common", + "from": "system", + "setting_id": "3uZgBgrpfxrgO72L", + "instantiation": "true", + "layer_height": "0.20", + "initial_layer_line_width": "0.8", + "inner_wall_line_width": "0.8", + "internal_solid_infill_line_width": "0.8", + "line_width": "0.8", + "outer_wall_line_width": "0.8", + "sparse_infill_line_width": "0.8", + "support_line_width": "0.75", + "top_surface_line_width": "0.8", + "compatible_printers": [ + "UltiMaker 2 0.8 nozzle" + ] +} diff --git a/resources/profiles/UltiMaker/process/0.20mm Standard @UltiMaker 2 extended+ 0.8 nozzle.json b/resources/profiles/UltiMaker/process/0.20mm Standard @UltiMaker 2 extended+ 0.8 nozzle.json new file mode 100644 index 0000000000..a423edbeaa --- /dev/null +++ b/resources/profiles/UltiMaker/process/0.20mm Standard @UltiMaker 2 extended+ 0.8 nozzle.json @@ -0,0 +1,9 @@ +{ + "type": "process", + "name": "0.20mm Standard @UltiMaker 2 extended+ 0.8 nozzle", + "inherits": "0.20mm Standard @UltiMaker 2+ 0.8 nozzle", + "from": "system", + "setting_id": "NVU7KQjM3gC4OdDf", + "instantiation": "true", + "compatible_printers": ["UltiMaker 2 extended+ 0.8 nozzle"] +} diff --git a/resources/profiles/UltiMaker/process/0.20mm Standard @UltiMaker 2+ 0.8 nozzle.json b/resources/profiles/UltiMaker/process/0.20mm Standard @UltiMaker 2+ 0.8 nozzle.json new file mode 100644 index 0000000000..d75052e17c --- /dev/null +++ b/resources/profiles/UltiMaker/process/0.20mm Standard @UltiMaker 2+ 0.8 nozzle.json @@ -0,0 +1,11 @@ +{ + "type": "process", + "name": "0.20mm Standard @UltiMaker 2+ 0.8 nozzle", + "inherits": "0.20mm Standard @UltiMaker 2 0.8 nozzle", + "from": "system", + "setting_id": "DPdijbiqpZNuZr58", + "instantiation": "true", + "compatible_printers": [ + "UltiMaker 2+ 0.8 nozzle" + ] +} diff --git a/resources/profiles/UltiMaker/process/fdm_process_common.json b/resources/profiles/UltiMaker/process/fdm_process_common.json index 45c9bcf236..04c303af75 100644 --- a/resources/profiles/UltiMaker/process/fdm_process_common.json +++ b/resources/profiles/UltiMaker/process/fdm_process_common.json @@ -3,67 +3,75 @@ "name": "fdm_process_common", "from": "system", "instantiation": "false", - "reduce_crossing_wall": "0", - "bridge_flow": "0.95", - "bridge_speed": "25", - "brim_width": "5", - "compatible_printers": [], - "print_sequence": "by layer", - "default_acceleration": "0", - "bridge_no_support": "0", - "elefant_foot_compensation": "0.1", + "bottom_shell_layers": "5", + "bottom_shell_thickness": "0.75", + "fuzzy_skin_point_distance": "0.8", + "fuzzy_skin_thickness": "0.3", + "gap_infill_speed": [ + "40" + ], + "infill_anchor": "2.5", + "infill_anchor_max": "12", + "infill_combination": "1", + "infill_combination_max_layer_height": "80%", + "initial_layer_line_width": "0.4", + "initial_layer_speed": [ + "20" + ], + "inner_wall_acceleration": [ + "800" + ], + "inner_wall_line_width": "0.4", + "inner_wall_speed": [ + "55" + ], + "internal_solid_infill_line_width": "0.4", + "internal_solid_infill_speed": [ + "60" + ], + "is_infill_first": "1", + "line_width": "0.4", "outer_wall_line_width": "0.4", - "outer_wall_speed": "120", - "line_width": "0.45", - "infill_direction": "45", - "sparse_infill_density": "15%", - "sparse_infill_pattern": "crosshatch", - "initial_layer_line_width": "0.42", - "initial_layer_print_height": "0.2", - "initial_layer_speed": "20", - "gap_infill_speed": "30", - "infill_combination": "0", - "sparse_infill_line_width": "0.45", - "infill_wall_overlap": "25%", - "sparse_infill_speed": "50", - "interface_shells": "0", - "detect_overhang_wall": "0", - "reduce_infill_retraction": "0", - "filename_format": "{input_filename_base}.gcode", - "wall_loops": "3", - "inner_wall_line_width": "0.45", - "inner_wall_speed": "40", - "print_settings_id": "", - "raft_layers": "0", - "seam_position": "nearest", - "skirt_distance": "2", - "skirt_height": "2", - "minimum_sparse_infill_area": "0", - "internal_solid_infill_line_width": "0.45", - "internal_solid_infill_speed": "40", - "spiral_mode": "0", - "standby_temperature_delta": "-5", - "enable_support": "0", - "support_filament": "0", - "support_line_width": "0.42", - "support_interface_filament": "0", - "support_on_build_plate_only": "0", - "support_top_z_distance": "0.15", - "support_interface_loop_pattern": "0", - "support_interface_top_layers": "2", - "support_interface_spacing": "0", - "support_interface_speed": "80", - "support_base_pattern": "rectilinear", - "support_base_pattern_spacing": "2", - "support_speed": "40", - "support_threshold_angle": "30", - "support_object_xy_distance": "0.5", - "detect_thin_wall": "0", + "outer_wall_speed": [ + "40" + ], + "overhang_1_4_speed": [ + "25" + ], + "overhang_2_4_speed": [ + "20" + ], + "overhang_3_4_speed": [ + "15" + ], + "overhang_4_4_speed": [ + "15" + ], + "print_extruder_variant": [ + "Bowden Standard" + ], + "small_perimeter_speed": [ + "25" + ], + "sparse_infill_density": "18%", + "sparse_infill_line_width": "0.4", + "sparse_infill_speed": [ + "80" + ], + "support_interface_speed": [ + "55" + ], + "support_line_width": "0.35", + "support_speed": [ + "55" + ], + "top_shell_layers": "5", + "top_shell_thickness": "0.75", "top_surface_line_width": "0.4", - "top_surface_speed": "30", - "travel_speed": "400", - "enable_prime_tower": "1", - "prime_tower_width": "60", - "xy_hole_compensation": "0", - "xy_contour_compensation": "0" + "top_surface_speed": [ + "40" + ], + "travel_acceleration": [ + "800" + ] } diff --git a/resources/profiles/Wanhao.json b/resources/profiles/Wanhao.json index 81afe3eff5..96290c7712 100644 --- a/resources/profiles/Wanhao.json +++ b/resources/profiles/Wanhao.json @@ -1,12 +1,60 @@ { "name": "Wanhao", - "version": "02.04.00.02", + "version": "02.04.00.03", "force_update": "0", "description": "Wanhao configurations", "machine_model_list": [ { "name": "Wanhao D12-300", "sub_path": "machine/Wanhao D12-300.json" + }, + { + "name": "Wanhao D9-300 MK1", + "sub_path": "machine/Wanhao D9-300 MK1.json" + }, + { + "name": "Wanhao D9-300 MK1 BLTouch kit", + "sub_path": "machine/Wanhao D9-300 MK1 BLTouch kit.json" + }, + { + "name": "Wanhao D9-300 MK2", + "sub_path": "machine/Wanhao D9-300 MK2.json" + }, + { + "name": "Wanhao D9-300 MK3", + "sub_path": "machine/Wanhao D9-300 MK3.json" + }, + { + "name": "Wanhao D9-400 MK1", + "sub_path": "machine/Wanhao D9-400 MK1.json" + }, + { + "name": "Wanhao D9-400 MK1 BLTouch kit", + "sub_path": "machine/Wanhao D9-400 MK1 BLTouch kit.json" + }, + { + "name": "Wanhao D9-400 MK2", + "sub_path": "machine/Wanhao D9-400 MK2.json" + }, + { + "name": "Wanhao D9-400 MK3", + "sub_path": "machine/Wanhao D9-400 MK3.json" + }, + { + "name": "Wanhao D9-500 MK1", + "sub_path": "machine/Wanhao D9-500 MK1.json" + }, + { + "name": "Wanhao D9-500 MK1 BLTouch kit", + "sub_path": "machine/Wanhao D9-500 MK1 BLTouch kit.json" + }, + { + "name": "Wanhao D9-500 MK2", + "sub_path": "machine/Wanhao D9-500 MK2.json" + }, + { + "name": "Wanhao D9-500 MK3", + "sub_path": "machine/Wanhao D9-500 MK3.json" } ], "process_list": [ @@ -33,6 +81,38 @@ { "name": "0.24mm Draft @Wanhao D12-300", "sub_path": "process/0.24mm Draft @Wanhao D12-300.json" + }, + { + "name": "fdm_process_wanhao_d9_common", + "sub_path": "process/fdm_process_wanhao_d9_common.json" + }, + { + "name": "0.12mm Fine @Wanhao D9", + "sub_path": "process/0.12mm Fine @Wanhao D9.json" + }, + { + "name": "0.20mm Standard @Wanhao D9", + "sub_path": "process/0.20mm Standard @Wanhao D9.json" + }, + { + "name": "0.28mm Draft @Wanhao D9", + "sub_path": "process/0.28mm Draft @Wanhao D9.json" + }, + { + "name": "fdm_process_wanhao_d9_mk1_common", + "sub_path": "process/fdm_process_wanhao_d9_mk1_common.json" + }, + { + "name": "0.12mm Fine @Wanhao D9 MK1", + "sub_path": "process/0.12mm Fine @Wanhao D9 MK1.json" + }, + { + "name": "0.20mm Standard @Wanhao D9 MK1", + "sub_path": "process/0.20mm Standard @Wanhao D9 MK1.json" + }, + { + "name": "0.28mm Draft @Wanhao D9 MK1", + "sub_path": "process/0.28mm Draft @Wanhao D9 MK1.json" } ], "filament_list": [], @@ -48,6 +128,62 @@ { "name": "Wanhao D12-300 0.4 nozzle", "sub_path": "machine/Wanhao D12-300 0.4 nozzle.json" + }, + { + "name": "fdm_wanhao_d9_common", + "sub_path": "machine/fdm_wanhao_d9_common.json" + }, + { + "name": "Wanhao D9-300 MK1 BLTouch kit 0.4 nozzle", + "sub_path": "machine/Wanhao D9-300 MK1 BLTouch kit 0.4 nozzle.json" + }, + { + "name": "Wanhao D9-300 MK2 0.4 nozzle", + "sub_path": "machine/Wanhao D9-300 MK2 0.4 nozzle.json" + }, + { + "name": "Wanhao D9-300 MK3 0.4 nozzle", + "sub_path": "machine/Wanhao D9-300 MK3 0.4 nozzle.json" + }, + { + "name": "Wanhao D9-400 MK1 BLTouch kit 0.4 nozzle", + "sub_path": "machine/Wanhao D9-400 MK1 BLTouch kit 0.4 nozzle.json" + }, + { + "name": "Wanhao D9-400 MK2 0.4 nozzle", + "sub_path": "machine/Wanhao D9-400 MK2 0.4 nozzle.json" + }, + { + "name": "Wanhao D9-400 MK3 0.4 nozzle", + "sub_path": "machine/Wanhao D9-400 MK3 0.4 nozzle.json" + }, + { + "name": "Wanhao D9-500 MK1 BLTouch kit 0.4 nozzle", + "sub_path": "machine/Wanhao D9-500 MK1 BLTouch kit 0.4 nozzle.json" + }, + { + "name": "Wanhao D9-500 MK2 0.4 nozzle", + "sub_path": "machine/Wanhao D9-500 MK2 0.4 nozzle.json" + }, + { + "name": "Wanhao D9-500 MK3 0.4 nozzle", + "sub_path": "machine/Wanhao D9-500 MK3 0.4 nozzle.json" + }, + { + "name": "fdm_wanhao_d9_mk1_common", + "sub_path": "machine/fdm_wanhao_d9_mk1_common.json" + }, + { + "name": "Wanhao D9-300 MK1 0.4 nozzle", + "sub_path": "machine/Wanhao D9-300 MK1 0.4 nozzle.json" + }, + { + "name": "Wanhao D9-400 MK1 0.4 nozzle", + "sub_path": "machine/Wanhao D9-400 MK1 0.4 nozzle.json" + }, + { + "name": "Wanhao D9-500 MK1 0.4 nozzle", + "sub_path": "machine/Wanhao D9-500 MK1 0.4 nozzle.json" } ] } diff --git a/resources/profiles/Wanhao/machine/Wanhao D9-300 MK1 0.4 nozzle.json b/resources/profiles/Wanhao/machine/Wanhao D9-300 MK1 0.4 nozzle.json new file mode 100644 index 0000000000..331a26e5ed --- /dev/null +++ b/resources/profiles/Wanhao/machine/Wanhao D9-300 MK1 0.4 nozzle.json @@ -0,0 +1,20 @@ +{ + "type": "machine", + "name": "Wanhao D9-300 MK1 0.4 nozzle", + "inherits": "fdm_wanhao_d9_mk1_common", + "from": "system", + "setting_id": "MXNRpMDaVXj2xUx0", + "instantiation": "true", + "printer_model": "Wanhao D9-300 MK1", + "nozzle_diameter": [ + "0.4" + ], + "printable_area": [ + "0x0", + "300x0", + "300x300", + "0x300" + ], + "printable_height": "400", + "default_print_profile": "0.20mm Standard @Wanhao D9 MK1" +} diff --git a/resources/profiles/Wanhao/machine/Wanhao D9-300 MK1 BLTouch kit 0.4 nozzle.json b/resources/profiles/Wanhao/machine/Wanhao D9-300 MK1 BLTouch kit 0.4 nozzle.json new file mode 100644 index 0000000000..249c8f8d19 --- /dev/null +++ b/resources/profiles/Wanhao/machine/Wanhao D9-300 MK1 BLTouch kit 0.4 nozzle.json @@ -0,0 +1,20 @@ +{ + "type": "machine", + "name": "Wanhao D9-300 MK1 BLTouch kit 0.4 nozzle", + "inherits": "fdm_wanhao_d9_common", + "from": "system", + "setting_id": "rq6cPs92KgrUyZrn", + "instantiation": "true", + "printer_model": "Wanhao D9-300 MK1 BLTouch kit", + "nozzle_diameter": [ + "0.4" + ], + "printable_area": [ + "0x0", + "300x0", + "300x300", + "0x300" + ], + "printable_height": "400", + "default_print_profile": "0.20mm Standard @Wanhao D9" +} diff --git a/resources/profiles/Wanhao/machine/Wanhao D9-300 MK1 BLTouch kit.json b/resources/profiles/Wanhao/machine/Wanhao D9-300 MK1 BLTouch kit.json new file mode 100644 index 0000000000..57a4eddbfa --- /dev/null +++ b/resources/profiles/Wanhao/machine/Wanhao D9-300 MK1 BLTouch kit.json @@ -0,0 +1,9 @@ +{ + "type": "machine_model", + "name": "Wanhao D9-300 MK1 BLTouch kit", + "model_id": "Wanhao-D9-300-MK1u2", + "nozzle_diameter": "0.4", + "machine_tech": "FFF", + "family": "Wanhao", + "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System" +} diff --git a/resources/profiles/Wanhao/machine/Wanhao D9-300 MK1.json b/resources/profiles/Wanhao/machine/Wanhao D9-300 MK1.json new file mode 100644 index 0000000000..288a444644 --- /dev/null +++ b/resources/profiles/Wanhao/machine/Wanhao D9-300 MK1.json @@ -0,0 +1,9 @@ +{ + "type": "machine_model", + "name": "Wanhao D9-300 MK1", + "model_id": "Wanhao-D9-300-MK1", + "nozzle_diameter": "0.4", + "machine_tech": "FFF", + "family": "Wanhao", + "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System" +} diff --git a/resources/profiles/Wanhao/machine/Wanhao D9-300 MK2 0.4 nozzle.json b/resources/profiles/Wanhao/machine/Wanhao D9-300 MK2 0.4 nozzle.json new file mode 100644 index 0000000000..5cc17c7aa2 --- /dev/null +++ b/resources/profiles/Wanhao/machine/Wanhao D9-300 MK2 0.4 nozzle.json @@ -0,0 +1,20 @@ +{ + "type": "machine", + "name": "Wanhao D9-300 MK2 0.4 nozzle", + "inherits": "fdm_wanhao_d9_common", + "from": "system", + "setting_id": "w3Cin9es1Jfx0dmR", + "instantiation": "true", + "printer_model": "Wanhao D9-300 MK2", + "nozzle_diameter": [ + "0.4" + ], + "printable_area": [ + "0x0", + "300x0", + "300x300", + "0x300" + ], + "printable_height": "400", + "default_print_profile": "0.20mm Standard @Wanhao D9" +} diff --git a/resources/profiles/Wanhao/machine/Wanhao D9-300 MK2.json b/resources/profiles/Wanhao/machine/Wanhao D9-300 MK2.json new file mode 100644 index 0000000000..4c9bcb2412 --- /dev/null +++ b/resources/profiles/Wanhao/machine/Wanhao D9-300 MK2.json @@ -0,0 +1,9 @@ +{ + "type": "machine_model", + "name": "Wanhao D9-300 MK2", + "model_id": "Wanhao-D9-300-MK2", + "nozzle_diameter": "0.4", + "machine_tech": "FFF", + "family": "Wanhao", + "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System" +} diff --git a/resources/profiles/Wanhao/machine/Wanhao D9-300 MK3 0.4 nozzle.json b/resources/profiles/Wanhao/machine/Wanhao D9-300 MK3 0.4 nozzle.json new file mode 100644 index 0000000000..19534f409e --- /dev/null +++ b/resources/profiles/Wanhao/machine/Wanhao D9-300 MK3 0.4 nozzle.json @@ -0,0 +1,20 @@ +{ + "type": "machine", + "name": "Wanhao D9-300 MK3 0.4 nozzle", + "inherits": "fdm_wanhao_d9_common", + "from": "system", + "setting_id": "acFQWZqlt4QSgBPv", + "instantiation": "true", + "printer_model": "Wanhao D9-300 MK3", + "nozzle_diameter": [ + "0.4" + ], + "printable_area": [ + "0x0", + "300x0", + "300x300", + "0x300" + ], + "printable_height": "400", + "default_print_profile": "0.20mm Standard @Wanhao D9" +} diff --git a/resources/profiles/Wanhao/machine/Wanhao D9-300 MK3.json b/resources/profiles/Wanhao/machine/Wanhao D9-300 MK3.json new file mode 100644 index 0000000000..07b31cf83f --- /dev/null +++ b/resources/profiles/Wanhao/machine/Wanhao D9-300 MK3.json @@ -0,0 +1,9 @@ +{ + "type": "machine_model", + "name": "Wanhao D9-300 MK3", + "model_id": "Wanhao-D9-300-MK3", + "nozzle_diameter": "0.4", + "machine_tech": "FFF", + "family": "Wanhao", + "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System" +} diff --git a/resources/profiles/Wanhao/machine/Wanhao D9-400 MK1 0.4 nozzle.json b/resources/profiles/Wanhao/machine/Wanhao D9-400 MK1 0.4 nozzle.json new file mode 100644 index 0000000000..e08ee55eba --- /dev/null +++ b/resources/profiles/Wanhao/machine/Wanhao D9-400 MK1 0.4 nozzle.json @@ -0,0 +1,20 @@ +{ + "type": "machine", + "name": "Wanhao D9-400 MK1 0.4 nozzle", + "inherits": "fdm_wanhao_d9_mk1_common", + "from": "system", + "setting_id": "DGSNE3AbmlBBG5PY", + "instantiation": "true", + "printer_model": "Wanhao D9-400 MK1", + "nozzle_diameter": [ + "0.4" + ], + "printable_area": [ + "0x0", + "400x0", + "400x400", + "0x400" + ], + "printable_height": "400", + "default_print_profile": "0.20mm Standard @Wanhao D9 MK1" +} diff --git a/resources/profiles/Wanhao/machine/Wanhao D9-400 MK1 BLTouch kit 0.4 nozzle.json b/resources/profiles/Wanhao/machine/Wanhao D9-400 MK1 BLTouch kit 0.4 nozzle.json new file mode 100644 index 0000000000..0ce2980a14 --- /dev/null +++ b/resources/profiles/Wanhao/machine/Wanhao D9-400 MK1 BLTouch kit 0.4 nozzle.json @@ -0,0 +1,20 @@ +{ + "type": "machine", + "name": "Wanhao D9-400 MK1 BLTouch kit 0.4 nozzle", + "inherits": "fdm_wanhao_d9_common", + "from": "system", + "setting_id": "WcKY7v24ewtzPfnU", + "instantiation": "true", + "printer_model": "Wanhao D9-400 MK1 BLTouch kit", + "nozzle_diameter": [ + "0.4" + ], + "printable_area": [ + "0x0", + "400x0", + "400x400", + "0x400" + ], + "printable_height": "400", + "default_print_profile": "0.20mm Standard @Wanhao D9" +} diff --git a/resources/profiles/Wanhao/machine/Wanhao D9-400 MK1 BLTouch kit.json b/resources/profiles/Wanhao/machine/Wanhao D9-400 MK1 BLTouch kit.json new file mode 100644 index 0000000000..bb68bd3cf9 --- /dev/null +++ b/resources/profiles/Wanhao/machine/Wanhao D9-400 MK1 BLTouch kit.json @@ -0,0 +1,9 @@ +{ + "type": "machine_model", + "name": "Wanhao D9-400 MK1 BLTouch kit", + "model_id": "Wanhao-D9-400-MK1u2", + "nozzle_diameter": "0.4", + "machine_tech": "FFF", + "family": "Wanhao", + "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System" +} diff --git a/resources/profiles/Wanhao/machine/Wanhao D9-400 MK1.json b/resources/profiles/Wanhao/machine/Wanhao D9-400 MK1.json new file mode 100644 index 0000000000..f730632548 --- /dev/null +++ b/resources/profiles/Wanhao/machine/Wanhao D9-400 MK1.json @@ -0,0 +1,9 @@ +{ + "type": "machine_model", + "name": "Wanhao D9-400 MK1", + "model_id": "Wanhao-D9-400-MK1", + "nozzle_diameter": "0.4", + "machine_tech": "FFF", + "family": "Wanhao", + "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System" +} diff --git a/resources/profiles/Wanhao/machine/Wanhao D9-400 MK2 0.4 nozzle.json b/resources/profiles/Wanhao/machine/Wanhao D9-400 MK2 0.4 nozzle.json new file mode 100644 index 0000000000..91976f712b --- /dev/null +++ b/resources/profiles/Wanhao/machine/Wanhao D9-400 MK2 0.4 nozzle.json @@ -0,0 +1,20 @@ +{ + "type": "machine", + "name": "Wanhao D9-400 MK2 0.4 nozzle", + "inherits": "fdm_wanhao_d9_common", + "from": "system", + "setting_id": "jn1FEJFeN7S2gEbD", + "instantiation": "true", + "printer_model": "Wanhao D9-400 MK2", + "nozzle_diameter": [ + "0.4" + ], + "printable_area": [ + "0x0", + "400x0", + "400x400", + "0x400" + ], + "printable_height": "400", + "default_print_profile": "0.20mm Standard @Wanhao D9" +} diff --git a/resources/profiles/Wanhao/machine/Wanhao D9-400 MK2.json b/resources/profiles/Wanhao/machine/Wanhao D9-400 MK2.json new file mode 100644 index 0000000000..2785f480e4 --- /dev/null +++ b/resources/profiles/Wanhao/machine/Wanhao D9-400 MK2.json @@ -0,0 +1,9 @@ +{ + "type": "machine_model", + "name": "Wanhao D9-400 MK2", + "model_id": "Wanhao-D9-400-MK2", + "nozzle_diameter": "0.4", + "machine_tech": "FFF", + "family": "Wanhao", + "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System" +} diff --git a/resources/profiles/Wanhao/machine/Wanhao D9-400 MK3 0.4 nozzle.json b/resources/profiles/Wanhao/machine/Wanhao D9-400 MK3 0.4 nozzle.json new file mode 100644 index 0000000000..c7b44c9e7c --- /dev/null +++ b/resources/profiles/Wanhao/machine/Wanhao D9-400 MK3 0.4 nozzle.json @@ -0,0 +1,20 @@ +{ + "type": "machine", + "name": "Wanhao D9-400 MK3 0.4 nozzle", + "inherits": "fdm_wanhao_d9_common", + "from": "system", + "setting_id": "2kFyH1E3tqMWtDmG", + "instantiation": "true", + "printer_model": "Wanhao D9-400 MK3", + "nozzle_diameter": [ + "0.4" + ], + "printable_area": [ + "0x0", + "400x0", + "400x400", + "0x400" + ], + "printable_height": "400", + "default_print_profile": "0.20mm Standard @Wanhao D9" +} diff --git a/resources/profiles/Wanhao/machine/Wanhao D9-400 MK3.json b/resources/profiles/Wanhao/machine/Wanhao D9-400 MK3.json new file mode 100644 index 0000000000..2e0b5143a1 --- /dev/null +++ b/resources/profiles/Wanhao/machine/Wanhao D9-400 MK3.json @@ -0,0 +1,9 @@ +{ + "type": "machine_model", + "name": "Wanhao D9-400 MK3", + "model_id": "Wanhao-D9-400-MK3", + "nozzle_diameter": "0.4", + "machine_tech": "FFF", + "family": "Wanhao", + "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System" +} diff --git a/resources/profiles/Wanhao/machine/Wanhao D9-500 MK1 0.4 nozzle.json b/resources/profiles/Wanhao/machine/Wanhao D9-500 MK1 0.4 nozzle.json new file mode 100644 index 0000000000..0f238c7d5c --- /dev/null +++ b/resources/profiles/Wanhao/machine/Wanhao D9-500 MK1 0.4 nozzle.json @@ -0,0 +1,20 @@ +{ + "type": "machine", + "name": "Wanhao D9-500 MK1 0.4 nozzle", + "inherits": "fdm_wanhao_d9_mk1_common", + "from": "system", + "setting_id": "nj0TfnDKHb4wFX1R", + "instantiation": "true", + "printer_model": "Wanhao D9-500 MK1", + "nozzle_diameter": [ + "0.4" + ], + "printable_area": [ + "0x0", + "500x0", + "500x500", + "0x500" + ], + "printable_height": "500", + "default_print_profile": "0.20mm Standard @Wanhao D9 MK1" +} diff --git a/resources/profiles/Wanhao/machine/Wanhao D9-500 MK1 BLTouch kit 0.4 nozzle.json b/resources/profiles/Wanhao/machine/Wanhao D9-500 MK1 BLTouch kit 0.4 nozzle.json new file mode 100644 index 0000000000..25ce3bc9f6 --- /dev/null +++ b/resources/profiles/Wanhao/machine/Wanhao D9-500 MK1 BLTouch kit 0.4 nozzle.json @@ -0,0 +1,20 @@ +{ + "type": "machine", + "name": "Wanhao D9-500 MK1 BLTouch kit 0.4 nozzle", + "inherits": "fdm_wanhao_d9_common", + "from": "system", + "setting_id": "Hmrnlh6pJzdO2dIJ", + "instantiation": "true", + "printer_model": "Wanhao D9-500 MK1 BLTouch kit", + "nozzle_diameter": [ + "0.4" + ], + "printable_area": [ + "0x0", + "500x0", + "500x500", + "0x500" + ], + "printable_height": "500", + "default_print_profile": "0.20mm Standard @Wanhao D9" +} diff --git a/resources/profiles/Wanhao/machine/Wanhao D9-500 MK1 BLTouch kit.json b/resources/profiles/Wanhao/machine/Wanhao D9-500 MK1 BLTouch kit.json new file mode 100644 index 0000000000..4b6eea98ca --- /dev/null +++ b/resources/profiles/Wanhao/machine/Wanhao D9-500 MK1 BLTouch kit.json @@ -0,0 +1,9 @@ +{ + "type": "machine_model", + "name": "Wanhao D9-500 MK1 BLTouch kit", + "model_id": "Wanhao-D9-500-MK1u2", + "nozzle_diameter": "0.4", + "machine_tech": "FFF", + "family": "Wanhao", + "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System" +} diff --git a/resources/profiles/Wanhao/machine/Wanhao D9-500 MK1.json b/resources/profiles/Wanhao/machine/Wanhao D9-500 MK1.json new file mode 100644 index 0000000000..87a99fd65f --- /dev/null +++ b/resources/profiles/Wanhao/machine/Wanhao D9-500 MK1.json @@ -0,0 +1,9 @@ +{ + "type": "machine_model", + "name": "Wanhao D9-500 MK1", + "model_id": "Wanhao-D9-500-MK1", + "nozzle_diameter": "0.4", + "machine_tech": "FFF", + "family": "Wanhao", + "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System" +} diff --git a/resources/profiles/Wanhao/machine/Wanhao D9-500 MK2 0.4 nozzle.json b/resources/profiles/Wanhao/machine/Wanhao D9-500 MK2 0.4 nozzle.json new file mode 100644 index 0000000000..cabfea9cad --- /dev/null +++ b/resources/profiles/Wanhao/machine/Wanhao D9-500 MK2 0.4 nozzle.json @@ -0,0 +1,20 @@ +{ + "type": "machine", + "name": "Wanhao D9-500 MK2 0.4 nozzle", + "inherits": "fdm_wanhao_d9_common", + "from": "system", + "setting_id": "g2GSmhWJLFDwqzFI", + "instantiation": "true", + "printer_model": "Wanhao D9-500 MK2", + "nozzle_diameter": [ + "0.4" + ], + "printable_area": [ + "0x0", + "500x0", + "500x500", + "0x500" + ], + "printable_height": "500", + "default_print_profile": "0.20mm Standard @Wanhao D9" +} diff --git a/resources/profiles/Wanhao/machine/Wanhao D9-500 MK2.json b/resources/profiles/Wanhao/machine/Wanhao D9-500 MK2.json new file mode 100644 index 0000000000..0e8f9c1603 --- /dev/null +++ b/resources/profiles/Wanhao/machine/Wanhao D9-500 MK2.json @@ -0,0 +1,9 @@ +{ + "type": "machine_model", + "name": "Wanhao D9-500 MK2", + "model_id": "Wanhao-D9-500-MK2", + "nozzle_diameter": "0.4", + "machine_tech": "FFF", + "family": "Wanhao", + "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System" +} diff --git a/resources/profiles/Wanhao/machine/Wanhao D9-500 MK3 0.4 nozzle.json b/resources/profiles/Wanhao/machine/Wanhao D9-500 MK3 0.4 nozzle.json new file mode 100644 index 0000000000..434a1cb830 --- /dev/null +++ b/resources/profiles/Wanhao/machine/Wanhao D9-500 MK3 0.4 nozzle.json @@ -0,0 +1,20 @@ +{ + "type": "machine", + "name": "Wanhao D9-500 MK3 0.4 nozzle", + "inherits": "fdm_wanhao_d9_common", + "from": "system", + "setting_id": "F7l90Rgr8Ni0sQva", + "instantiation": "true", + "printer_model": "Wanhao D9-500 MK3", + "nozzle_diameter": [ + "0.4" + ], + "printable_area": [ + "0x0", + "500x0", + "500x500", + "0x500" + ], + "printable_height": "500", + "default_print_profile": "0.20mm Standard @Wanhao D9" +} diff --git a/resources/profiles/Wanhao/machine/Wanhao D9-500 MK3.json b/resources/profiles/Wanhao/machine/Wanhao D9-500 MK3.json new file mode 100644 index 0000000000..91dc6cb5a5 --- /dev/null +++ b/resources/profiles/Wanhao/machine/Wanhao D9-500 MK3.json @@ -0,0 +1,9 @@ +{ + "type": "machine_model", + "name": "Wanhao D9-500 MK3", + "model_id": "Wanhao-D9-500-MK3", + "nozzle_diameter": "0.4", + "machine_tech": "FFF", + "family": "Wanhao", + "default_materials": "Generic PLA @System;Generic PETG @System;Generic ABS @System" +} diff --git a/resources/profiles/Wanhao/machine/fdm_wanhao_d9_common.json b/resources/profiles/Wanhao/machine/fdm_wanhao_d9_common.json new file mode 100644 index 0000000000..563e50b943 --- /dev/null +++ b/resources/profiles/Wanhao/machine/fdm_wanhao_d9_common.json @@ -0,0 +1,108 @@ +{ + "type": "machine", + "name": "fdm_wanhao_d9_common", + "inherits": "fdm_wanhao_common", + "from": "system", + "instantiation": "false", + "gcode_flavor": "marlin2", + "use_relative_e_distances": "1", + "emit_machine_limits_to_gcode": "0", + "nozzle_diameter": [ + "0.4" + ], + "printer_variant": "0.4", + "max_layer_height": [ + "0.32" + ], + "min_layer_height": [ + "0.08" + ], + "machine_max_speed_x": [ + "300", + "300" + ], + "machine_max_speed_y": [ + "300", + "300" + ], + "machine_max_speed_z": [ + "5", + "5" + ], + "machine_max_speed_e": [ + "25", + "25" + ], + "machine_max_acceleration_x": [ + "3000", + "3000" + ], + "machine_max_acceleration_y": [ + "3000", + "3000" + ], + "machine_max_acceleration_z": [ + "100", + "100" + ], + "machine_max_acceleration_e": [ + "3000", + "3000" + ], + "machine_max_acceleration_extruding": [ + "1000", + "1000" + ], + "machine_max_acceleration_travel": [ + "1000", + "1000" + ], + "machine_max_acceleration_retracting": [ + "800", + "800" + ], + "machine_max_jerk_x": [ + "10", + "10" + ], + "machine_max_jerk_y": [ + "10", + "10" + ], + "machine_max_jerk_z": [ + "0.4", + "0.4" + ], + "machine_max_jerk_e": [ + "1", + "1" + ], + "retraction_length": [ + "2.0" + ], + "retraction_speed": [ + "25" + ], + "deretraction_speed": [ + "25" + ], + "retraction_minimum_travel": [ + "1" + ], + "z_hop": [ + "0" + ], + "wipe": [ + "0" + ], + "retract_when_changing_layer": [ + "1" + ], + "machine_start_gcode": "; Wanhao Duplicator 9 start G-code, for the Marlin 2.1 firmwares at github.com/Le-Syl21/WANHAO-Duplicator-9\nG21 ; millimetres\nG90 ; absolute coordinates\nM83 ; relative extrusion\nM140 S[bed_temperature_initial_layer_single] ; heat the bed\nM104 S150 ; warm the nozzle without letting it ooze\nG91 ; a print stopped by hand can leave the nozzle down on the bed\nG1 Z10 F300 ; so raise it before homing: a BLTouch needs 10 mm to deploy\nG90\nM280 P0 S160 ; BLTouch: clear an alarm and stow the pin\nG28 ; home all axes (this turns bed levelling off)\nM420 S1 ; turn the bed mesh saved from the screen back on\nG1 Z10 F300\nM104 S[nozzle_temperature_initial_layer] ; start the nozzle now, the bed is still heating\nM190 S[bed_temperature_initial_layer_single] ; wait for the bed\nM109 S[nozzle_temperature_initial_layer] ; and confirm the nozzle\nG92 E0\nG1 X15 Y20 Z0.3 F3000 ; start of the priming line\nG1 Y140 E9.0 F1200 ; draw a line of filament\nG1 X15.5 F3000\nG1 Y20 E9.0 F1200 ; and back, next to it\nG92 E0\nG1 X22 F6000 ; wipe sideways to snap the string\nG1 Z2 F300 ; lift, so the line does not stick to the nozzle", + "machine_end_gcode": "; Wanhao Duplicator 9 end G-code\nM104 S0 ; nozzle heater off\nM140 S0 ; bed heater off\nM107 ; fan off\nG91 ; relative moves\nG1 E-2 F1500 ; release the pressure in the nozzle\nG1 Z10 F300 ; lift the nozzle\nG90 ; absolute moves\nG1 X5 Y{print_bed_max[1] - 10} F3000 ; bring the bed to the front\nM84 X Y E ; motors off, Z keeps its position", + "layer_change_gcode": "G92 E0", + "machine_pause_gcode": "M600", + "default_filament_profile": [ + "Generic PLA @System" + ] +} diff --git a/resources/profiles/Wanhao/machine/fdm_wanhao_d9_mk1_common.json b/resources/profiles/Wanhao/machine/fdm_wanhao_d9_mk1_common.json new file mode 100644 index 0000000000..f6de484370 --- /dev/null +++ b/resources/profiles/Wanhao/machine/fdm_wanhao_d9_mk1_common.json @@ -0,0 +1,28 @@ +{ + "type": "machine", + "name": "fdm_wanhao_d9_mk1_common", + "inherits": "fdm_wanhao_d9_common", + "from": "system", + "instantiation": "false", + "machine_start_gcode": "; Wanhao Duplicator 9 start G-code, for the Marlin 2.1 firmwares at github.com/Le-Syl21/WANHAO-Duplicator-9\nG21 ; millimetres\nG90 ; absolute coordinates\nM83 ; relative extrusion\nM140 S[bed_temperature_initial_layer_single] ; heat the bed\nM104 S150 ; warm the nozzle without letting it ooze\nG91 ; a print stopped by hand can leave the nozzle down on the bed\nG1 Z10 F300 ; clear the bed before homing\nG90\nG28 ; home all axes (this turns bed levelling off)\nM420 S1 ; turn the bed mesh saved from the screen back on\nG1 Z10 F300\nM104 S[nozzle_temperature_initial_layer] ; start the nozzle now, the bed is still heating\nM190 S[bed_temperature_initial_layer_single] ; wait for the bed\nM109 S[nozzle_temperature_initial_layer] ; and confirm the nozzle\nG92 E0\nG1 X15 Y20 Z0.3 F3000 ; start of the priming line\nG1 Y140 E9.0 F1200 ; draw a line of filament\nG1 X15.5 F3000\nG1 Y20 E9.0 F1200 ; and back, next to it\nG92 E0\nG1 X22 F6000 ; wipe sideways to snap the string\nG1 Z2 F300 ; lift, so the line does not stick to the nozzle", + "machine_max_acceleration_x": [ + "500", + "500" + ], + "machine_max_acceleration_y": [ + "500", + "500" + ], + "machine_max_acceleration_e": [ + "500", + "500" + ], + "machine_max_acceleration_extruding": [ + "500", + "500" + ], + "machine_max_acceleration_travel": [ + "500", + "500" + ] +} diff --git a/resources/profiles/Wanhao/process/0.12mm Fine @Wanhao D9 MK1.json b/resources/profiles/Wanhao/process/0.12mm Fine @Wanhao D9 MK1.json new file mode 100644 index 0000000000..b5c5083042 --- /dev/null +++ b/resources/profiles/Wanhao/process/0.12mm Fine @Wanhao D9 MK1.json @@ -0,0 +1,17 @@ +{ + "type": "process", + "name": "0.12mm Fine @Wanhao D9 MK1", + "inherits": "fdm_process_wanhao_d9_mk1_common", + "from": "system", + "setting_id": "EClNN5UDWbLACTuz", + "instantiation": "true", + "layer_height": "0.12", + "initial_layer_print_height": "0.14", + "top_shell_layers": "4", + "bottom_shell_layers": "4", + "compatible_printers": [ + "Wanhao D9-300 MK1 0.4 nozzle", + "Wanhao D9-400 MK1 0.4 nozzle", + "Wanhao D9-500 MK1 0.4 nozzle" + ] +} diff --git a/resources/profiles/Wanhao/process/0.12mm Fine @Wanhao D9.json b/resources/profiles/Wanhao/process/0.12mm Fine @Wanhao D9.json new file mode 100644 index 0000000000..5ea13a0f1e --- /dev/null +++ b/resources/profiles/Wanhao/process/0.12mm Fine @Wanhao D9.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.12mm Fine @Wanhao D9", + "inherits": "fdm_process_wanhao_d9_common", + "from": "system", + "setting_id": "0hvsKsPO55TlduZR", + "instantiation": "true", + "layer_height": "0.12", + "initial_layer_print_height": "0.14", + "top_shell_layers": "4", + "bottom_shell_layers": "4", + "compatible_printers": [ + "Wanhao D9-300 MK1 BLTouch kit 0.4 nozzle", + "Wanhao D9-400 MK1 BLTouch kit 0.4 nozzle", + "Wanhao D9-500 MK1 BLTouch kit 0.4 nozzle", + "Wanhao D9-300 MK2 0.4 nozzle", + "Wanhao D9-400 MK2 0.4 nozzle", + "Wanhao D9-500 MK2 0.4 nozzle", + "Wanhao D9-300 MK3 0.4 nozzle", + "Wanhao D9-400 MK3 0.4 nozzle", + "Wanhao D9-500 MK3 0.4 nozzle" + ] +} diff --git a/resources/profiles/Wanhao/process/0.20mm Standard @Wanhao D9 MK1.json b/resources/profiles/Wanhao/process/0.20mm Standard @Wanhao D9 MK1.json new file mode 100644 index 0000000000..834dd8b158 --- /dev/null +++ b/resources/profiles/Wanhao/process/0.20mm Standard @Wanhao D9 MK1.json @@ -0,0 +1,17 @@ +{ + "type": "process", + "name": "0.20mm Standard @Wanhao D9 MK1", + "inherits": "fdm_process_wanhao_d9_mk1_common", + "from": "system", + "setting_id": "CXNOj3tPeTUXx81B", + "instantiation": "true", + "layer_height": "0.20", + "initial_layer_print_height": "0.24", + "top_shell_layers": "3", + "bottom_shell_layers": "3", + "compatible_printers": [ + "Wanhao D9-300 MK1 0.4 nozzle", + "Wanhao D9-400 MK1 0.4 nozzle", + "Wanhao D9-500 MK1 0.4 nozzle" + ] +} diff --git a/resources/profiles/Wanhao/process/0.20mm Standard @Wanhao D9.json b/resources/profiles/Wanhao/process/0.20mm Standard @Wanhao D9.json new file mode 100644 index 0000000000..ee3fe49c29 --- /dev/null +++ b/resources/profiles/Wanhao/process/0.20mm Standard @Wanhao D9.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.20mm Standard @Wanhao D9", + "inherits": "fdm_process_wanhao_d9_common", + "from": "system", + "setting_id": "UVXxknNxJswqaURQ", + "instantiation": "true", + "layer_height": "0.20", + "initial_layer_print_height": "0.24", + "top_shell_layers": "3", + "bottom_shell_layers": "3", + "compatible_printers": [ + "Wanhao D9-300 MK1 BLTouch kit 0.4 nozzle", + "Wanhao D9-400 MK1 BLTouch kit 0.4 nozzle", + "Wanhao D9-500 MK1 BLTouch kit 0.4 nozzle", + "Wanhao D9-300 MK2 0.4 nozzle", + "Wanhao D9-400 MK2 0.4 nozzle", + "Wanhao D9-500 MK2 0.4 nozzle", + "Wanhao D9-300 MK3 0.4 nozzle", + "Wanhao D9-400 MK3 0.4 nozzle", + "Wanhao D9-500 MK3 0.4 nozzle" + ] +} diff --git a/resources/profiles/Wanhao/process/0.28mm Draft @Wanhao D9 MK1.json b/resources/profiles/Wanhao/process/0.28mm Draft @Wanhao D9 MK1.json new file mode 100644 index 0000000000..e3ffe5895f --- /dev/null +++ b/resources/profiles/Wanhao/process/0.28mm Draft @Wanhao D9 MK1.json @@ -0,0 +1,17 @@ +{ + "type": "process", + "name": "0.28mm Draft @Wanhao D9 MK1", + "inherits": "fdm_process_wanhao_d9_mk1_common", + "from": "system", + "setting_id": "omfIWwVnQVVxPrtb", + "instantiation": "true", + "layer_height": "0.28", + "initial_layer_print_height": "0.34", + "top_shell_layers": "3", + "bottom_shell_layers": "3", + "compatible_printers": [ + "Wanhao D9-300 MK1 0.4 nozzle", + "Wanhao D9-400 MK1 0.4 nozzle", + "Wanhao D9-500 MK1 0.4 nozzle" + ] +} diff --git a/resources/profiles/Wanhao/process/0.28mm Draft @Wanhao D9.json b/resources/profiles/Wanhao/process/0.28mm Draft @Wanhao D9.json new file mode 100644 index 0000000000..d9fd9e21e9 --- /dev/null +++ b/resources/profiles/Wanhao/process/0.28mm Draft @Wanhao D9.json @@ -0,0 +1,23 @@ +{ + "type": "process", + "name": "0.28mm Draft @Wanhao D9", + "inherits": "fdm_process_wanhao_d9_common", + "from": "system", + "setting_id": "FEJqq1ylXWqaBPR6", + "instantiation": "true", + "layer_height": "0.28", + "initial_layer_print_height": "0.34", + "top_shell_layers": "3", + "bottom_shell_layers": "3", + "compatible_printers": [ + "Wanhao D9-300 MK1 BLTouch kit 0.4 nozzle", + "Wanhao D9-400 MK1 BLTouch kit 0.4 nozzle", + "Wanhao D9-500 MK1 BLTouch kit 0.4 nozzle", + "Wanhao D9-300 MK2 0.4 nozzle", + "Wanhao D9-400 MK2 0.4 nozzle", + "Wanhao D9-500 MK2 0.4 nozzle", + "Wanhao D9-300 MK3 0.4 nozzle", + "Wanhao D9-400 MK3 0.4 nozzle", + "Wanhao D9-500 MK3 0.4 nozzle" + ] +} diff --git a/resources/profiles/Wanhao/process/fdm_process_wanhao_d9_common.json b/resources/profiles/Wanhao/process/fdm_process_wanhao_d9_common.json new file mode 100644 index 0000000000..457ba4ae2d --- /dev/null +++ b/resources/profiles/Wanhao/process/fdm_process_wanhao_d9_common.json @@ -0,0 +1,38 @@ +{ + "type": "process", + "name": "fdm_process_wanhao_d9_common", + "inherits": "fdm_process_wanhao_common", + "from": "system", + "instantiation": "false", + "line_width": "0.4", + "initial_layer_line_width": "0.6", + "wall_loops": "2", + "infill_wall_overlap": "15%", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "gyroid", + "outer_wall_speed": "25", + "inner_wall_speed": "40", + "sparse_infill_speed": "50", + "internal_solid_infill_speed": "50", + "top_surface_speed": "40", + "gap_infill_speed": "40", + "bridge_speed": "50", + "support_speed": "35", + "initial_layer_speed": "25", + "initial_layer_infill_speed": "25", + "travel_speed": "100", + "default_acceleration": "1000", + "outer_wall_acceleration": "1000", + "inner_wall_acceleration": "1000", + "top_surface_acceleration": "1000", + "sparse_infill_acceleration": "1000", + "initial_layer_acceleration": "1000", + "bridge_acceleration": "1000", + "travel_acceleration": "1000", + "default_jerk": "0", + "skirt_loops": "2", + "skirt_distance": "4", + "brim_type": "no_brim", + "enable_support": "0", + "enable_arc_fitting": "0" +} diff --git a/resources/profiles/Wanhao/process/fdm_process_wanhao_d9_mk1_common.json b/resources/profiles/Wanhao/process/fdm_process_wanhao_d9_mk1_common.json new file mode 100644 index 0000000000..3fb1c650db --- /dev/null +++ b/resources/profiles/Wanhao/process/fdm_process_wanhao_d9_mk1_common.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "name": "fdm_process_wanhao_d9_mk1_common", + "inherits": "fdm_process_wanhao_d9_common", + "from": "system", + "instantiation": "false", + "default_acceleration": "500", + "outer_wall_acceleration": "500", + "inner_wall_acceleration": "500", + "top_surface_acceleration": "500", + "sparse_infill_acceleration": "500", + "initial_layer_acceleration": "500", + "bridge_acceleration": "500", + "travel_acceleration": "500" +} diff --git a/resources/profiles/WonderMaker.json b/resources/profiles/WonderMaker.json index 35a1b5c8fa..2a23096162 100755 --- a/resources/profiles/WonderMaker.json +++ b/resources/profiles/WonderMaker.json @@ -1,7 +1,7 @@ { "name": "WonderMaker", "url": "", - "version": "02.04.00.03", + "version": "02.04.00.04", "force_update": "0", "description": "WonderMaker configurations", "machine_model_list": [ @@ -432,12 +432,8 @@ "sub_path": "machine/WonderMaker ZR 0.4 nozzle.json" }, { - "name": "WonderMaker ZR Ultra 0.4 nozzle", - "sub_path": "machine/WonderMaker ZR Ultra 0.4 nozzle.json" - }, - { - "name": "WonderMaker ZR Ultra S 0.4 nozzle", - "sub_path": "machine/WonderMaker ZR Ultra S 0.4 nozzle.json" + "name": "fdm_ultra_common", + "sub_path": "machine/fdm_ultra_common.json" }, { "name": "WonderMaker ZR 0.2 nozzle", @@ -455,6 +451,10 @@ "name": "WonderMaker ZR Ultra 0.2 nozzle", "sub_path": "machine/WonderMaker ZR Ultra 0.2 nozzle.json" }, + { + "name": "WonderMaker ZR Ultra 0.4 nozzle", + "sub_path": "machine/WonderMaker ZR Ultra 0.4 nozzle.json" + }, { "name": "WonderMaker ZR Ultra 0.6 nozzle", "sub_path": "machine/WonderMaker ZR Ultra 0.6 nozzle.json" @@ -467,6 +467,10 @@ "name": "WonderMaker ZR Ultra S 0.2 nozzle", "sub_path": "machine/WonderMaker ZR Ultra S 0.2 nozzle.json" }, + { + "name": "WonderMaker ZR Ultra S 0.4 nozzle", + "sub_path": "machine/WonderMaker ZR Ultra S 0.4 nozzle.json" + }, { "name": "WonderMaker ZR Ultra S 0.6 nozzle", "sub_path": "machine/WonderMaker ZR Ultra S 0.6 nozzle.json" diff --git a/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra 0.2 nozzle.json b/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra 0.2 nozzle.json old mode 100755 new mode 100644 index 927ab9d44b..e05b975115 --- a/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra 0.2 nozzle.json +++ b/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra 0.2 nozzle.json @@ -1,22 +1,23 @@ { "type": "machine", "name": "WonderMaker ZR Ultra 0.2 nozzle", - "inherits": "WonderMaker ZR Ultra 0.4 nozzle", + "inherits": "fdm_ultra_common", "from": "system", "setting_id": "AX42zNj8YsJ94ilv", "instantiation": "true", + "printer_model": "WonderMaker ZR Ultra", + "printer_variant": "0.2", + "default_print_profile": "0.10mm Standard @WonderMaker ZR Ultra 0.2 nozzle", + "default_bed_type": "4", + "max_layer_height": [ + "0.14" + ], "nozzle_diameter": [ "0.2", "0.2", "0.2", "0.2" ], - "printer_model": "WonderMaker ZR Ultra", - "printer_variant": "0.2", - "default_print_profile": "0.10mm Standard @WonderMaker ZR Ultra 0.2 nozzle", - "max_layer_height": [ - "0.14" - ], "min_layer_height": [ "0.04" ], diff --git a/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra 0.4 nozzle.json b/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra 0.4 nozzle.json old mode 100755 new mode 100644 index 0a30108052..67e507516a --- a/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra 0.4 nozzle.json +++ b/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra 0.4 nozzle.json @@ -1,65 +1,17 @@ { "type": "machine", "name": "WonderMaker ZR Ultra 0.4 nozzle", - "inherits": "fdm_klipper_common", + "inherits": "fdm_ultra_common", "from": "system", "setting_id": "xJBdCljSZVDINXnP", "instantiation": "true", "printer_model": "WonderMaker ZR Ultra", "default_print_profile": "0.20mm Standard @WonderMaker ZR Ultra", "default_bed_type": "4", - "default_filament_profile": [ - "WonderMaker PLA Basic" - ], - "single_extruder_multi_material": "0", "nozzle_diameter": [ "0.4", "0.4", "0.4", "0.4" - ], - "printable_area": [ - "0x0", - "300x0", - "300x270", - "0x270" - ], - "bed_exclude_area": [], - "printable_height": "290", - "extruder_clearance_radius": "134", - "bed_mesh_min": [ - "10", - "10" - ], - "bed_mesh_max": [ - "290", - "260" - ], - "bed_mesh_probe_distance": [ - "50", - "50" - ], - "support_air_filtration": "0", - "support_chamber_temp_control": "0", - "machine_tool_change_time": "10", - "machine_load_filament_time": "0", - "machine_unload_filament_time": "0", - "retract_lift_below": [ - "279", - "279", - "279", - "279" - ], - "enable_long_retraction_when_cut": [ - "0", - "0", - "0", - "0" - ], - "long_retractions_when_cut": [ - "0", - "0", - "0", - "0" ] } diff --git a/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra 0.6 nozzle.json b/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra 0.6 nozzle.json old mode 100755 new mode 100644 index fc851ff348..d98ab10954 --- a/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra 0.6 nozzle.json +++ b/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra 0.6 nozzle.json @@ -1,22 +1,23 @@ { "type": "machine", "name": "WonderMaker ZR Ultra 0.6 nozzle", - "inherits": "WonderMaker ZR Ultra 0.4 nozzle", + "inherits": "fdm_ultra_common", "from": "system", "setting_id": "6OWxZLFn3RD54QfX", "instantiation": "true", + "printer_model": "WonderMaker ZR Ultra", + "printer_variant": "0.6", + "default_print_profile": "0.30mm Standard @WonderMaker ZR Ultra 0.6 nozzle", + "default_bed_type": "4", + "max_layer_height": [ + "0.42" + ], "nozzle_diameter": [ "0.6", "0.6", "0.6", "0.6" ], - "printer_model": "WonderMaker ZR Ultra", - "printer_variant": "0.6", - "default_print_profile": "0.30mm Standard @WonderMaker ZR Ultra 0.6 nozzle", - "max_layer_height": [ - "0.42" - ], "min_layer_height": [ "0.12" ], diff --git a/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra 0.8 nozzle.json b/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra 0.8 nozzle.json old mode 100755 new mode 100644 index eefaab3431..2b5929a862 --- a/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra 0.8 nozzle.json +++ b/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra 0.8 nozzle.json @@ -1,22 +1,23 @@ { "type": "machine", "name": "WonderMaker ZR Ultra 0.8 nozzle", - "inherits": "WonderMaker ZR Ultra 0.4 nozzle", + "inherits": "fdm_ultra_common", "from": "system", "setting_id": "SY9snlsMkurhEYWP", "instantiation": "true", + "printer_model": "WonderMaker ZR Ultra", + "printer_variant": "0.8", + "default_print_profile": "0.40mm Standard @WonderMaker ZR Ultra 0.8 nozzle", + "default_bed_type": "4", + "max_layer_height": [ + "0.56" + ], "nozzle_diameter": [ "0.8", "0.8", "0.8", "0.8" ], - "printer_model": "WonderMaker ZR Ultra", - "printer_variant": "0.8", - "default_print_profile": "0.40mm Standard @WonderMaker ZR Ultra 0.8 nozzle", - "max_layer_height": [ - "0.56" - ], "min_layer_height": [ "0.16" ], diff --git a/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra S 0.2 nozzle.json b/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra S 0.2 nozzle.json old mode 100755 new mode 100644 index 26ad5e21d7..5d67c1fe5e --- a/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra S 0.2 nozzle.json +++ b/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra S 0.2 nozzle.json @@ -1,29 +1,19 @@ { "type": "machine", "name": "WonderMaker ZR Ultra S 0.2 nozzle", - "inherits": "WonderMaker ZR Ultra S 0.4 nozzle", + "inherits": "WonderMaker ZR Ultra 0.2 nozzle", "from": "system", "setting_id": "ZNAx3f7tX3DatiK1", "instantiation": "true", + "printer_model": "WonderMaker ZR Ultra S", "nozzle_diameter": [ "0.2", "0.2", "0.2", "0.2" ], - "printer_model": "WonderMaker ZR Ultra S", - "printer_variant": "0.2", "default_print_profile": "0.10mm Standard @WonderMaker ZR Ultra 0.2 nozzle", - "max_layer_height": [ - "0.14" - ], - "min_layer_height": [ - "0.04" - ], - "retraction_length": [ - "0.4", - "0.4", - "0.4", - "0.4" - ] + "printer_variant": "0.2", + "support_air_filtration": "1", + "support_chamber_temp_control": "1" } diff --git a/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra S 0.4 nozzle.json b/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra S 0.4 nozzle.json old mode 100755 new mode 100644 index df1dbbb9a8..3ae0673f79 --- a/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra S 0.4 nozzle.json +++ b/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra S 0.4 nozzle.json @@ -1,65 +1,18 @@ { "type": "machine", "name": "WonderMaker ZR Ultra S 0.4 nozzle", - "inherits": "fdm_klipper_common", + "inherits": "WonderMaker ZR Ultra 0.4 nozzle", "from": "system", "setting_id": "8xoZ6vYv9ws0J97u", "instantiation": "true", "printer_model": "WonderMaker ZR Ultra S", - "default_print_profile": "0.20mm Standard @WonderMaker ZR Ultra", - "default_bed_type": "4", - "default_filament_profile": [ - "WonderMaker PLA Basic" - ], - "single_extruder_multi_material": "0", "nozzle_diameter": [ "0.4", "0.4", "0.4", "0.4" ], - "printable_area": [ - "0x0", - "300x0", - "300x270", - "0x270" - ], - "bed_exclude_area": [], - "printable_height": "290", - "extruder_clearance_radius": "134", - "bed_mesh_min": [ - "10", - "10" - ], - "bed_mesh_max": [ - "290", - "260" - ], - "bed_mesh_probe_distance": [ - "50", - "50" - ], + "default_print_profile": "0.20mm Standard @WonderMaker ZR Ultra", "support_air_filtration": "1", - "support_chamber_temp_control": "1", - "machine_tool_change_time": "10", - "machine_load_filament_time": "0", - "machine_unload_filament_time": "0", - "retract_lift_below": [ - "279", - "279", - "279", - "279" - ], - "enable_long_retraction_when_cut": [ - "0", - "0", - "0", - "0" - ], - "long_retractions_when_cut": [ - "0", - "0", - "0", - "0" - ] + "support_chamber_temp_control": "1" } diff --git a/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra S 0.6 nozzle.json b/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra S 0.6 nozzle.json old mode 100755 new mode 100644 index 9f2bd6f069..c75e56de4e --- a/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra S 0.6 nozzle.json +++ b/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra S 0.6 nozzle.json @@ -1,32 +1,19 @@ { "type": "machine", "name": "WonderMaker ZR Ultra S 0.6 nozzle", - "inherits": "WonderMaker ZR Ultra S 0.4 nozzle", + "inherits": "WonderMaker ZR Ultra 0.6 nozzle", "from": "system", "setting_id": "xuJnOPTmSW1BMo6p", "instantiation": "true", "printer_model": "WonderMaker ZR Ultra S", - "default_print_profile": "0.30mm Standard @WonderMaker ZR Ultra 0.6 nozzle", - "printer_variant": "0.6", "nozzle_diameter": [ + "0.6", + "0.6", + "0.6", "0.6" ], - "max_layer_height": [ - "0.42" - ], - "min_layer_height": [ - "0.12" - ], - "retraction_length": [ - "1.4", - "1.4", - "1.4", - "1.4" - ], - "retraction_minimum_travel": [ - "3", - "3", - "3", - "3" - ] + "default_print_profile": "0.30mm Standard @WonderMaker ZR Ultra 0.6 nozzle", + "printer_variant": "0.6", + "support_air_filtration": "1", + "support_chamber_temp_control": "1" } diff --git a/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra S 0.8 nozzle.json b/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra S 0.8 nozzle.json old mode 100755 new mode 100644 index 2137855fe0..f18a3d3361 --- a/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra S 0.8 nozzle.json +++ b/resources/profiles/WonderMaker/machine/WonderMaker ZR Ultra S 0.8 nozzle.json @@ -1,32 +1,19 @@ { "type": "machine", "name": "WonderMaker ZR Ultra S 0.8 nozzle", - "inherits": "WonderMaker ZR Ultra S 0.4 nozzle", + "inherits": "WonderMaker ZR Ultra 0.8 nozzle", "from": "system", "setting_id": "0BPLKMspArilfkGT", "instantiation": "true", "printer_model": "WonderMaker ZR Ultra S", - "default_print_profile": "0.40mm Standard @WonderMaker ZR Ultra 0.8 nozzle", - "printer_variant": "0.8", "nozzle_diameter": [ + "0.8", + "0.8", + "0.8", "0.8" ], - "max_layer_height": [ - "0.56" - ], - "min_layer_height": [ - "0.16" - ], - "retract_length_toolchange": [ - "3", - "3", - "3", - "3" - ], - "retraction_length": [ - "3", - "3", - "3", - "3" - ] + "default_print_profile": "0.40mm Standard @WonderMaker ZR Ultra 0.8 nozzle", + "printer_variant": "0.8", + "support_air_filtration": "1", + "support_chamber_temp_control": "1" } diff --git a/resources/profiles/WonderMaker/machine/fdm_ultra_common.json b/resources/profiles/WonderMaker/machine/fdm_ultra_common.json new file mode 100644 index 0000000000..08c8f9683a --- /dev/null +++ b/resources/profiles/WonderMaker/machine/fdm_ultra_common.json @@ -0,0 +1,64 @@ +{ + "type": "machine", + "name": "fdm_ultra_common", + "inherits": "fdm_klipper_common", + "from": "system", + "instantiation": "false", + "default_bed_type": "4", + "default_filament_profile": [ + "WonderMaker PLA Basic" + ], + "single_extruder_multi_material": "0", + "enable_filament_mapping": "1", + "filament_swap_gcode": "M117 Swap filament for tool {next_extruder}\nPAUSE", + "nozzle_diameter": [ + "0.4", + "0.4", + "0.4", + "0.4" + ], + "printable_area": [ + "0x0", + "300x0", + "300x270", + "0x270" + ], + "bed_exclude_area": [], + "printable_height": "290", + "extruder_clearance_radius": "134", + "bed_mesh_min": [ + "10", + "10" + ], + "bed_mesh_max": [ + "290", + "260" + ], + "bed_mesh_probe_distance": [ + "50", + "50" + ], + "support_air_filtration": "0", + "support_chamber_temp_control": "0", + "machine_tool_change_time": "10", + "machine_load_filament_time": "0", + "machine_unload_filament_time": "0", + "retract_lift_below": [ + "279", + "279", + "279", + "279" + ], + "enable_long_retraction_when_cut": [ + "0", + "0", + "0", + "0" + ], + "long_retractions_when_cut": [ + "0", + "0", + "0", + "0" + ] +} diff --git a/resources/shaders/110/ssao.fs b/resources/shaders/110/ssao.fs index 5aada05883..db266daba1 100644 --- a/resources/shaders/110/ssao.fs +++ b/resources/shaders/110/ssao.fs @@ -7,18 +7,38 @@ uniform sampler2D color_texture; uniform sampler2D depth_texture; -uniform sampler2D normal_texture; uniform vec2 inv_tex_size; -uniform float z_near; uniform float z_far; uniform bool is_outline; +// The pass has no normal target to read, so the surface normal is reconstructed from the depth +// buffer. inv_projection_matrix unprojects a pixel back into view space and up_view is world +Z +// expressed in view space, which is what tells a top surface from a wall. +uniform mat4 inv_projection_matrix; +uniform vec3 up_view; varying vec2 tex_coord; -float linearize_depth(float depth) +// Position of the given pixel in view space. Valid under both an orthographic and a perspective +// camera, unlike the depth linearization it replaces. +vec3 view_pos(vec2 uv) { - float z = depth * 2.0 - 1.0; - return (2.0 * z_near * z_far) / (z_far + z_near - z * (z_far - z_near)); + vec2 c = clamp(uv, vec2(0.0), vec2(1.0)); + float d = texture2D(depth_texture, c).r; + vec4 ndc = vec4(c * 2.0 - 1.0, d * 2.0 - 1.0, 1.0); + vec4 view = inv_projection_matrix * ndc; + return view.xyz / view.w; +} + +// Surface normal at the given pixel, from the forward differences of the reconstructed view +// position. It rings by a pixel across a depth discontinuity, which is acceptable here: the +// normal only weights the occlusion, nothing is shaded with it. +vec3 view_normal(vec2 uv, vec3 p) +{ + vec3 px = view_pos(uv + vec2(inv_tex_size.x, 0.0)); + vec3 py = view_pos(uv + vec2(0.0, inv_tex_size.y)); + vec3 n = cross(px - p, py - p); + float len = length(n); + return (len > 1e-8) ? n / len : vec3(0.0, 0.0, 1.0); } void main() @@ -28,16 +48,21 @@ void main() return; } vec3 base = texture2D(color_texture, tex_coord).rgb; - float depth_center = linearize_depth(texture2D(depth_texture, tex_coord).r); - // Sample normal at current fragment (range: -1 to 1) - vec3 normal_center = texture2D(normal_texture, tex_coord).rgb * 2.0 - 1.0; + // Nothing was drawn here: occluding the background would only darken the gradient, and its + // reconstructed normal is degenerate anyway. + if (texture2D(depth_texture, tex_coord).r >= 0.9999) { + gl_FragColor = vec4(base, 1.0); + return; + } + + vec3 center_pos = view_pos(tex_coord); + float depth_center = -center_pos.z; + vec3 normal_center = view_normal(tex_coord, center_pos); // Calculate how much the surface faces upward - // up_factor = 1.0 for surfaces pointing straight up (0,0,1) - // up_factor = 0.0 for surfaces pointing down or sideways - float up_factor = max(0.0, normal_center.z); // Assuming Z is up axis - // Alternative: if Y is up, use normal_center.y + // up_factor = 1.0 for surfaces pointing straight up, 0.0 for walls and downward faces + float up_factor = clamp(dot(normal_center, up_view), 0.0, 1.0); // Adaptive sampling radius float radius = mix(2.0, 4.0, depth_center / z_far); @@ -52,39 +77,38 @@ void main() offsets[6] = vec2( 0.0, -1.0); offsets[7] = vec2( 0.707,-0.707); + // Occlusion is a slope, not a depth difference: how far a neighbour rises out of the + // centre's tangent plane over how far away it is. Unlike a raw difference, that sine is + // free of camera distance and zoom, so a crease reads the same from any view. + const float SLOPE_MIN = 0.08; // ~5 degrees, above the depth-buffer noise of a flat surface + const float SLOPE_MAX = 0.60; // ~37 degrees, a full crease + + const float SAMPLE_COUNT = 8.0; float occlusion = 0.0; - int valid_samples = 0; for (int i = 0; i < 8; ++i) { vec2 uv = tex_coord + offsets[i] * inv_tex_size * radius; - uv = clamp(uv, vec2(0.001), vec2(0.999)); - float sample_depth = linearize_depth(texture2D(depth_texture, uv).r); - float depth_diff = max(0.0, depth_center - sample_depth); - - float threshold = 0.015 * (0.5 + depth_center / z_far); - float contribution = smoothstep(0.001, threshold, depth_diff); + vec3 delta = view_pos(uv) - center_pos; + float dist = length(delta); + float rise = (dist > 1e-6) ? dot(delta, normal_center) / dist : 0.0; + float contribution = smoothstep(SLOPE_MIN, SLOPE_MAX, rise); float diagonal_weight = 1.0 - abs(offsets[i].x * offsets[i].y) * 0.5; occlusion += contribution * diagonal_weight; - valid_samples++; } - if (valid_samples > 0) - occlusion /= float(valid_samples); + occlusion /= SAMPLE_COUNT; // flatter/top-like surfaces get less darkening float ao_intensity = 0.55; float ambient_occlusion = 1.0 - occlusion * ao_intensity; - // Different min values for top vs bottom surfaces + // Different min values for top vs bottom surfaces. The boost that used to follow lifted a + // top surface back to within 2% of unoccluded once up_factor became a real normal rather + // than a colour, which is where the AO went; the floors alone shape the effect now. float ao_min = mix(0.45, 0.70, up_factor); // Bottom: 0.45, Top: 0.70 ambient_occlusion = clamp(ambient_occlusion, ao_min, 1.0); - // Boost brightness on top surfaces (optional) - float brightness_boost = 1.0 + up_factor * 0.15; // 15% extra brightness on top - ambient_occlusion = pow(ambient_occlusion, 2.2) * brightness_boost; - ambient_occlusion = clamp(ambient_occlusion, 0.45, 1.05); - gl_FragColor = vec4(base * ambient_occlusion, 1.0); -} \ No newline at end of file +} diff --git a/resources/shaders/110/xray.fs b/resources/shaders/110/xray.fs new file mode 100644 index 0000000000..27bdb17044 --- /dev/null +++ b/resources/shaders/110/xray.fs @@ -0,0 +1,28 @@ +#version 110 + +// X-Ray view: each surface is a thin translucent layer of its own color, covering more the more +// edge-on it is seen. The caller draws it with depth writes off, so every surface a view ray crosses +// composites and overlapping geometry reads as denser. Source-alpha rather than additive blending: +// additive would saturate to white on the light theme's near-white background. +#define EDGE_FALLOFF 2.0 +// Coverage head-on and edge-on. +#define FACE_DENSITY 0.12 +#define EDGE_DENSITY 0.65 + +uniform vec4 uniform_color; + +varying vec3 eye_normal; +varying vec3 eye_position; +varying vec3 clipping_planes_dots; + +void main() +{ + if (any(lessThan(clipping_planes_dots, vec3(0.0)))) + discard; + + // abs(): back faces are drawn too, and there only the angle matters. + float facing = abs(dot(normalize(eye_normal), normalize(-eye_position))); + float density = mix(EDGE_DENSITY, FACE_DENSITY, pow(facing, EDGE_FALLOFF)); + + gl_FragColor = vec4(uniform_color.rgb, density * uniform_color.a); +} diff --git a/resources/shaders/110/xray.vs b/resources/shaders/110/xray.vs new file mode 100644 index 0000000000..85f932f2df --- /dev/null +++ b/resources/shaders/110/xray.vs @@ -0,0 +1,31 @@ +#version 110 + +uniform mat4 view_model_matrix; +uniform mat4 projection_matrix; +uniform mat3 view_normal_matrix; +uniform mat4 volume_world_matrix; + +// Clipping, as in gouraud.vs: the preview's top / bottom plane and the SLA gizmo's free one. +uniform vec2 z_range; +uniform vec4 clipping_plane; + +attribute vec3 v_position; +attribute vec3 v_normal; + +varying vec3 eye_normal; +varying vec3 eye_position; +varying vec3 clipping_planes_dots; + +void main() +{ + eye_normal = view_normal_matrix * v_normal; + + vec4 position = view_model_matrix * vec4(v_position, 1.0); + eye_position = position.xyz; + + // A component below zero means the fragment is clipped away. + vec4 world_pos = volume_world_matrix * vec4(v_position, 1.0); + clipping_planes_dots = vec3(dot(world_pos, clipping_plane), world_pos.z - z_range.x, z_range.y - world_pos.z); + + gl_Position = projection_matrix * position; +} diff --git a/resources/shaders/140/ssao.fs b/resources/shaders/140/ssao.fs index b3b6df6877..28b561ba2c 100644 --- a/resources/shaders/140/ssao.fs +++ b/resources/shaders/140/ssao.fs @@ -1,24 +1,45 @@ #version 140 /** - * SSAO Shader - GLSL 140 version with sharp depth threshold + * SSAO Shader - GLSL 140 version with a slope-based occlusion test * Only darkens valleys/concave areas, ignores smooth variations */ uniform sampler2D color_texture; uniform sampler2D depth_texture; -uniform sampler2D normal_texture; -uniform float z_near; +uniform vec2 inv_tex_size; uniform float z_far; uniform bool is_outline; +// The pass has no normal target to read, so the surface normal is reconstructed from the depth +// buffer. inv_projection_matrix unprojects a pixel back into view space and up_view is world +Z +// expressed in view space, which is what tells a top surface from a wall. +uniform mat4 inv_projection_matrix; +uniform vec3 up_view; in vec2 tex_coord; out vec4 frag_color; -float linearize_depth(float depth) +// Position of the given pixel in view space. Valid under both an orthographic and a perspective +// camera, unlike the depth linearization it replaces. +vec3 view_pos(ivec2 pixel) { - float z = depth * 2.0 - 1.0; - return (2.0 * z_near * z_far) / (z_far + z_near - z * (z_far - z_near)); + ivec2 p = clamp(pixel, ivec2(0), textureSize(depth_texture, 0) - 1); + float d = texelFetch(depth_texture, p, 0).r; + vec4 ndc = vec4((vec2(p) + 0.5) * inv_tex_size * 2.0 - 1.0, d * 2.0 - 1.0, 1.0); + vec4 view = inv_projection_matrix * ndc; + return view.xyz / view.w; +} + +// Surface normal at the given pixel, from the forward differences of the reconstructed view +// position. It rings by a pixel across a depth discontinuity, which is acceptable here: the +// normal only weights the occlusion, nothing is shaded with it. +vec3 view_normal(ivec2 pixel, vec3 p) +{ + vec3 px = view_pos(pixel + ivec2(1, 0)); + vec3 py = view_pos(pixel + ivec2(0, 1)); + vec3 n = cross(px - p, py - p); + float len = length(n); + return (len > 1e-8) ? n / len : vec3(0.0, 0.0, 1.0); } void main() @@ -28,81 +49,72 @@ void main() return; } ivec2 pixel = ivec2(gl_FragCoord.xy); - float center_depth = linearize_depth(texelFetch(depth_texture, pixel, 0).r); - - // Sample normal buffer (stored as RGB in 0-1 range, convert to -1 to 1) - vec3 normal_center = texelFetch(normal_texture, pixel, 0).rgb * 2.0 - 1.0; - normal_center = normalize(normal_center); - + vec3 color = texture(color_texture, tex_coord).rgb; + + // Nothing was drawn here: occluding the background would only darken the gradient, and its + // reconstructed normal is degenerate anyway. + if (texelFetch(depth_texture, pixel, 0).r >= 0.9999) { + frag_color = vec4(color, 1.0); + return; + } + + vec3 center_pos = view_pos(pixel); + float center_depth = -center_pos.z; + vec3 normal_center = view_normal(pixel, center_pos); + // Calculate upward-facing factor (Z-up coordinate system) - float up_factor = clamp(normal_center.z * 1.5, 0.0, 1.0); - + float up_factor = clamp(dot(normal_center, up_view), 0.0, 1.0); + // Adaptive radius in pixel space int radius = int(mix(2.0, 4.0, center_depth / z_far)); // Optimized sampling pattern - const ivec2 offsets[12] = ivec2[]( + const int SAMPLE_COUNT = 12; + const ivec2 offsets[SAMPLE_COUNT] = ivec2[]( ivec2(1, 0), ivec2(-1, 0), ivec2(0, 1), ivec2(0, -1), ivec2(1, 1), ivec2(-1, 1), ivec2(1, -1), ivec2(-1, -1), ivec2(2, 0), ivec2(-2, 0), ivec2(0, 2), ivec2(0, -2) ); - float occlusion = 0.0; - int valid_samples = 0; + // Occlusion is a slope, not a depth difference: the sine of the angle a neighbour subtends + // above the centre's tangent plane. A raw difference depends on camera distance and zoom, + // so no fixed thresholds suit both a 0.2 mm layer step and a 5 mm overhang. + const float SLOPE_MIN = 0.08; // ~5 degrees, above the depth-buffer noise of a flat surface + const float SLOPE_MAX = 0.60; // ~37 degrees, a full crease - for (int i = 0; i < 12; i++) { + float occlusion = 0.0; + + for (int i = 0; i < SAMPLE_COUNT; i++) { + // No edge rejection: view_pos clamps, giving a near-zero delta and no occlusion. + // Rejecting one side only would bias the denominator against the other. ivec2 sample_pixel = pixel + offsets[i] * radius; - if (sample_pixel.x < 0 || sample_pixel.y < 0) - continue; - - float sample_depth = linearize_depth(texelFetch(depth_texture, sample_pixel, 0).r); - - // Sample normal at neighbor - vec3 normal_sample = texelFetch(normal_texture, sample_pixel, 0).rgb * 2.0 - 1.0; - - // Depth difference (positive if neighbor is closer to camera) - float depth_diff = center_depth - sample_depth; - - // Sharp depth threshold === - // Minimum depth difference to consider occlusion (ignores small variations) - float threshold_min = 0.008; // Higher = only deep valleys get darkened - float threshold_max = 0.04; // Transition range for full occlusion + vec3 delta = view_pos(sample_pixel) - center_pos; + float dist = length(delta); + // How far the neighbour rises towards the viewer out of the centre's tangent plane. A + // flat surface gives ~0 whatever its orientation, so this also subsumes the separate + // planar test the normals were compared for. + float rise = (dist > 1e-6) ? dot(delta, normal_center) / dist : 0.0; float contribution = 0.0; - if (depth_diff > threshold_min) { + if (rise > SLOPE_MIN) { // Abrupt mapping with power curve - contribution = (depth_diff - threshold_min) / (threshold_max - threshold_min); + contribution = (rise - SLOPE_MIN) / (SLOPE_MAX - SLOPE_MIN); contribution = clamp(contribution, 0.0, 1.0); contribution = pow(contribution, 2.0); // Steeper curve for sharper transition } - // Reduce occlusion on planar surfaces (similar normals) - float normal_similarity = dot(normal_center, normal_sample); - float planar_factor = smoothstep(0.75, 0.95, normal_similarity); - contribution *= (1.0 - planar_factor * 0.6); - occlusion += contribution; - valid_samples++; } - if (valid_samples > 0) { - // Calculate ambient occlusion factor with higher base intensity - float ao_factor = 1.0 - (occlusion / float(valid_samples)) * 0.6; - - // Keep bright areas clean (higher minimum for upward-facing surfaces) - float ao_min = mix(0.55, 0.85, up_factor); - ao_factor = clamp(ao_factor, ao_min, 1.0); - - // Slight brightness boost for upward-facing surfaces - float brightness_boost = 1.0 + up_factor * 0.15; - ao_factor = ao_factor * brightness_boost; - - occlusion = ao_factor; - } else { - occlusion = 1.0; - } + // Calculate ambient occlusion factor with higher base intensity + float ao_factor = 1.0 - (occlusion / float(SAMPLE_COUNT)) * 0.6; + + // Keep bright areas clean (higher minimum for upward-facing surfaces). The old 0.85 floor + // and 1.15 boost were set when up_factor came from the colour buffer and read ~0; with a + // real normal they capped a top surface at 2% darkening, which hid the AO entirely. + float ao_min = mix(0.45, 0.70, up_factor); + occlusion = clamp(ao_factor, ao_min, 1.0); - vec3 color = texture(color_texture, tex_coord).rgb; frag_color = vec4(color * occlusion, 1.0); -} \ No newline at end of file +} diff --git a/resources/shaders/140/xray.fs b/resources/shaders/140/xray.fs new file mode 100644 index 0000000000..71c3569f8e --- /dev/null +++ b/resources/shaders/140/xray.fs @@ -0,0 +1,30 @@ +#version 140 + +// X-Ray view: each surface is a thin translucent layer of its own color, covering more the more +// edge-on it is seen. The caller draws it with depth writes off, so every surface a view ray crosses +// composites and overlapping geometry reads as denser. Source-alpha rather than additive blending: +// additive would saturate to white on the light theme's near-white background. +#define EDGE_FALLOFF 2.0 +// Coverage head-on and edge-on. +#define FACE_DENSITY 0.12 +#define EDGE_DENSITY 0.65 + +uniform vec4 uniform_color; + +in vec3 eye_normal; +in vec3 eye_position; +in vec3 clipping_planes_dots; + +out vec4 out_color; + +void main() +{ + if (any(lessThan(clipping_planes_dots, vec3(0.0)))) + discard; + + // abs(): back faces are drawn too, and there only the angle matters. + float facing = abs(dot(normalize(eye_normal), normalize(-eye_position))); + float density = mix(EDGE_DENSITY, FACE_DENSITY, pow(facing, EDGE_FALLOFF)); + + out_color = vec4(uniform_color.rgb, density * uniform_color.a); +} diff --git a/resources/shaders/140/xray.vs b/resources/shaders/140/xray.vs new file mode 100644 index 0000000000..9cb0d64b32 --- /dev/null +++ b/resources/shaders/140/xray.vs @@ -0,0 +1,31 @@ +#version 140 + +uniform mat4 view_model_matrix; +uniform mat4 projection_matrix; +uniform mat3 view_normal_matrix; +uniform mat4 volume_world_matrix; + +// Clipping, as in gouraud.vs: the preview's top / bottom plane and the SLA gizmo's free one. +uniform vec2 z_range; +uniform vec4 clipping_plane; + +in vec3 v_position; +in vec3 v_normal; + +out vec3 eye_normal; +out vec3 eye_position; +out vec3 clipping_planes_dots; + +void main() +{ + eye_normal = view_normal_matrix * v_normal; + + vec4 position = view_model_matrix * vec4(v_position, 1.0); + eye_position = position.xyz; + + // A component below zero means the fragment is clipped away. + vec4 world_pos = volume_world_matrix * vec4(v_position, 1.0); + clipping_planes_dots = vec3(dot(world_pos, clipping_plane), world_pos.z - z_range.x, z_range.y - world_pos.z); + + gl_Position = projection_matrix * position; +} diff --git a/resources/web/dialog/PluginWebDialog/blank.html b/resources/web/dialog/WebDialog/blank.html similarity index 76% rename from resources/web/dialog/PluginWebDialog/blank.html rename to resources/web/dialog/WebDialog/blank.html index 5047c5ba7b..928d754fab 100644 --- a/resources/web/dialog/PluginWebDialog/blank.html +++ b/resources/web/dialog/WebDialog/blank.html @@ -1,5 +1,5 @@ - diff --git a/sandboxes/orca_dock_panel_plugin_any.py b/sandboxes/orca_dock_panel_plugin_any.py new file mode 100644 index 0000000000..514f6c3068 --- /dev/null +++ b/sandboxes/orca_dock_panel_plugin_any.py @@ -0,0 +1,146 @@ +# /// script +# requires-python = ">=3.12" +# +# [tool.orcaslicer.plugin] +# name = "Dock Panel Demo" +# description = "Opens a dockable panel beside the 3D view that lists the objects on the plate." +# author = "OrcaSlicer" +# version = "0.0.1" +# /// +"""Dock Panel Demo -- orca.host.ui.create_dock_panel(). + +Run it from the Plugins dialog. It opens an HTML panel docked on the right of the 3D view, in the +same dock area as the sidebar. Drag its caption to dock it on another side (or float it, where the +platform allows), hide it from the page and run the plugin again to bring it back, or close it with +its close button or from the page. + + page --orca.postMessage({command: 'refresh'})--> plugin.on_message() + page --orca.postMessage({command: 'hide'})--> plugin.on_message() -> panel.hide() + page --orca.close()--> panel closes, plugin.on_close() + plugin --panel.post({command: 'objects', ...})--> page (orca.onMessage) +""" +import orca + +PAGE = """ + + +

Objects on the plate

+

Docked beside the 3D view. Drag the caption to move it.

+ +
+ + + +
+ + + + +
NamePartsCopies
+

Waiting for the plugin...

+ + +""" + + +def plate_objects(): + try: + model = orca.host.model() + except RuntimeError as error: + return {"command": "objects", "error": str(error)} + return { + "command": "objects", + "objects": [ + {"name": obj.name or "(unnamed)", "volumes": obj.volume_count(), "instances": obj.instance_count()} + for obj in model.objects() + ], + } + + +class DockPanelDemo(orca.script.ScriptPluginCapabilityBase): + panel = None + + def get_name(self): + return "Dock Panel Demo" + + def execute(self): + # The capability instance lives as long as the plugin, so a second run finds the open panel. + if self.panel is not None and self.panel.is_open(): + self.panel.show() + return orca.ExecutionResult.success("Dock Panel Demo is already open.") + self.panel = orca.host.ui.create_dock_panel( + html=PAGE, + title="Dock Panel Demo", + width=320, + height=480, + on_message=self.on_message, + on_close=self.on_close, + dock="right", + ) + return orca.ExecutionResult.success("Dock Panel Demo opened.") + + # Called on the UI thread when the page posts. + def on_message(self, message): + command = (message or {}).get("command") + if command == "refresh": + self.panel.post(plate_objects()) + elif command == "hide": + self.panel.hide() + + def on_close(self): + self.panel = None + + +@orca.plugin +class DockPanelDemoPlugin(orca.base): + def register_capabilities(self): + orca.register_capability(DockPanelDemo) diff --git a/scripts/orca_profile_tool.py b/scripts/orca_profile_tool.py index 100e7cba3f..c29bc2ac6d 100755 --- a/scripts/orca_profile_tool.py +++ b/scripts/orca_profile_tool.py @@ -818,6 +818,55 @@ def check_setting_id_uniqueness(profiles_dir): return errors +def check_machine_model_name_uniqueness(profiles_dir): + """No two bundles may declare a machine_model with the same name. + + A machine_model name is the key the whole tree resolves a printer type by: + Preset::get_printer_type (and get_current_printer_type) walk every vendor's + models and return the model_id of the first whose name equals the preset's + printer_model, so two models sharing a name make that lookup depend on vendor + order. The name is also what the Add Printer list shows, so a duplicate + renders the same printer twice. + + Unlike preset names, which are per bundle - base profiles share one name + across dozens of bundles by design - a machine_model name is global. A vendor + copying another vendor's model (the Custom "Generic Klipper Printer" being the + usual source) is the common way this happens. + + Cross-vendor by nature, so it always runs over the whole tree, never narrowed + by --vendor. Returns the error count. + """ + errors = 0 + owners = defaultdict(list) # model name -> [relative path] + for vendor in list_profile_dirs(profiles_dir): + for path, _sub in iter_profile_files(os.path.join(profiles_dir, vendor)): + if os.path.basename(path) in NON_PROFILE_FILES: + continue + try: + data = load_json(path) + except (ValueError, OSError): + # Parse failures are reported by the checks that walk the same + # files; reporting them here too would double-count. + continue + if not isinstance(data, dict) or data.get("type") != "machine_model": + continue + name = data.get("name") + if name: + owners[name].append( + os.path.relpath(path, profiles_dir).replace(os.sep, "/")) + + for name, paths in sorted(owners.items()): + if len(paths) < 2: + continue + errors += 1 + print_error( + f'machine_model name "{name}" is declared by {len(paths)} bundles ' + f'({", ".join(sorted(paths))}); a machine model name is global, so the ' + f"printer type resolves to whichever bundle is seen first and the Add " + f"Printer list shows it twice - rename or delete the duplicate") + return errors + + # --------------------------------------------------------------------------- # Per-vendor validation # --------------------------------------------------------------------------- @@ -1353,9 +1402,11 @@ def check_profiles(profiles_dir=PROFILES_DIR, vendors=None): if remedies[category]: print_warning(f"{remedies[category]} {hint}") - # Cross-vendor checks: setting_id uniqueness and the whole filament_id state, - # both validated over the entire tree regardless of --vendor. + # Cross-vendor checks: setting_id and machine_model name uniqueness and the + # whole filament_id state, all validated over the entire tree regardless of + # --vendor. errors_found += check_setting_id_uniqueness(profiles_dir) + errors_found += check_machine_model_name_uniqueness(profiles_dir) errors_found += check_filament_ids(profiles_dir) print("\n==================== SUMMARY ====================") diff --git a/scripts/tests/test_filament_id.py b/scripts/tests/test_filament_id.py index 001763fca9..fc62f5abc3 100644 --- a/scripts/tests/test_filament_id.py +++ b/scripts/tests/test_filament_id.py @@ -405,6 +405,20 @@ class TestTripleResolution(unittest.TestCase): self.assertEqual(afi.resolve_triple("MyPLA @P1", fmap, {}), ("MyVendor", "PLA", "MyPLA")) + def test_split_vendor_and_type_bases_resolve(self): + # A partial base is normal, not an error: vendor and type may live on + # different ancestors, with an intermediate supplying neither (the + # Snapmaker shape). The pair is complete at the instantiated preset. + recs = [ + self.rec("APLA @P1", inherits="mid"), + self.rec("mid", inherits="typebase"), + self.rec("typebase", filament_type=["PLA"], inherits="vendorbase"), + self.rec("vendorbase", filament_vendor=["AV"]), + ] + fmap = {r["name"]: r for r in recs} + self.assertEqual(afi.resolve_triple("APLA @P1", fmap, {}), + ("AV", "PLA", "APLA")) + # --------------------------------------------------------------------------- # checks on synthetic trees @@ -417,6 +431,24 @@ class TestChecks(OfCleanTreeCase): self.assertNotIn("[ERROR]", out) self.assertNotIn("[WARNING]", out) + def test_instantiated_preset_over_partial_bases_is_silent(self): + # Vendor and type split across two non-instantiated bases, an + # intermediate base with neither: base profiles are allowed to be + # partial. Only the instantiated preset must resolve both. + self.t.write_preset("VendorA", preset("XPLA vendorbase", instantiation=False, + filament_vendor="XV")) + self.t.write_preset("VendorA", preset("XPLA typebase", instantiation=False, + filament_type="PLA", + inherits="XPLA vendorbase")) + self.t.write_preset("VendorA", preset("XPLA mid", instantiation=False, + inherits="XPLA typebase")) + self.t.write_preset("VendorA", preset( + "XPLA @P1", inherits="XPLA mid", + filament_id=afi.generate_filament_id("XV", "PLA", "XPLA"), + compatible_printers=["P1"])) + errors, out = self.t.check() + self.assertEqual(errors, 0, out) + def test_check1_unknown_non_of_id(self): self.t.write_preset("VendorA", preset("BPLA @base", filament_id="BOGUS_9", instantiation=False, @@ -1523,6 +1555,19 @@ class TestRealTree(unittest.TestCase): self.assertEqual(analysis["missing_effective"], []) self.assertEqual(analysis["read_errors"], []) + def test_every_instantiated_filament_resolves_vendor_and_type(self): + # The property the web guide resolves at load: a partial base is fine as + # long as the instantiated preset ends up with both fields. Guards the + # split-base bundles (Snapmaker, Anker, SeeMeCNC). + analysis = afi.analyze_tree(REAL_PROFILES) + unresolved = [ + (vendor, rec["name"], rec["triple"][0], rec["triple"][1]) + for vendor, filaments in analysis["vendors"].items() + for rec in filaments.values() + if rec["instantiation"] and not (rec["triple"][0] and rec["triple"][1]) + ] + self.assertEqual(unresolved, []) + # --------------------------------------------------------------------------- # review-fix regressions # --------------------------------------------------------------------------- diff --git a/scripts/tests/test_profile_tool.py b/scripts/tests/test_profile_tool.py index 29b62b693e..f9a7634471 100644 --- a/scripts/tests/test_profile_tool.py +++ b/scripts/tests/test_profile_tool.py @@ -678,6 +678,34 @@ class TestCheck(TreeCase): errors, out = self.names(vendor) self.assertEqual(errors, 0, out) + def machine_models(self): + """The cross-vendor machine_model name check, whole tree by design.""" + buf = io.StringIO() + with contextlib.redirect_stdout(buf): + errors = apt.check_machine_model_name_uniqueness(self.t.profiles) + return errors, buf.getvalue() + + def test_two_bundles_may_not_declare_one_machine_model_name(self): + # The name keys the global printer-type lookup: Preset::get_printer_type + # matches a preset's printer_model against every vendor's model names, so a + # copy of another vendor's model is ambiguous, not merely duplicated. + for vendor in ("V", "W"): + self.t.write(vendor, "machine/MyKlipper.json", + {"type": "machine_model", "name": "Generic Klipper Printer", + "model_id": "my_klipper_01"}) + errors, out = self.machine_models() + self.assertEqual(errors, 1, out) + self.assertIn('machine_model name "Generic Klipper Printer"', out) + self.assertIn("V/machine/MyKlipper.json", out) + self.assertIn("W/machine/MyKlipper.json", out) + + def test_distinct_machine_model_names_are_left_alone(self): + for vendor in ("V", "W"): + self.t.write(vendor, "machine/model.json", + {"type": "machine_model", "name": f"{vendor} Model"}) + errors, out = self.machine_models() + self.assertEqual(errors, 0, out) + def coverage(self, vendor="V"): """The index-coverage check for one bundle: (errors, gaps, output).""" buf = io.StringIO() diff --git a/src/OrcaSlicer.cpp b/src/OrcaSlicer.cpp index 0c9bd0b1ee..57be0595cb 100644 --- a/src/OrcaSlicer.cpp +++ b/src/OrcaSlicer.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #if defined(__linux__) || defined(__LINUX__) #include @@ -1614,6 +1615,10 @@ int CLI::run(int argc, char **argv) ConfigOptionBool* allow_rotations_option = m_config.option("allow_rotations"); if (allow_rotations_option) allow_rotations = allow_rotations_option->value; + // Only an explicit --align-to-y-axis overrides the printer-structure default. + std::optional align_to_y_axis; + if (m_given_option_keys.count("align_to_y_axis") > 0) + align_to_y_axis = m_config.opt_bool("align_to_y_axis"); ConfigOptionBool* skip_modified_gcodes_option = m_config.option("skip_modified_gcodes"); if (skip_modified_gcodes_option) @@ -5298,7 +5303,9 @@ int CLI::run(int argc, char **argv) arrange_cfg.bed_shrink_x = BED_SHRINK_SEQ_PRINT; arrange_cfg.bed_shrink_y = BED_SHRINK_SEQ_PRINT; } - if (auto printer_structure_opt = m_print_config.option>("printer_structure")) { + if (align_to_y_axis.has_value()) { + arrange_cfg.align_to_y_axis = *align_to_y_axis; + } else if (auto printer_structure_opt = m_print_config.option>("printer_structure")) { arrange_cfg.align_to_y_axis = (printer_structure_opt->value == PrinterStructure::psI3); } @@ -5748,7 +5755,9 @@ int CLI::run(int argc, char **argv) arrange_cfg.bed_shrink_x = BED_SHRINK_SEQ_PRINT; arrange_cfg.bed_shrink_y = BED_SHRINK_SEQ_PRINT; } - if (auto printer_structure_opt = m_print_config.option>("printer_structure")) { + if (align_to_y_axis.has_value()) { + arrange_cfg.align_to_y_axis = *align_to_y_axis; + } else if (auto printer_structure_opt = m_print_config.option>("printer_structure")) { arrange_cfg.align_to_y_axis = (printer_structure_opt->value == PrinterStructure::psI3); } @@ -7943,6 +7952,8 @@ bool CLI::setup(int argc, char **argv) for (std::string &input_file : m_input_files) input_file = resolve_cli_input_path(input_file); + m_given_option_keys.insert(opt_order.begin(), opt_order.end()); + // Parse actions and transform options. for (auto const &opt_key : opt_order) { if (cli_actions_config_def.has(opt_key)) diff --git a/src/OrcaSlicer.hpp b/src/OrcaSlicer.hpp index e6aada821f..380607e95f 100644 --- a/src/OrcaSlicer.hpp +++ b/src/OrcaSlicer.hpp @@ -1,6 +1,8 @@ #ifndef SLIC3R_HPP #define SLIC3R_HPP +#include + #include "libslic3r/Config.hpp" #include "libslic3r/Model.hpp" @@ -113,6 +115,8 @@ private: std::vector m_input_files; std::vector m_actions; std::vector m_transforms; + // Options the user typed; setup() fills the CLI's own options with defaults afterwards. + std::set m_given_option_keys; std::vector m_models; bool setup(int argc, char **argv); diff --git a/src/dev-utils/OrcaSlicer_profile_validator.cpp b/src/dev-utils/OrcaSlicer_profile_validator.cpp index 56acbaa732..557dda7eec 100644 --- a/src/dev-utils/OrcaSlicer_profile_validator.cpp +++ b/src/dev-utils/OrcaSlicer_profile_validator.cpp @@ -122,17 +122,19 @@ Vec2d printable_area_center(const DynamicPrintConfig &cfg) // Put the prime tower where the GUI and CLI would before slicing. The config default (x 15, y 220) // lies off any bed shallower than the tower, and generation rejects an off-plate tower instead of -// exporting it. Beside the centred cube, clear of the edge exclusion strips some beds carry, then -// pulled inside the printable outline by the tower's own estimated footprint, with a few mm of -// clearance so the conflict checker never sees the two touch. -void place_wipe_tower(DynamicPrintConfig &cfg, const Vec2d ¢er) +// exporting it. Beside the cube at the bed centre, clear of the edge exclusion strips some beds +// carry, with a few mm of clearance so the conflict checker never sees the two touch. The cube and +// the tower's estimated footprint are then pulled inside the printable outline as one rigid pair: +// moving the tower alone would push it back onto the cube on a narrow bed. Returns that move for +// the cube. +Vec2d place_wipe_tower(DynamicPrintConfig &cfg, const Vec2d ¢er) { const auto *area = cfg.option("printable_area"); if (area == nullptr || area->values.size() < 3) - return; + return Vec2d::Zero(); const WipeTowerFootprint footprint = estimate_wipe_tower_footprint(cfg, resolve_wipe_tower_type(cfg), {0, 1}, cfg.opt_float("layer_height"), 10.); if (footprint.depth < EPSILON) - return; + return Vec2d::Zero(); const double margin = WIPE_TOWER_MARGIN + footprint.brim_width; // The position is the tower's own origin; a rotated tower extends from it in another // direction, so place the rotated box's extents rather than the origin. @@ -143,13 +145,22 @@ void place_wipe_tower(DynamicPrintConfig &cfg, const Vec2d ¢er) const Vec2d size = unscale(local.max) - lo; Vec2d pos(center.x() + 5. + margin + 5. - lo.x(), center.y() - size.y() / 2. - lo.y()); box.translate(Point::new_scale(pos.x(), pos.y())); - const Vec2f move = WipeTower::move_box_inside_polygon(get_extents(box), Polygons{Polygon::new_scale(area->values)}, scaled(margin)); - pos += move.cast(); + // A bed too small for the pair keeps the cube at its centre and places the tower alone. + const Polygons bed{Polygon::new_scale(area->values)}; + const BoundingBox tower = get_extents(box); + BoundingBox pair = tower; + pair.merge(Point::new_scale(center.x() - 5., center.y() - 5.)); + pair.merge(Point::new_scale(center.x() + 5., center.y() + 5.)); + const Point room = get_extents(bed).size() - Point::new_scale(2. * margin, 2. * margin); + const bool rigid = pair.size().x() < room.x() && pair.size().y() < room.y(); + const Vec2d move = WipeTower::move_box_inside_polygon(rigid ? pair : tower, bed, scaled(margin)).cast(); + pos += move; cfg.option("wipe_tower_x", true)->values = {pos.x()}; cfg.option("wipe_tower_y", true)->values = {pos.y()}; + return rigid ? move : Vec2d::Zero(); } -// Slice one centered cube that switches from filament 1 to filament 2 partway up, so exactly one +// Slice one cube that switches from filament 1 to filament 2 partway up, so exactly one // filament change fires, then export. The change drives the printer's own change_filament_gcode: on a // single-nozzle machine it rides the AMS prime tower (append_tcr), on a multi-nozzle machine it routes // through the nozzle swap (set_extruder / append_tcr2) - the engine picks the path from the printer's @@ -157,10 +168,10 @@ void place_wipe_tower(DynamicPrintConfig &cfg, const Vec2d ¢er) // Slic3r::PlaceholderParserError from export. std::string slice_two_color_cube_and_export(DynamicPrintConfig cfg, bool is_bbl) { - const Vec2d center = printable_area_center(cfg); - place_wipe_tower(cfg, center); + const Vec2d center = printable_area_center(cfg); + const Vec2d cube_min = center - Vec2d(5., 5.) + place_wipe_tower(cfg, center); TriangleMesh m = make_cube(10, 10, 10); - m.translate(float(center.x() - 5.), float(center.y() - 5.), 0.f); + m.translate(static_cast(cube_min.x()), static_cast(cube_min.y()), 0.f); Model model; Print print; diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp index c8a2c4984d..cdcd9b4dec 100644 --- a/src/libslic3r/AppConfig.cpp +++ b/src/libslic3r/AppConfig.cpp @@ -224,6 +224,12 @@ void AppConfig::set_defaults() set("preview_dim_previous_layers_brightness", std::to_string(std::max(0, std::min(brightness, 99)))); } + // ORCA: view type the G-code preview opens with. "auto" keeps the automatic choice (Filament for + // multi material prints, Line Type for single material ones), "last" restores the view type the user + // picked last, any other value is a fixed view type name, see GCodeViewer::view_type_to_config_name(). + if (get("preview_default_view_type").empty()) + set("preview_default_view_type", "auto"); + if (get("filaments_area_preferred_count").empty()) set("filaments_area_preferred_count", "10"); @@ -303,6 +309,9 @@ void AppConfig::set_defaults() if (get(SETTING_OPENGL_REALISTIC_PHONG).empty()) set_bool(SETTING_OPENGL_REALISTIC_PHONG, true); + if (get(SETTING_OPENGL_REALISTIC_PREVIEW).empty()) + set_bool(SETTING_OPENGL_REALISTIC_PREVIEW, false); + if (get(SETTING_OPENGL_SHADING_MODEL).empty()) set(SETTING_OPENGL_SHADING_MODEL, "gouraud"); diff --git a/src/libslic3r/AppConfig.hpp b/src/libslic3r/AppConfig.hpp index 24a4c2069b..2eac9f5fc6 100644 --- a/src/libslic3r/AppConfig.hpp +++ b/src/libslic3r/AppConfig.hpp @@ -42,6 +42,7 @@ using namespace nlohmann; #define SETTING_OPENGL_PHONG_BASIC_PLATE_SHADOWS "opengl_phong_basic_plate_shadows" #define SETTING_OPENGL_PHONG_SSAO "opengl_phong_ssao" #define SETTING_OPENGL_PHONG_SMOOTH_NORMALS "opengl_phong_smooth_normals" +#define SETTING_OPENGL_REALISTIC_PREVIEW "opengl_realistic_preview" #define SETTING_PLUGIN_PAGES_VISIBLE_COUNT "plugin_pages_visible_count" #define PLUGIN_PAGES_VISIBLE_COUNT_MIN 1 diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index ceab309be6..288e56f1d9 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -9,6 +9,7 @@ #include "IMEXHelpers.hpp" #include "GCode.hpp" #include "Exception.hpp" +#include "LifecycleEvents.hpp" #include "ExtrusionEntity.hpp" #include "EdgeGrid.hpp" #include "Geometry/ConvexHull.hpp" @@ -2449,6 +2450,15 @@ void GCode::do_export(Print* print, const char* path, GCodeProcessorResult* resu m_writer.set_is_bbl_machine(print->is_BBL_printer()); print->set_started(psGCodeExport); + { + LifecycleEventContext ctx; + ctx.name = std::to_string(print->model().id().id); + ctx.code = LifecycleEvtCode::Ok; + ctx.msg = path; + ctx.cancellation_check = [print]() { return print->canceled(); }; + fire_lifecycle_event(LifecycleEvent::GCodeExportStarted, ctx); + } + // check if any custom gcode contains keywords used by the gcode processor to // produce time estimation and gcode toolpaths std::vector> validation_res = DoExport::validate_custom_gcode(*print); @@ -2484,12 +2494,23 @@ void GCode::do_export(Print* print, const char* path, GCodeProcessorResult* resu m_processor.set_print(print); GCodeOutputStream file(boost::nowide::fopen(path_tmp.c_str(), "wb"), m_processor); if (! file.is_open()) { - BOOST_LOG_TRIVIAL(error) << std::string("G-code export to ") + path + " failed.\nCannot open the file for writing.\n" << std::endl; + std::string err_msg = std::string("G-code export to ") + path + " failed.\nCannot open the file for writing.\n"; + BOOST_LOG_TRIVIAL(error) << err_msg << std::endl; if (!fs::exists(folder)) { //fs::create_directory(folder); - BOOST_LOG_TRIVIAL(error) << "the parent path " + folder.string() +" is not there!!!" << std::endl; + std::string add_err_msg = "the parent path " + folder.string() +" is not there!!!"; + BOOST_LOG_TRIVIAL(error) << add_err_msg << std::endl; + err_msg += add_err_msg; } - throw Slic3r::RuntimeError(std::string("G-code export to ") + path + " failed.\nCannot open the file for writing.\n"); + { + LifecycleEventContext ctx; + ctx.name = std::to_string(print->model().id().id); + ctx.code = LifecycleEvtCode::Error; + ctx.msg = std::string(path) + "\n" + err_msg; + ctx.cancellation_check = [print]() { return print->canceled(); }; + fire_lifecycle_event(LifecycleEvent::GCodeExportFinished, ctx); + } + throw Slic3r::RuntimeError(err_msg); } try { @@ -2500,11 +2521,19 @@ void GCode::do_export(Print* print, const char* path, GCodeProcessorResult* resu boost::nowide::remove(path_tmp.c_str()); throw Slic3r::RuntimeError(std::string("G-code export to ") + path + " failed\nIs the disk full?\n"); } - } catch (std::exception & /* ex */) { + } catch (std::exception &ex) { // Rethrow on any exception. std::runtime_exception and CanceledException are expected to be thrown. // Close and remove the file. file.close(); boost::nowide::remove(path_tmp.c_str()); + { + LifecycleEventContext ctx; + ctx.name = std::to_string(print->model().id().id); + ctx.code = LifecycleEvtCode::Error; + ctx.msg = std::string(path) + "\n" + ex.what(); + ctx.cancellation_check = [print]() { return print->canceled(); }; + fire_lifecycle_event(LifecycleEvent::GCodeExportFinished, ctx); + } throw; } file.close(); @@ -2610,6 +2639,14 @@ void GCode::do_export(Print* print, const char* path, GCodeProcessorResult* resu std::error_code ret = rename_file(path_tmp, path); if (ret) { + { + LifecycleEventContext ctx; + ctx.name = std::to_string(print->model().id().id); + ctx.code = LifecycleEvtCode::Error; + ctx.msg = std::string(path) + "\nFailed to rename the output G-code file: " + ret.message(); + ctx.cancellation_check = [print]() { return print->canceled(); }; + fire_lifecycle_event(LifecycleEvent::GCodeExportFinished, ctx); + } throw Slic3r::RuntimeError( std::string("Failed to rename the output G-code file from ") + path_tmp + " to " + path + '\n' + "error code " + ret.message() + '\n' + "Is " + path_tmp + " locked?" + '\n'); @@ -2620,7 +2657,16 @@ void GCode::do_export(Print* print, const char* path, GCodeProcessorResult* resu BOOST_LOG_TRIVIAL(info) << "Exporting G-code finished" << log_memory_info(); print->set_done(psGCodeExport); - + + { + LifecycleEventContext ctx; + ctx.name = std::to_string(print->model().id().id); + ctx.code = LifecycleEvtCode::Ok; + ctx.msg = path; + ctx.cancellation_check = [print]() { return print->canceled(); }; + fire_lifecycle_event(LifecycleEvent::GCodeExportFinished, ctx); + } + // Orca: label_object_enabled reflects whether objects are labeled in the g-code (EXCLUDE_OBJECT / // M486), which is driven by exclude_object for every printer if(result != nullptr) diff --git a/src/libslic3r/LifecycleEvents.hpp b/src/libslic3r/LifecycleEvents.hpp new file mode 100644 index 0000000000..f3e6f32392 --- /dev/null +++ b/src/libslic3r/LifecycleEvents.hpp @@ -0,0 +1,249 @@ +#pragma once + +// LifecycleEvents.hpp +// -------------------- +// Application lifecycle events (project, slicing, plate editing, preset, printer connection, and +// job activity) that other subsystems -- chiefly the plugin layer above libslic3r -- may want to +// observe. Lives in libslic3r rather than the plugin layer because some events fire from inside +// the slicing engine itself; see fire_lifecycle_event() below. + +#include +#include +#include +#include +#include +#include + +namespace Slic3r +{ + enum class LifecycleEvent { + // Project (3mf) + NewProject, + ProjectOpened, + ProjectBeforeSave, + ProjectAfterSave, + ProjectClosed, + ProjectDirtyChanged, + + // Slicing pipeline + SliceStarted, + SliceGeometryFinished, + GCodeExportStarted, + GCodeExportFinished, + SlicingJobComplete, + + // Plate/model editing + ObjectAdded, + ObjectDeleted, + ObjectTransformed, + ObjectChanged, + ObjectRenamed, + PlateCreated, + PlateDeleted, + PlateSelected, + PlateRenamed, + + // Preset + PresetSelected, + PresetSaved, + + // Printer/device + PrintStateChanged, + DeviceOnline, + DeviceOffline, + DeviceDiscovered, + DeviceSelected, + UploadStarted, + UploadFinished, + + // Print/send jobs + PrintJobStarted, + PrintJobFinished, + SendJobStarted, + SendJobFinished, + }; + + // Scoped so callers must qualify (LifecycleEvtCode::Error, not ERROR) -- ERROR/OK collide with + // Windows macros (wingdi.h) as unqualified names. + enum class LifecycleEvtCode { Ok, Error, Warn }; + + struct LifecycleEventContext + { + // The primary subject identifier for the event. This is event-specific (for example, a + // project/output path, preset name, device id, or object name), must not contain status or + // prose, and may be empty when the event has no single subject. + std::string name; + + // Outcome of the operation represented by the event. For state-change and start events, + // Ok means that the event occurred; it does not imply that a future operation succeeded. + LifecycleEvtCode code = LifecycleEvtCode::Ok; + + // Optional human-readable detail or diagnostic text. It is not a stable parsing contract; + // machine-readable data should be represented by a dedicated field or event instead. + std::string msg; + + // Stable subject/object identifier, when the source model provides one. + std::string id; + + // Previous value for rename and other before/after events. + std::string previous_name; + + // Device identifier for printer and job events. + std::string device_id; + + // Job identifier when the originating queue/task provides one. + std::string job_id; + + // Source subsystem or operation detail, suitable for filtering but not guaranteed to be + // exhaustive across versions. + std::string source; + + // Plate, object, or volume index when the source uses an index rather than a stable id. + int index = -1; + + // Aggregate project dirty state for ProjectDirtyChanged. + bool dirty = false; + + // Optional host-side cancellation probe. Background slicing and G-code export events set + // this to the originating Print's cancellation state so dispatch can stop before calling + // the next capability. It is intentionally not exposed through the Python payload API. + std::function cancellation_check; + }; + + inline std::string lifecycle_event_to_string(LifecycleEvent event) + { + switch (event) { + case LifecycleEvent::NewProject: return "NewProject"; + case LifecycleEvent::ProjectOpened: return "ProjectOpened"; + case LifecycleEvent::ProjectBeforeSave: return "ProjectBeforeSave"; + case LifecycleEvent::ProjectAfterSave: return "ProjectAfterSave"; + case LifecycleEvent::ProjectClosed: return "ProjectClosed"; + case LifecycleEvent::ProjectDirtyChanged: return "ProjectDirtyChanged"; + + case LifecycleEvent::SliceStarted: return "SliceStarted"; + case LifecycleEvent::SliceGeometryFinished: return "SliceGeometryFinished"; + case LifecycleEvent::GCodeExportStarted: return "GCodeExportStarted"; + case LifecycleEvent::GCodeExportFinished: return "GCodeExportFinished"; + case LifecycleEvent::SlicingJobComplete: return "SlicingJobComplete"; + + case LifecycleEvent::ObjectAdded: return "ObjectAdded"; + case LifecycleEvent::ObjectDeleted: return "ObjectDeleted"; + case LifecycleEvent::ObjectTransformed: return "ObjectTransformed"; + case LifecycleEvent::ObjectChanged: return "ObjectChanged"; + case LifecycleEvent::ObjectRenamed: return "ObjectRenamed"; + case LifecycleEvent::PlateCreated: return "PlateCreated"; + case LifecycleEvent::PlateDeleted: return "PlateDeleted"; + case LifecycleEvent::PlateSelected: return "PlateSelected"; + case LifecycleEvent::PlateRenamed: return "PlateRenamed"; + + case LifecycleEvent::PresetSelected: return "PresetSelected"; + case LifecycleEvent::PresetSaved: return "PresetSaved"; + case LifecycleEvent::PrintStateChanged: return "PrintStateChanged"; + + case LifecycleEvent::DeviceOnline: return "DeviceOnline"; + case LifecycleEvent::DeviceOffline: return "DeviceOffline"; + case LifecycleEvent::DeviceDiscovered: return "DeviceDiscovered"; + case LifecycleEvent::DeviceSelected: return "DeviceSelected"; + + case LifecycleEvent::UploadStarted: return "UploadStarted"; + case LifecycleEvent::UploadFinished: return "UploadFinished"; + case LifecycleEvent::PrintJobStarted: return "PrintJobStarted"; + case LifecycleEvent::PrintJobFinished: return "PrintJobFinished"; + case LifecycleEvent::SendJobStarted: return "SendJobStarted"; + case LifecycleEvent::SendJobFinished: return "SendJobFinished"; + default: return "Unknown"; + } + } + + inline std::string lifecycle_evt_code_to_string(LifecycleEvtCode code) + { + switch (code) { + case LifecycleEvtCode::Ok: return "Ok"; + case LifecycleEvtCode::Error: return "Error"; + case LifecycleEvtCode::Warn: return "Warn"; + default: return "Unknown"; + } + } + + // Global cross-layer seam (mirrors ConfigBase::set_resolve_capability_fn): any libslic3r code can + // fire a lifecycle event without depending on the plugin layer above it, which installs the + // dispatcher here at startup. Not tied to Print/GCode specifically, since nothing here should + // require callers to hold a Print& just to report an event. + using LifecycleHookFn = std::function; + + namespace detail { + + struct LifecycleHookState + { + std::mutex mutex; + std::condition_variable cv; + LifecycleHookFn fn; + std::size_t active_dispatches = 0; + bool accepting = false; + }; + + inline LifecycleHookState& lifecycle_hook_state() + { + static LifecycleHookState state; + return state; + } + + class LifecycleDispatchGuard + { + public: + explicit LifecycleDispatchGuard(LifecycleHookState& state) : m_state(state) {} + + ~LifecycleDispatchGuard() + { + std::lock_guard lock(m_state.mutex); + --m_state.active_dispatches; + if (m_state.active_dispatches == 0) + m_state.cv.notify_all(); + } + + LifecycleDispatchGuard(const LifecycleDispatchGuard&) = delete; + LifecycleDispatchGuard& operator=(const LifecycleDispatchGuard&) = delete; + + private: + LifecycleHookState& m_state; + }; + + } // namespace detail + + // Installing a hook starts accepting dispatches. Passing an empty function stops accepting + // new dispatches, detaches the hook, and waits for callbacks already in progress to finish. + // This is used during plugin shutdown so plugin code cannot be unloaded while a lifecycle + // callback is still executing. The empty-function path must not be called from inside the + // lifecycle callback itself. + inline void set_lifecycle_hook_fn(LifecycleHookFn fn) + { + detail::LifecycleHookState& state = detail::lifecycle_hook_state(); + if (fn) { + std::lock_guard lock(state.mutex); + state.fn = std::move(fn); + state.accepting = true; + return; + } + + std::unique_lock lock(state.mutex); + state.accepting = false; + state.fn = nullptr; + state.cv.wait(lock, [&state] { return state.active_dispatches == 0; }); + } + + inline void fire_lifecycle_event(LifecycleEvent event, const LifecycleEventContext& ctx) + { + detail::LifecycleHookState& state = detail::lifecycle_hook_state(); + LifecycleHookFn fn; + { + std::lock_guard lock(state.mutex); + if (!state.accepting || !state.fn) + return; + fn = state.fn; + ++state.active_dispatches; + } + + detail::LifecycleDispatchGuard guard(state); + fn(event, ctx); + } +} diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp index c0cead196d..fafe63416b 100644 --- a/src/libslic3r/Preset.cpp +++ b/src/libslic3r/Preset.cpp @@ -47,6 +47,7 @@ #include #include "libslic3r.h" +#include "LifecycleEvents.hpp" #include "Utils.hpp" #include "Time.hpp" #include "PlaceholderParser.hpp" @@ -2980,6 +2981,7 @@ void PresetCollection::save_current_preset(const std::string &new_name, bool det // 1) Find the preset with a new_name or create a new one, // initialize it with the edited config. auto it = this->find_preset_internal(new_name); + const bool preset_existed = (it != m_presets.end() && it->name == new_name); if (it != m_presets.end() && it->name == new_name) { // Preset with the same name found. Preset &preset = *it; @@ -3087,6 +3089,14 @@ void PresetCollection::save_current_preset(const std::string &new_name, bool det this->get_selected_preset().save(&(parent_preset->config)); else this->get_selected_preset().save(nullptr); + + { + LifecycleEventContext ctx; + ctx.name = new_name; + ctx.msg = preset_existed ? "overwrite" : "new"; + ctx.code = LifecycleEvtCode::Ok; + fire_lifecycle_event(LifecycleEvent::PresetSaved, ctx); + } } // A detached standalone preset for the Full Publish receiver: create a user preset holding diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp index 864c31b7f3..d37a4548cd 100644 --- a/src/libslic3r/Print.cpp +++ b/src/libslic3r/Print.cpp @@ -16,6 +16,7 @@ #include "Flow.hpp" #include "Geometry/ConvexHull.hpp" #include "I18N.hpp" +#include "LifecycleEvents.hpp" #include "ShortestPath.hpp" #include "Thread.hpp" #include "Time.hpp" @@ -2829,6 +2830,14 @@ void Print::process(long long *time_cost_with_cache, bool use_cache) if (m_objects.empty()) return; + { + LifecycleEventContext ctx; + ctx.name = std::to_string(m_model.id().id); + ctx.code = LifecycleEvtCode::Ok; + ctx.cancellation_check = [this]() { return canceled(); }; + fire_lifecycle_event(LifecycleEvent::SliceStarted, ctx); + } + for (PrintObject *obj : m_objects) obj->clear_shared_object(); @@ -3447,6 +3456,14 @@ void Print::process(long long *time_cost_with_cache, bool use_cache) } BOOST_LOG_TRIVIAL(info) << "Slicing process finished." << log_memory_info(); + + { + LifecycleEventContext ctx; + ctx.name = std::to_string(m_model.id().id); + ctx.code = LifecycleEvtCode::Ok; + ctx.cancellation_check = [this]() { return canceled(); }; + fire_lifecycle_event(LifecycleEvent::SliceGeometryFinished, ctx); + } } // G-code export process, running at a background thread. @@ -5101,6 +5118,15 @@ void Print::set_gcode_file_invalidated() //BBS: add gcode file preload logic void Print::export_gcode_from_previous_file(const std::string& file, GCodeProcessorResult* result, ThumbnailsGeneratorCallback thumbnail_cb) { + { + LifecycleEventContext ctx; + ctx.name = std::to_string(m_model.id().id); + ctx.code = LifecycleEvtCode::Ok; + ctx.msg = file; + ctx.cancellation_check = [this]() { return canceled(); }; + fire_lifecycle_event(LifecycleEvent::GCodeExportStarted, ctx); + } + try { GCodeProcessor processor; GCodeProcessor::s_IsBBLPrinter = is_BBL_printer(); @@ -5120,13 +5146,30 @@ void Print::export_gcode_from_previous_file(const std::string& file, GCodeProces *result = std::move(processor.extract_result()); result->filament_change_sequence = filament_seq_loaded; result->nozzle_change_sequence = nozzle_seq_loaded; - } catch (std::exception & /* ex */) { + } catch (std::exception &ex) { BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(": found errors when process gcode file %1%") %file.c_str(); + { + LifecycleEventContext ctx; + ctx.name = std::to_string(m_model.id().id); + ctx.code = LifecycleEvtCode::Error; + ctx.msg = file + "\n" + ex.what(); + ctx.cancellation_check = [this]() { return canceled(); }; + fire_lifecycle_event(LifecycleEvent::GCodeExportFinished, ctx); + } throw Slic3r::RuntimeError( std::string("Failed to process the G-code file ") + file + " from previous 3mf\n"); } BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": process the G-code file %1% successfully")%file.c_str(); + + { + LifecycleEventContext ctx; + ctx.name = std::to_string(m_model.id().id); + ctx.code = LifecycleEvtCode::Ok; + ctx.msg = file; + ctx.cancellation_check = [this]() { return canceled(); }; + fire_lifecycle_event(LifecycleEvent::GCodeExportFinished, ctx); + } } std::tuple Print::object_skirt_offset(double margin_height) const diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 6b3d2cae5f..eac2b43cbf 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -12517,6 +12517,12 @@ CLIMiscConfigDef::CLIMiscConfigDef() def->tooltip = L("If enabled, Arrange will allow rotation when placing objects."); def->set_default_value(new ConfigOptionBool(true)); + def = this->add("align_to_y_axis", coBool); + def->label = L("Align to Y axis when arranging"); + def->tooltip = L("If enabled, Arrange will turn each object so its long side runs along the Y axis before placing it. " + "When not given, it is on for i3 printers and off for the others, as in the GUI."); + def->set_default_value(new ConfigOptionBool(false)); + def = this->add("avoid_extrusion_cali_region", coBool); def->label = L("Avoid extrusion calibrate region when arranging"); def->tooltip = L("If enabled, Arrange will avoid extrusion calibrate region when placing objects."); diff --git a/src/libvgcode/include/Viewer.hpp b/src/libvgcode/include/Viewer.hpp index 5141245d96..179105032d 100644 --- a/src/libvgcode/include/Viewer.hpp +++ b/src/libvgcode/include/Viewer.hpp @@ -60,6 +60,22 @@ public: // using the given camera matrices. // void render(const Mat4x4& view_matrix, const Mat4x4& projection_matrix); + // + // ORCA: realistic view. Render the toolpaths as seen from the light, to fill the caller's + // shadow map. Depth only - the caller masks colour writes and owns the framebuffer. + // + void render_shadow_casters(const Mat4x4& view_matrix, const Mat4x4& projection_matrix, const Vec3& light_position); + // + // ORCA: realistic view. The shadow map the toolpaths sample, in the given texture unit. + // intensity == 0, the default, turns the lookup off and restores the plain shading. + // + void set_shadow_map(int texture_unit, const Mat4x4& light_view_projection, float intensity, float texel_size); + // + // ORCA: tone applied to the shaded toolpaths, to pay back the light the lighting term, + // the shadow and the SSAO pass each take off. 1.0/1.0, the default, is a no-op; the + // caller decides which of the two it varies with the realistic view setting. + // + void set_tone(float exposure, float saturation); // // ************************************************************************ diff --git a/src/libvgcode/src/SegmentTemplate.cpp b/src/libvgcode/src/SegmentTemplate.cpp index 4e692d5b10..9d9872aa3b 100644 --- a/src/libvgcode/src/SegmentTemplate.cpp +++ b/src/libvgcode/src/SegmentTemplate.cpp @@ -15,7 +15,12 @@ namespace libvgcode { //| 2--0-------5--7 | //| \ | | / | //| 3-------4 | -static constexpr const std::array VERTEX_DATA = { +// The eight corners the vertex shader knows how to place. Each is sent once and +// referenced by INDEX_DATA below, so the post-transform cache can reuse it across +// the triangles that share it: the shader runs 8 times per segment instead of 24. +static constexpr const std::array VERTEX_DATA = { 0, 1, 2, 3, 4, 5, 6, 7 }; + +static constexpr const std::array INDEX_DATA = { 0, 1, 2, // front spike 0, 2, 3, // front spike 0, 3, 4, // right/bottom body @@ -31,7 +36,7 @@ void SegmentTemplate::init() if (m_vao_id != 0) return; - m_size_in_bytes_gpu += VERTEX_DATA.size() * sizeof(uint8_t); + m_size_in_bytes_gpu += (VERTEX_DATA.size() + INDEX_DATA.size()) * sizeof(uint8_t); int curr_vertex_array; glsafe(glGetIntegerv(GL_VERTEX_ARRAY_BINDING, &curr_vertex_array)); @@ -51,12 +56,22 @@ void SegmentTemplate::init() glsafe(glVertexAttribIPointer(0, 1, GL_UNSIGNED_BYTE, 0, (const void*)0)); #endif // ENABLE_OPENGL_ES + // The element buffer binding is part of the vao state, so it is left bound here + // and restored together with the vao. + glsafe(glGenBuffers(1, &m_ibo_id)); + glsafe(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_ibo_id)); + glsafe(glBufferData(GL_ELEMENT_ARRAY_BUFFER, INDEX_DATA.size() * sizeof(uint8_t), INDEX_DATA.data(), GL_STATIC_DRAW)); + glsafe(glBindBuffer(GL_ARRAY_BUFFER, curr_array_buffer)); glsafe(glBindVertexArray(curr_vertex_array)); } void SegmentTemplate::shutdown() { + if (m_ibo_id != 0) { + glsafe(glDeleteBuffers(1, &m_ibo_id)); + m_ibo_id = 0; + } if (m_vbo_id != 0) { glsafe(glDeleteBuffers(1, &m_vbo_id)); m_vbo_id = 0; @@ -71,14 +86,15 @@ void SegmentTemplate::shutdown() void SegmentTemplate::render(size_t count) { - if (m_vao_id == 0 || m_vbo_id == 0 || count == 0) + if (m_vao_id == 0 || m_vbo_id == 0 || m_ibo_id == 0 || count == 0) return; int curr_vertex_array; glsafe(glGetIntegerv(GL_VERTEX_ARRAY_BINDING, &curr_vertex_array)); glsafe(glBindVertexArray(m_vao_id)); - glsafe(glDrawArraysInstanced(GL_TRIANGLES, 0, static_cast(VERTEX_DATA.size()), static_cast(count))); + glsafe(glDrawElementsInstanced(GL_TRIANGLES, static_cast(INDEX_DATA.size()), GL_UNSIGNED_BYTE, + nullptr, static_cast(count))); glsafe(glBindVertexArray(curr_vertex_array)); } diff --git a/src/libvgcode/src/SegmentTemplate.hpp b/src/libvgcode/src/SegmentTemplate.hpp index f104eef5d2..117ed2b678 100644 --- a/src/libvgcode/src/SegmentTemplate.hpp +++ b/src/libvgcode/src/SegmentTemplate.hpp @@ -40,6 +40,7 @@ private: // unsigned int m_vao_id{ 0 }; unsigned int m_vbo_id{ 0 }; + unsigned int m_ibo_id{ 0 }; // // Size of the data sent to gpu, in bytes. // diff --git a/src/libvgcode/src/Shaders.hpp b/src/libvgcode/src/Shaders.hpp index 1450d1a6df..596b42df5c 100644 --- a/src/libvgcode/src/Shaders.hpp +++ b/src/libvgcode/src/Shaders.hpp @@ -16,7 +16,8 @@ static const char* Segments_Vertex_Shader = "#define FIX_TWISTING\n" "const vec3 light_top_dir = vec3(-0.4574957, 0.4574957, 0.7624929);\n" "const float light_top_diffuse = 0.6 * 0.8;\n" -"const float light_top_specular = 0.6 * 0.125;\n" +// ORCA: the specular was 0.6 * 0.125, too faint to give the filament any sheen. +"const float light_top_specular = 0.6 * 0.25;\n" "const float light_top_shininess = 20.0;\n" "const vec3 light_front_dir = vec3(0.6985074, 0.1397015, 0.6985074);\n" "const float light_front_diffuse = 0.6 * 0.2;\n" @@ -30,8 +31,19 @@ static const char* Segments_Vertex_Shader = "uniform samplerBuffer height_width_angle_tex;\n" "uniform samplerBuffer color_tex;\n" "uniform usamplerBuffer segment_index_tex;\n" +// ORCA: 0 during the shadow caster pass - the bias below shifts eye_position but not +// world_position, so the caster would write a depth the receiver never looks up. +"uniform float bias_scale;\n" "in int vertex_id;\n" "out vec3 color;\n" +"// ORCA: realistic view - the light the shadow map is able to block, kept apart from the\n" +"// ambient and emissive terms in color, which a shadow does not occlude. Their sum is the\n" +"// single lighting term this replaces, so shading is unchanged while shadows are off.\n" +"out vec3 color_direct;\n" +"// ORCA: realistic view - the fragment shader looks the fragment up in the shadow map, which\n" +"// needs its world position and, for the depth bias, its eye space normal.\n" +"out vec3 world_position;\n" +"out vec3 shadow_normal;\n" "vec3 decode_color(float color) {\n" " int c = int(round(color));\n" " int r = (c >> 16) & 0xFF;\n" @@ -40,11 +52,11 @@ static const char* Segments_Vertex_Shader = " float f = 1.0 / 255.0f;\n" " return f * vec3(r, g, b);\n" "}\n" -"float lighting(vec3 eye_position, vec3 eye_normal) {\n" +"float direct_lighting(vec3 eye_position, vec3 eye_normal) {\n" " float top_diffuse = light_top_diffuse * max(dot(eye_normal, light_top_dir), 0.0);\n" " float front_diffuse = light_front_diffuse * max(dot(eye_normal, light_front_dir), 0.0);\n" " float top_specular = light_top_specular * pow(max(dot(-normalize(eye_position), reflect(-light_top_dir, eye_normal)), 0.0), light_top_shininess);\n" -" return ambient + top_diffuse + front_diffuse + top_specular + emission;\n" +" return top_diffuse + front_diffuse + top_specular;\n" "}\n" "void main() {\n" " int id_a = int(texelFetch(segment_index_tex, gl_InstanceID).r);\n" @@ -135,19 +147,63 @@ static const char* Segments_Vertex_Shader = " }\n" " vec3 eye_position = (view_matrix * vec4(pos, 1.0)).xyz;\n" " // ORCA: Apply bias to z-position to avoid z-fighting\n" -" eye_position.z += bias;\n" +" eye_position.z += bias * bias_scale;\n" " vec3 eye_normal = (view_matrix * vec4(normalize(pos - endpoint_pos), 0.0)).xyz;\n" " vec3 color_base = decode_color(texelFetch(color_tex, id).r);\n" -" color = color_base * lighting(eye_position, eye_normal);\n" +" color = color_base * (ambient + emission);\n" +" color_direct = color_base * direct_lighting(eye_position, eye_normal);\n" +" world_position = pos;\n" +" shadow_normal = eye_normal;\n" " gl_Position = projection_matrix * vec4(eye_position, 1.0);\n" "}\n"; static const char* Segments_Fragment_Shader = "#version 150\n" +"// ORCA: realistic view - object-on-object and self shadows, read from the same depth map the\n" +"// rest of the 3D scene samples. shadow_intensity == 0, the default, short-circuits the lookup,\n" +"// so the toolpaths shade exactly as before whenever realistic view is off.\n" +"const vec3 SHADOW_LIGHT_DIR = vec3(-0.4574957, 0.4574957, 0.7624929);\n" +"uniform sampler2D shadow_map;\n" +"uniform mat4 shadow_light_vp;\n" +"uniform float shadow_intensity;\n" +"uniform float shadow_map_texel;\n" +// ORCA: the lighting term peaks near 0.9 and every later multiplier - the shadow, then the SSAO +// post pass - only takes more light away, so the print reads dimmer and duller than the legend +// colours. These pay that back. Both are 1.0 for an untouched image; what the caller actually +// passes in each mode is decided in GLCanvas3D::_render_gcode, not here. +"uniform float exposure;\n" +"uniform float saturation;\n" +"const vec3 LUMA = vec3(0.2126, 0.7152, 0.0722);\n" "in vec3 color;\n" +"in vec3 color_direct;\n" +"in vec3 world_position;\n" +"in vec3 shadow_normal;\n" "out vec4 fragment_color;\n" +"float shadow_shade() {\n" +" if (shadow_intensity <= 0.0)\n" +" return 1.0;\n" +" vec4 lp = shadow_light_vp * vec4(world_position, 1.0);\n" +" vec3 proj = lp.xyz / lp.w;\n" +" proj = proj * 0.5 + 0.5;\n" +" if (proj.z > 1.0)\n" +" return 1.0;\n" +" // Slope-scaled bias, as in gouraud.fs. An extrusion is only a handful of shadow-map texels\n" +" // wide, so grazing faces need the larger bias to keep self-shadow acne off the top surfaces.\n" +" float NdotL = dot(normalize(shadow_normal), SHADOW_LIGHT_DIR);\n" +" float bias = mix(0.0004, 0.004, clamp(1.0 - NdotL, 0.0, 1.0));\n" +" float sum = 0.0;\n" +" for (int x = -2; x <= 2; ++x) {\n" +" for (int y = -2; y <= 2; ++y) {\n" +" float closest = texture(shadow_map, proj.xy + vec2(float(x), float(y)) * shadow_map_texel).r;\n" +" sum += (proj.z - bias > closest) ? 1.0 : 0.0;\n" +" }\n" +" }\n" +" return 1.0 - shadow_intensity * (sum / 25.0);\n" +"}\n" "void main() {\n" -" fragment_color = vec4(color, 1.0);\n" +" vec3 c = (color + color_direct * shadow_shade()) * exposure;\n" +" c = mix(vec3(dot(c, LUMA)), c, saturation);\n" +" fragment_color = vec4(clamp(c, 0.0, 1.0), 1.0);\n" "}\n"; static const char* Options_Vertex_Shader = diff --git a/src/libvgcode/src/ShadersES.hpp b/src/libvgcode/src/ShadersES.hpp index e688fa7b4c..4194b836e3 100644 --- a/src/libvgcode/src/ShadersES.hpp +++ b/src/libvgcode/src/ShadersES.hpp @@ -17,7 +17,8 @@ static const char* Segments_Vertex_Shader_ES = "#define FIX_TWISTING\n" "const vec3 light_top_dir = vec3(-0.4574957, 0.4574957, 0.7624929);\n" "const float light_top_diffuse = 0.6 * 0.8;\n" -"const float light_top_specular = 0.6 * 0.125;\n" +// ORCA: the specular was 0.6 * 0.125, too faint to give the filament any sheen. +"const float light_top_specular = 0.6 * 0.25;\n" "const float light_top_shininess = 20.0;\n" "const vec3 light_front_dir = vec3(0.6985074, 0.1397015, 0.6985074);\n" "const float light_front_diffuse = 0.6 * 0.3;\n" @@ -33,6 +34,14 @@ static const char* Segments_Vertex_Shader_ES = "uniform usampler2D segment_index_tex;\n" "in float vertex_id_float;\n" "out vec3 color;\n" +"// ORCA: realistic view - the light the shadow map is able to block, kept apart from the\n" +"// ambient and emissive terms in color, which a shadow does not occlude. Their sum is the\n" +"// single lighting term this replaces, so shading is unchanged while shadows are off.\n" +"out vec3 color_direct;\n" +"// ORCA: realistic view - the fragment shader looks the fragment up in the shadow map, which\n" +"// needs its world position and, for the depth bias, its eye space normal.\n" +"out vec3 world_position;\n" +"out vec3 shadow_normal;\n" "vec3 decode_color(float color) {\n" " int c = int(round(color));\n" " int r = (c >> 16) & 0xFF;\n" @@ -41,11 +50,11 @@ static const char* Segments_Vertex_Shader_ES = " float f = 1.0 / 255.0f;\n" " return f * vec3(r, g, b);\n" "}\n" -"float lighting(vec3 eye_position, vec3 eye_normal) {\n" +"float direct_lighting(vec3 eye_position, vec3 eye_normal) {\n" " float top_diffuse = light_top_diffuse * max(dot(eye_normal, light_top_dir), 0.0);\n" " float front_diffuse = light_front_diffuse * max(dot(eye_normal, light_front_dir), 0.0);\n" " float top_specular = light_top_specular * pow(max(dot(-normalize(eye_position), reflect(-light_top_dir, eye_normal)), 0.0), light_top_shininess);\n" -" return ambient + top_diffuse + front_diffuse + top_specular + emission;\n" +" return top_diffuse + front_diffuse + top_specular;\n" "}\n" "ivec2 tex_coord(sampler2D sampler, int id) {\n" " ivec2 tex_size = textureSize(sampler, 0);\n" @@ -143,17 +152,64 @@ static const char* Segments_Vertex_Shader_ES = " vec3 eye_position = (view_matrix * vec4(pos, 1.0)).xyz;\n" " vec3 eye_normal = (view_matrix * vec4(normalize(pos - endpoint_pos), 0.0)).xyz;\n" " vec3 color_base = decode_color(texelFetch(color_tex, tex_coord(color_tex, id), 0).r);\n" -" color = color_base * lighting(eye_position, eye_normal);\n" +" color = color_base * (ambient + emission);\n" +" color_direct = color_base * direct_lighting(eye_position, eye_normal);\n" +" world_position = pos;\n" +" shadow_normal = eye_normal;\n" " gl_Position = projection_matrix * vec4(eye_position, 1.0);\n" "}\n"; static const char* Segments_Fragment_Shader_ES = "#version 300 es\n" "precision highp float;\n" +"// ORCA: sampler2D defaults to lowp in an ES fragment shader, far too coarse to compare\n" +"// shadow map depths against.\n" +"precision highp sampler2D;\n" +"// ORCA: realistic view - object-on-object and self shadows, read from the same depth map the\n" +"// rest of the 3D scene samples. shadow_intensity == 0, the default, short-circuits the lookup,\n" +"// so the toolpaths shade exactly as before whenever realistic view is off.\n" +"const vec3 SHADOW_LIGHT_DIR = vec3(-0.4574957, 0.4574957, 0.7624929);\n" +"uniform sampler2D shadow_map;\n" +"uniform mat4 shadow_light_vp;\n" +"uniform float shadow_intensity;\n" +"uniform float shadow_map_texel;\n" +// ORCA: the lighting term peaks near 0.9 and every later multiplier - the shadow, then the SSAO +// post pass - only takes more light away, so the print reads dimmer and duller than the legend +// colours. These pay that back. Both are 1.0 for an untouched image; what the caller actually +// passes in each mode is decided in GLCanvas3D::_render_gcode, not here. +"uniform float exposure;\n" +"uniform float saturation;\n" +"const vec3 LUMA = vec3(0.2126, 0.7152, 0.0722);\n" "in vec3 color;\n" +"in vec3 color_direct;\n" +"in vec3 world_position;\n" +"in vec3 shadow_normal;\n" "out vec4 fragment_color;\n" +"float shadow_shade() {\n" +" if (shadow_intensity <= 0.0)\n" +" return 1.0;\n" +" vec4 lp = shadow_light_vp * vec4(world_position, 1.0);\n" +" vec3 proj = lp.xyz / lp.w;\n" +" proj = proj * 0.5 + 0.5;\n" +" if (proj.z > 1.0)\n" +" return 1.0;\n" +" // Slope-scaled bias, as in gouraud.fs. An extrusion is only a handful of shadow-map texels\n" +" // wide, so grazing faces need the larger bias to keep self-shadow acne off the top surfaces.\n" +" float NdotL = dot(normalize(shadow_normal), SHADOW_LIGHT_DIR);\n" +" float bias = mix(0.0004, 0.004, clamp(1.0 - NdotL, 0.0, 1.0));\n" +" float sum = 0.0;\n" +" for (int x = -2; x <= 2; ++x) {\n" +" for (int y = -2; y <= 2; ++y) {\n" +" float closest = texture(shadow_map, proj.xy + vec2(float(x), float(y)) * shadow_map_texel).r;\n" +" sum += (proj.z - bias > closest) ? 1.0 : 0.0;\n" +" }\n" +" }\n" +" return 1.0 - shadow_intensity * (sum / 25.0);\n" +"}\n" "void main() {\n" -" fragment_color = vec4(color, 1.0);\n" +" vec3 c = (color + color_direct * shadow_shade()) * exposure;\n" +" c = mix(vec3(dot(c, LUMA)), c, saturation);\n" +" fragment_color = vec4(clamp(c, 0.0, 1.0), 1.0);\n" "}\n"; static const char* Options_Vertex_Shader_ES = diff --git a/src/libvgcode/src/Viewer.cpp b/src/libvgcode/src/Viewer.cpp index eb606598e9..61d7310508 100644 --- a/src/libvgcode/src/Viewer.cpp +++ b/src/libvgcode/src/Viewer.cpp @@ -42,6 +42,21 @@ void Viewer::render(const Mat4x4& view_matrix, const Mat4x4& projection_matrix) m_impl->render(view_matrix, projection_matrix); } +void Viewer::render_shadow_casters(const Mat4x4& view_matrix, const Mat4x4& projection_matrix, const Vec3& light_position) +{ + m_impl->render_shadow_casters(view_matrix, projection_matrix, light_position); +} + +void Viewer::set_shadow_map(int texture_unit, const Mat4x4& light_view_projection, float intensity, float texel_size) +{ + m_impl->set_shadow_map(texture_unit, light_view_projection, intensity, texel_size); +} + +void Viewer::set_tone(float exposure, float saturation) +{ + m_impl->set_tone(exposure, saturation); +} + EViewType Viewer::get_view_type() const { return m_impl->get_view_type(); diff --git a/src/libvgcode/src/ViewerImpl.cpp b/src/libvgcode/src/ViewerImpl.cpp index da1a601149..b1a7550b42 100644 --- a/src/libvgcode/src/ViewerImpl.cpp +++ b/src/libvgcode/src/ViewerImpl.cpp @@ -763,6 +763,14 @@ void ViewerImpl::init(const std::string& opengl_context_version) m_uni_segments_height_width_angle_tex_id = glGetUniformLocation(m_segments_shader_id, "height_width_angle_tex"); m_uni_segments_colors_tex_id = glGetUniformLocation(m_segments_shader_id, "color_tex"); m_uni_segments_segment_index_tex_id = glGetUniformLocation(m_segments_shader_id, "segment_index_tex"); + // ORCA: realistic view + m_uni_segments_shadow_map_id = glGetUniformLocation(m_segments_shader_id, "shadow_map"); + m_uni_segments_shadow_light_vp_id = glGetUniformLocation(m_segments_shader_id, "shadow_light_vp"); + m_uni_segments_shadow_intensity_id = glGetUniformLocation(m_segments_shader_id, "shadow_intensity"); + m_uni_segments_shadow_map_texel_id = glGetUniformLocation(m_segments_shader_id, "shadow_map_texel"); + m_uni_segments_exposure_id = glGetUniformLocation(m_segments_shader_id, "exposure"); + m_uni_segments_saturation_id = glGetUniformLocation(m_segments_shader_id, "saturation"); + m_uni_segments_bias_scale_id = glGetUniformLocation(m_segments_shader_id, "bias_scale"); glcheck(); assert(m_uni_segments_view_matrix_id != -1 && m_uni_segments_projection_matrix_id != -1 && @@ -875,6 +883,12 @@ void ViewerImpl::reset() m_travels_time = { 0.0f, 0.0f }; m_vertices.clear(); m_vertices_colors.clear(); + // swap rather than clear: these are sized by the print, and a reset means the memory + // should go back, not sit reserved until the next load + for (std::vector& times : m_layer_start_times) + std::vector().swap(times); + std::vector().swap(m_layer_first_vertex); + std::vector().swap(m_colors_scratch); m_valid_lines_bitset.clear(); #if VGCODE_ENABLE_COG_AND_TOOL_MARKERS m_cog_marker.reset(); @@ -1048,6 +1062,37 @@ void ViewerImpl::load(GCodeInputData&& gcode_data) v.layer_duration = m_layers.get_layer_time(m_settings.time_mode, static_cast(v.layer_id)); } + // Index of the first vertex of each layer, walked back to front so that a layer with no + // vertex of its own inherits the next layer's index and the array stays non-decreasing. + if (!m_layers.empty()) { + const uint32_t vertices_count = static_cast(m_vertices.size()); + m_layer_first_vertex.assign(m_layers.count(), vertices_count); + for (uint32_t i = vertices_count; i > 0; --i) { + const uint32_t layer_id = m_vertices[i - 1].layer_id; + if (layer_id < m_layer_first_vertex.size()) + m_layer_first_vertex[layer_id] = i - 1; + } + for (size_t i = m_layer_first_vertex.size() - 1; i > 0; --i) + m_layer_first_vertex[i - 1] = std::min(m_layer_first_vertex[i - 1], m_layer_first_vertex[i]); + + // the running time at each layer's first vertex, summed in vertex order so that + // get_estimated_time_at() matches a full accumulation exactly + std::array running{}; + for (std::vector& times : m_layer_start_times) + times.assign(m_layer_first_vertex.size(), 0.0f); + size_t layer = 0; + for (size_t i = 0; i <= m_vertices.size(); ++i) { + for (; layer < m_layer_first_vertex.size() && m_layer_first_vertex[layer] == i; ++layer) { + for (size_t j = 0; j < TIME_MODES_COUNT; ++j) + m_layer_start_times[j][layer] = running[j]; + } + if (i < m_vertices.size()) { + for (size_t j = 0; j < TIME_MODES_COUNT; ++j) + running[j] += m_vertices[i].times[j]; + } + } + } + if (!m_layers.empty()) m_layers.set_view_range(0, static_cast(m_layers.count()) - 1); @@ -1261,7 +1306,10 @@ void ViewerImpl::update_colors_texture() // Based on current settings and slider position, we might want to render some // vertices as dark grey (or darkened, see above). Use either that or the normal color (from the cache). - std::vector colors(m_vertices_colors.size()); + // Reused across calls: this runs on every slider tick, and the allocation alone is + // 4 bytes per vertex of the whole print each time. + std::vector& colors = m_colors_scratch; + colors.resize(m_vertices_colors.size()); assert(colors.size() == m_vertices.size() && m_vertices_colors.size() == m_vertices.size()); for (size_t i=0; i(m_settings.time_mode)]; }); + const size_t mode = static_cast(m_settings.time_mode); + if (mode >= TIME_MODES_COUNT || id >= m_vertices.size()) + return 0.0f; + size_t first = 0; + float time = 0.0f; + const size_t layer = static_cast(m_vertices[id].layer_id); + if (layer < m_layer_first_vertex.size() && m_layer_first_vertex[layer] <= id) { + first = m_layer_first_vertex[layer]; + time = m_layer_start_times[mode][layer]; + } + for (size_t i = first; i <= id; ++i) + time += m_vertices[i].times[mode]; + return time; } Color ViewerImpl::get_vertex_color(const PathVertex& v) const @@ -1722,6 +1810,10 @@ size_t ViewerImpl::get_used_cpu_memory() const ret += sizeof(m_extrusion_roles_colors); ret += sizeof(m_options_colors); ret += STDVEC_MEMSIZE(m_vertices, PathVertex); + for (const std::vector& times : m_layer_start_times) + ret += STDVEC_MEMSIZE(times, float); + ret += STDVEC_MEMSIZE(m_layer_first_vertex, uint32_t); + ret += STDVEC_MEMSIZE(m_colors_scratch, float); ret += m_valid_lines_bitset.size_in_bytes_cpu(); ret += m_height_range.size_in_bytes_cpu(); ret += m_width_range.size_in_bytes_cpu(); @@ -1787,7 +1879,11 @@ void ViewerImpl::update_view_full_range() const bool travels_visible = m_settings.options_visibility[size_t(EOptionType::Travels)]; const bool wipes_visible = m_settings.options_visibility[size_t(EOptionType::Wipes)]; + // every vertex before m_layer_first_vertex[layers_range[0]] has a smaller layer_id, so the loop + // below would skip all of them anyway auto first_it = m_vertices.begin(); + if (layers_range[0] < m_layer_first_vertex.size()) + first_it += m_layer_first_vertex[layers_range[0]]; while (first_it != m_vertices.end() && (first_it->layer_id < layers_range[0] || !is_visible(*first_it, m_settings))) { ++first_it; @@ -1994,6 +2090,15 @@ void ViewerImpl::render_segments(const Mat4x4& view_matrix, const Mat4x4& projec glsafe(glUniformMatrix4fv(m_uni_segments_view_matrix_id, 1, GL_FALSE, view_matrix.data())); glsafe(glUniformMatrix4fv(m_uni_segments_projection_matrix_id, 1, GL_FALSE, projection_matrix.data())); glsafe(glUniform3fv(m_uni_segments_camera_position_id, 1, camera_position.data())); + // ORCA: realistic view. The depth pass writes the map it would otherwise read, so it shades + // with the lookup off. + glsafe(glUniform1i(m_uni_segments_shadow_map_id, m_shadow_map_texture_unit)); + glsafe(glUniformMatrix4fv(m_uni_segments_shadow_light_vp_id, 1, GL_FALSE, m_shadow_light_vp.data())); + glsafe(glUniform1f(m_uni_segments_shadow_intensity_id, m_rendering_shadow_casters ? 0.0f : m_shadow_intensity)); + glsafe(glUniform1f(m_uni_segments_shadow_map_texel_id, m_shadow_map_texel)); + glsafe(glUniform1f(m_uni_segments_exposure_id, m_exposure)); + glsafe(glUniform1f(m_uni_segments_saturation_id, m_saturation)); + glsafe(glUniform1f(m_uni_segments_bias_scale_id, m_rendering_shadow_casters ? 0.0f : 1.0f)); glsafe(glDisable(GL_CULL_FACE)); diff --git a/src/libvgcode/src/ViewerImpl.hpp b/src/libvgcode/src/ViewerImpl.hpp index 4da312fc0e..c9d658beb1 100644 --- a/src/libvgcode/src/ViewerImpl.hpp +++ b/src/libvgcode/src/ViewerImpl.hpp @@ -71,6 +71,24 @@ public: // Render the toolpaths // void render(const Mat4x4& view_matrix, const Mat4x4& projection_matrix); + // + // ORCA: realistic view. Render the toolpaths as seen from the light, to fill the caller's + // shadow map. Only depth matters here, so the caller masks colour writes; light_position + // takes the place of the camera when the segment boxes are expanded, which gives their + // silhouette as the light sees it. + // + void render_shadow_casters(const Mat4x4& view_matrix, const Mat4x4& projection_matrix, const Vec3& light_position); + // + // ORCA: realistic view. The shadow map the toolpaths sample, in the given texture unit. + // intensity == 0, the default, turns the lookup off and restores the plain shading. + // + void set_shadow_map(int texture_unit, const Mat4x4& light_view_projection, float intensity, float texel_size); + // + // ORCA: tone applied to the shaded toolpaths, to pay back the light the lighting term, + // the shadow and the SSAO pass each take off. 1.0/1.0, the default, is a no-op; the + // caller decides which of the two it varies with the realistic view setting. + // + void set_tone(float exposure, float saturation); EViewType get_view_type() const { return m_settings.view_type; } void set_view_type(EViewType type); @@ -234,6 +252,20 @@ private: // std::array m_total_time{ 0.0f, 0.0f }; // + // Running sum of the vertex estimated times at each layer's first vertex, for each time mode, + // so that get_estimated_time_at() only accumulates the vertices of one layer. + // + std::array, TIME_MODES_COUNT> m_layer_start_times; + // + // For each layer L, the index of the first vertex whose layer_id is >= L (m_vertices.size() + // if there is none). Derived from the vertices, so it stays exact whatever order they arrive in. + // + std::vector m_layer_first_vertex; + // + // Scratch buffer for update_colors_texture(), kept alive across slider steps + // + std::vector m_colors_scratch; + // // Detected travel moves times // std::array m_travels_time{ 0.0f, 0.0f }; @@ -330,6 +362,13 @@ private: int m_uni_segments_height_width_angle_tex_id{ -1 }; int m_uni_segments_colors_tex_id{ -1 }; int m_uni_segments_segment_index_tex_id{ -1 }; + int m_uni_segments_shadow_map_id{ -1 }; + int m_uni_segments_shadow_light_vp_id{ -1 }; + int m_uni_segments_shadow_intensity_id{ -1 }; + int m_uni_segments_shadow_map_texel_id{ -1 }; + int m_uni_segments_exposure_id{ -1 }; + int m_uni_segments_saturation_id{ -1 }; + int m_uni_segments_bias_scale_id{ -1 }; // // Caches for OpenGL uniforms id for options shader // @@ -469,6 +508,27 @@ private: size_t m_enabled_options_tex_size{ 0 }; #endif // ENABLE_OPENGL_ES + // + // ORCA: realistic view. Shadow map state set by set_shadow_map(), consumed by the segments + // shader. m_rendering_shadow_casters forces the intensity to 0 for the depth pass, which + // must not sample the very map it is writing. + // + // Defaults past the four texture units render_segments() binds itself, so the sampler never + // aliases one of the buffer textures before the owner of the map has said where it lives. + int m_shadow_map_texture_unit{ 4 }; + Mat4x4 m_shadow_light_vp{ 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f }; + float m_shadow_intensity{ 0.0f }; + float m_shadow_map_texel{ 0.0f }; + bool m_rendering_shadow_casters{ false }; + + // + // ORCA: realistic view. Tone set by set_tone(), consumed by the segments shader. + // The identity values leave the shading as it is outside realistic view. + // + float m_exposure{ 1.0f }; + float m_saturation{ 1.0f }; + + void apply_pending_updates(); void update_view_full_range(); void update_color_ranges(); void update_heights_widths(); diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt index ec813c76f6..9d13703f7c 100644 --- a/src/slic3r/CMakeLists.txt +++ b/src/slic3r/CMakeLists.txt @@ -123,6 +123,8 @@ set(SLIC3R_GUI_SOURCES GUI/PluginPickerDialog.hpp GUI/PluginsDialog.cpp GUI/PluginsDialog.hpp + GUI/Shortcuts.cpp + GUI/Shortcuts.hpp GUI/SpeedDialDialog.cpp GUI/SpeedDialDialog.hpp GUI/ActionRegistry.cpp @@ -137,8 +139,16 @@ set(SLIC3R_GUI_SOURCES GUI/TerminalDialog.hpp GUI/PluginProgressDialog.cpp GUI/PluginProgressDialog.hpp - GUI/PluginWebDialog.cpp - GUI/PluginWebDialog.hpp + GUI/WebDialog.cpp + GUI/WebDialog.hpp + GUI/DockPanel.cpp + GUI/DockPanel.hpp + GUI/WebPanel.cpp + GUI/WebPanel.hpp + GUI/Widgets/WebHosting.cpp + GUI/Widgets/WebHosting.hpp + GUI/AuiPaneLayout.cpp + GUI/AuiPaneLayout.hpp GUI/DragCanvas.cpp GUI/DragCanvas.hpp GUI/EditGCodeDialog.cpp @@ -280,6 +290,8 @@ set(SLIC3R_GUI_SOURCES GUI/IMEXFilamentPickerPopover.hpp GUI/IMEXModesCtrl.cpp GUI/IMEXModesCtrl.hpp + GUI/IdleScheduler.cpp + GUI/IdleScheduler.hpp GUI/ImageGrid.cpp GUI/ImageGrid.h GUI/ImGuiWrapper.cpp @@ -339,6 +351,12 @@ set(SLIC3R_GUI_SOURCES GUI/Jobs/Worker.hpp GUI/KBShortcutsDialog.cpp GUI/KBShortcutsDialog.hpp + GUI/KeyChord.cpp + GUI/KeyChord.hpp + GUI/Lazy.cpp + GUI/Lazy.hpp + GUI/LazyPage.cpp + GUI/LazyPage.hpp GUI/LibVGCode/LibVGCodeWrapper.hpp GUI/LibVGCode/LibVGCodeWrapper.cpp GUI/LinuxDisplayBackend.cpp @@ -425,6 +443,7 @@ set(SLIC3R_GUI_SOURCES GUI/Plater.hpp GUI/PlateSettingsDialog.cpp GUI/PlateSettingsDialog.hpp + GUI/PrebuildQueue.hpp GUI/Preferences.cpp GUI/Preferences.hpp GUI/PresetBundleDialog.cpp @@ -504,6 +523,7 @@ set(SLIC3R_GUI_SOURCES GUI/SliceInfoPanel.hpp GUI/SlicingProgressNotification.cpp GUI/SlicingProgressNotification.hpp + GUI/StagedBuild.hpp GUI/StatusPanel.cpp GUI/StatusPanel.hpp GUI/StepMeshDialog.cpp diff --git a/src/slic3r/GUI/3DScene.cpp b/src/slic3r/GUI/3DScene.cpp index fd23337b44..bf3cdc5303 100644 --- a/src/slic3r/GUI/3DScene.cpp +++ b/src/slic3r/GUI/3DScene.cpp @@ -1157,6 +1157,10 @@ void GLVolumeCollection::render(GLVolumeCollection::ERenderType type, const float support_normal_z = get_selection_support_normal_z(); + // The outline passes below are driven by is_outline, which only the object shaders have; with an + // overlay one (wireframe, x-ray) bound they would just draw the volume again. + const bool shader_can_outline = shader->get_uniform_location("is_outline") >= 0; + // Prime depth_tex on every frame so non-outline draws do not keep the // default sampler unit 0, which can conflict with other sampler types. shader->set_uniform("depth_tex", OUTLINE_DEPTH_TEX_UNIT); @@ -1257,7 +1261,7 @@ void GLVolumeCollection::render(GLVolumeCollection::ERenderType type, const Matrix3d view_normal_matrix = view_matrix.matrix().block(0, 0, 3, 3) * model_matrix.matrix().block(0, 0, 3, 3).inverse().transpose(); shader->set_uniform("view_normal_matrix", view_normal_matrix); //BBS: add outline related logic - if (volume.first->selected && GUI::wxGetApp().show_outline()) + if (volume.first->selected && shader_can_outline && GUI::wxGetApp().show_outline()) volume.first->render_with_outline(cnv_size); else volume.first->render(); diff --git a/src/slic3r/GUI/AuiPaneLayout.cpp b/src/slic3r/GUI/AuiPaneLayout.cpp new file mode 100644 index 0000000000..dc93352971 --- /dev/null +++ b/src/slic3r/GUI/AuiPaneLayout.cpp @@ -0,0 +1,20 @@ +#include "AuiPaneLayout.hpp" + +namespace Slic3r { namespace GUI { + +std::string aui_pane_layout_entry(const std::string& layout, const std::string& pane_name) +{ + // Panes are separated by '|'; SavePerspective() escapes a '|' inside a caption as "\|". + const std::string prefix = "name=" + pane_name + ";"; + size_t begin = 0; + for (size_t i = 0; i <= layout.size(); ++i) { + if (i < layout.size() && (layout[i] != '|' || (i > 0 && layout[i - 1] == '\\'))) + continue; + if (layout.compare(begin, prefix.size(), prefix) == 0) + return layout.substr(begin, i - begin); + begin = i + 1; + } + return {}; +} + +}} // namespace Slic3r::GUI diff --git a/src/slic3r/GUI/AuiPaneLayout.hpp b/src/slic3r/GUI/AuiPaneLayout.hpp new file mode 100644 index 0000000000..e18b5ff6e1 --- /dev/null +++ b/src/slic3r/GUI/AuiPaneLayout.hpp @@ -0,0 +1,11 @@ +#pragma once + +#include + +namespace Slic3r { namespace GUI { + +// The part a wxAuiManager layout string (wxAuiManager::SavePerspective) holds for `pane_name`, in the +// form wxAuiManager::LoadPaneInfo() takes, or empty when the layout has no such pane. +std::string aui_pane_layout_entry(const std::string& layout, const std::string& pane_name); + +}} // namespace Slic3r::GUI diff --git a/src/slic3r/GUI/Auxiliary.cpp b/src/slic3r/GUI/Auxiliary.cpp index 13ca173eb6..14b8d238a2 100644 --- a/src/slic3r/GUI/Auxiliary.cpp +++ b/src/slic3r/GUI/Auxiliary.cpp @@ -863,17 +863,27 @@ void AuxiliaryPanel::init_tabpanel() m_tabpanel->SetBackgroundColour(wxColour("#FEFFFF")); m_tabpanel->Bind(wxEVT_BOOKCTRL_PAGE_CHANGED, [](wxBookCtrlEvent &e) { /* Event handling */ }); - m_designer_panel = new DesignerPanel(m_tabpanel, AuxiliaryFolderType::DESIGNER); - m_pictures_panel = new AuFolderPanel(m_tabpanel, AuxiliaryFolderType::MODEL_PICTURE); - m_bill_of_materials_panel = new AuFolderPanel(m_tabpanel, AuxiliaryFolderType::BILL_OF_MATERIALS); - m_assembly_panel = new AuFolderPanel(m_tabpanel, AuxiliaryFolderType::ASSEMBLY_GUIDE); - m_others_panel = new AuFolderPanel(m_tabpanel, AuxiliaryFolderType::OTHERS); - - m_tabpanel->AddPage(m_designer_panel, _L("Basic Info"), true); - m_tabpanel->AddPage(m_pictures_panel, _L("Pictures"), false); - m_tabpanel->AddPage(m_bill_of_materials_panel, _L("Bill of Materials"), false); - m_tabpanel->AddPage(m_assembly_panel, _L("Assembly Guide"), false); - m_tabpanel->AddPage(m_others_panel, _L("Others"), false); + add_build_step([this] { + m_designer_panel = new DesignerPanel(m_tabpanel, AuxiliaryFolderType::DESIGNER); + m_tabpanel->AddPage(m_designer_panel, _L("Basic Info"), true); + }); + add_build_step([this] { + m_pictures_panel = new AuFolderPanel(m_tabpanel, AuxiliaryFolderType::MODEL_PICTURE); + m_tabpanel->AddPage(m_pictures_panel, _L("Pictures"), false); + }); + add_build_step([this] { + m_bill_of_materials_panel = new AuFolderPanel(m_tabpanel, AuxiliaryFolderType::BILL_OF_MATERIALS); + m_tabpanel->AddPage(m_bill_of_materials_panel, _L("Bill of Materials"), false); + }); + add_build_step([this] { + m_assembly_panel = new AuFolderPanel(m_tabpanel, AuxiliaryFolderType::ASSEMBLY_GUIDE); + m_tabpanel->AddPage(m_assembly_panel, _L("Assembly Guide"), false); + }); + add_build_step([this] { + m_others_panel = new AuFolderPanel(m_tabpanel, AuxiliaryFolderType::OTHERS); + m_tabpanel->AddPage(m_others_panel, _L("Others"), false); + Layout(); + }); } wxWindow *AuxiliaryPanel::create_side_tools() diff --git a/src/slic3r/GUI/Auxiliary.hpp b/src/slic3r/GUI/Auxiliary.hpp index 0bced37115..76e6adf97b 100644 --- a/src/slic3r/GUI/Auxiliary.hpp +++ b/src/slic3r/GUI/Auxiliary.hpp @@ -46,6 +46,7 @@ #include "slic3r/GUI/UpgradePanel.hpp" #include "slic3r/GUI/AmsWidgets.hpp" #include "Widgets/SideTools.hpp" +#include "StagedBuild.hpp" #define AUFILE_GREY700 wxColour(107, 107, 107) #define AUFILE_GREY500 wxColour(158, 158, 158) @@ -194,7 +195,7 @@ public: }; -class AuxiliaryPanel : public wxPanel +class AuxiliaryPanel : public wxPanel, public StagedBuild { private: Tabbook *m_tabpanel = {nullptr}; diff --git a/src/slic3r/GUI/CAD/DesignPanel.hpp b/src/slic3r/GUI/CAD/DesignPanel.hpp index 88b445534d..16f0a2722c 100644 --- a/src/slic3r/GUI/CAD/DesignPanel.hpp +++ b/src/slic3r/GUI/CAD/DesignPanel.hpp @@ -12,6 +12,7 @@ #include "libslic3r/CAD/CadDocument.hpp" #include "slic3r/GUI/CAD/DesignInteraction.hpp" // CadLevel: what one Esc press means +#include "slic3r/GUI/Lazy.hpp" class ComboBox; // Orca dropdown (Widgets/ComboBox.hpp) — replaces wxChoice everywhere here class StaticBox; // Orca rounded card frame (Widgets/StaticBox.hpp) @@ -46,7 +47,7 @@ class DesignCanvas; // Design (CAD) tab: a sketch-first, Onshape-style form-driven CAD panel. // Sketch and Extrude are independent tools: the user creates a Sketch first, // then selects it and Extrudes to produce a solid. -class DesignPanel : public wxPanel +class DesignPanel : public wxPanel, public LazyInstance { public: explicit DesignPanel(wxWindow* parent); diff --git a/src/slic3r/GUI/CAD/McpControl.cpp b/src/slic3r/GUI/CAD/McpControl.cpp index 8e34e2aac8..0ad05667c3 100644 --- a/src/slic3r/GUI/CAD/McpControl.cpp +++ b/src/slic3r/GUI/CAD/McpControl.cpp @@ -1989,11 +1989,10 @@ json action_set_feature_expr(DesignPanel* panel, const json& params) // Dispatch one parsed request ON THE MAIN THREAD. Returns a JSON-RPC reply string. std::string handle_on_main(const std::string& method, const json& params, const json& id) { - MainFrame* mf = wxGetApp().mainframe; // The panel is built on first use, and in a headless session nobody clicks the tab that // would build it -- so build it here rather than refusing. Safe: this runs on the main // thread (see the CallAfter that dispatches us). - DesignPanel* panel = mf ? mf->ensure_design_panel() : nullptr; + DesignPanel* panel = DesignPanel::ensure(); if (!panel) return rpc_error(id, -32001, "Design panel not ready"); diff --git a/src/slic3r/GUI/CalibrationPanel.cpp b/src/slic3r/GUI/CalibrationPanel.cpp index bdc79c1c8e..fca9fa2be9 100644 --- a/src/slic3r/GUI/CalibrationPanel.cpp +++ b/src/slic3r/GUI/CalibrationPanel.cpp @@ -491,14 +491,15 @@ void CalibrationPanel::init_tabpanel() { selected); } + for (int i = 0; i < (int)CALI_MODE_COUNT; i++) + add_build_steps_of(*m_cali_panels[i]); + // ORCA use standard paddings and keep arrow icon for consistent look between sidebars //for (int i = 0; i < (int)CALI_MODE_COUNT; i++) // m_tabpanel->SetPageImage(i, ""); //auto padding_size = m_tabpanel->GetBtnsListCtrl()->GetPaddingSize(0); //m_tabpanel->GetBtnsListCtrl()->SetPaddingSize({ FromDIP(15), padding_size.y }); - - m_initialized = true; } void CalibrationPanel::init_timer() @@ -534,6 +535,8 @@ void CalibrationPanel::update_print_error_info(int code, std::string msg, std::s } void CalibrationPanel::update_all() { + // Every wizard's pages exist once the last build step has run. + if (!built()) return; NetworkAgent* m_agent = wxGetApp().getAgent(); Slic3r::DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager(); @@ -597,7 +600,7 @@ void CalibrationPanel::update_all() { void CalibrationPanel::show_status(int status) { - if (!m_initialized) return; + if (!built()) return; if (last_status == status)return; last_status = status; diff --git a/src/slic3r/GUI/CalibrationPanel.hpp b/src/slic3r/GUI/CalibrationPanel.hpp index 1f6b097af9..960c5eed37 100644 --- a/src/slic3r/GUI/CalibrationPanel.hpp +++ b/src/slic3r/GUI/CalibrationPanel.hpp @@ -3,6 +3,7 @@ #include "CalibrationWizard.hpp" #include "Tabbook.hpp" +#include "Lazy.hpp" //#include "Widgets/SideTools.hpp" namespace Slic3r { namespace GUI { @@ -88,7 +89,7 @@ private: }; -class CalibrationPanel : public wxPanel +class CalibrationPanel : public wxPanel, public StagedBuild, public LazyInstance { public: CalibrationPanel(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL); @@ -109,7 +110,6 @@ protected: int last_status; - bool m_initialized { false }; std::string last_conn_type = "undedefined"; MachineObject* obj{ nullptr }; MachineObject* last_obj { nullptr }; diff --git a/src/slic3r/GUI/CalibrationWizard.cpp b/src/slic3r/GUI/CalibrationWizard.cpp index f80562578d..fa42143f06 100644 --- a/src/slic3r/GUI/CalibrationWizard.cpp +++ b/src/slic3r/GUI/CalibrationWizard.cpp @@ -130,6 +130,15 @@ CalibrationWizard::~CalibrationWizard() ; } +void CalibrationWizard::add_page_step(CalibrationWizardPageStep*& step, std::function make) +{ + add_build_step([this, &step, make = std::move(make)] { + step = new CalibrationWizardPageStep(make()); + m_all_pages_sizer->Add(step->page, 1, wxEXPAND | wxALL, FromDIP(25)); + step->page->Hide(); + }); +} + void CalibrationWizard::on_cali_job_finished(wxCommandEvent& event) { this->on_cali_job_finished(event.GetString()); @@ -520,33 +529,28 @@ void PressureAdvanceWizard::on_cali_job_finished(wxString evt_data) void PressureAdvanceWizard::create_pages() { - start_step = new CalibrationWizardPageStep(new CalibrationPAStartPage(m_scrolledWindow)); - preset_step = new CalibrationWizardPageStep(new CalibrationPresetPage(m_scrolledWindow, m_mode, false)); - cali_step = new CalibrationWizardPageStep(new CalibrationCaliPage(m_scrolledWindow, m_mode)); - save_step = new CalibrationWizardPageStep(new CalibrationPASavePage(m_scrolledWindow)); + add_page_step(start_step, [this] { return new CalibrationPAStartPage(m_scrolledWindow); }); + add_page_step(preset_step, [this] { return new CalibrationPresetPage(m_scrolledWindow, m_mode, false); }); + add_page_step(cali_step, [this] { return new CalibrationCaliPage(m_scrolledWindow, m_mode); }); + add_page_step(save_step, [this] { return new CalibrationPASavePage(m_scrolledWindow); }); - m_all_pages_sizer->Add(start_step->page, 1, wxEXPAND | wxALL, FromDIP(25)); - m_all_pages_sizer->Add(preset_step->page, 1, wxEXPAND | wxALL, FromDIP(25)); - m_all_pages_sizer->Add(cali_step->page, 1, wxEXPAND | wxALL, FromDIP(25)); - m_all_pages_sizer->Add(save_step->page, 1, wxEXPAND | wxALL, FromDIP(25)); + add_build_step([this] { + m_page_steps.push_back(start_step); + m_page_steps.push_back(preset_step); + m_page_steps.push_back(cali_step); + m_page_steps.push_back(save_step); + for (int i = 0; i < m_page_steps.size() -1; i++) { + m_page_steps[i]->chain(m_page_steps[i+1]); + } - m_page_steps.push_back(start_step); - m_page_steps.push_back(preset_step); - m_page_steps.push_back(cali_step); - m_page_steps.push_back(save_step); + for (int i = 0; i < m_page_steps.size(); i++) { + m_page_steps[i]->page->Bind(EVT_CALI_ACTION, &PressureAdvanceWizard::on_cali_action, this); + } - for (int i = 0; i < m_page_steps.size() -1; i++) { - m_page_steps[i]->chain(m_page_steps[i+1]); - } - - for (int i = 0; i < m_page_steps.size(); i++) { - m_page_steps[i]->page->Hide(); - m_page_steps[i]->page->Bind(EVT_CALI_ACTION, &PressureAdvanceWizard::on_cali_action, this); - } - - if (!m_page_steps.empty()) - show_step(m_page_steps.front()); + if (!m_page_steps.empty()) + show_step(m_page_steps.front()); + }); } void PressureAdvanceWizard::on_cali_action(wxCommandEvent& evt) @@ -1053,59 +1057,46 @@ FlowRateWizard::FlowRateWizard(wxWindow* parent, wxWindowID id, const wxPoint& p void FlowRateWizard::create_pages() { - start_step = new CalibrationWizardPageStep(new CalibrationFlowRateStartPage(m_scrolledWindow)); - preset_step = new CalibrationWizardPageStep(new CalibrationPresetPage(m_scrolledWindow, m_mode, false)); + add_page_step(start_step, [this] { return new CalibrationFlowRateStartPage(m_scrolledWindow); }); + add_page_step(preset_step, [this] { return new CalibrationPresetPage(m_scrolledWindow, m_mode, false); }); // manual - cali_coarse_step = new CalibrationWizardPageStep(new CalibrationCaliPage(m_scrolledWindow, m_mode, CaliPageType::CALI_PAGE_CALI)); - coarse_save_step = new CalibrationWizardPageStep(new CalibrationFlowCoarseSavePage(m_scrolledWindow)); - cali_fine_step = new CalibrationWizardPageStep(new CalibrationCaliPage(m_scrolledWindow, m_mode, CaliPageType::CALI_PAGE_FINE_CALI)); - fine_save_step = new CalibrationWizardPageStep(new CalibrationFlowFineSavePage(m_scrolledWindow)); + add_page_step(cali_coarse_step, [this] { return new CalibrationCaliPage(m_scrolledWindow, m_mode, CaliPageType::CALI_PAGE_CALI); }); + add_page_step(coarse_save_step, [this] { return new CalibrationFlowCoarseSavePage(m_scrolledWindow); }); + add_page_step(cali_fine_step, [this] { return new CalibrationCaliPage(m_scrolledWindow, m_mode, CaliPageType::CALI_PAGE_FINE_CALI); }); + add_page_step(fine_save_step, [this] { return new CalibrationFlowFineSavePage(m_scrolledWindow); }); // auto - cali_step = new CalibrationWizardPageStep(new CalibrationCaliPage(m_scrolledWindow, m_mode)); - save_step = new CalibrationWizardPageStep(new CalibrationFlowX1SavePage(m_scrolledWindow)); + add_page_step(cali_step, [this] { return new CalibrationCaliPage(m_scrolledWindow, m_mode); }); + add_page_step(save_step, [this] { return new CalibrationFlowX1SavePage(m_scrolledWindow); }); - m_all_pages_sizer->Add(start_step->page, 1, wxEXPAND | wxALL, FromDIP(25)); - m_all_pages_sizer->Add(preset_step->page, 1, wxEXPAND | wxALL, FromDIP(25)); - m_all_pages_sizer->Add(cali_coarse_step->page, 1, wxEXPAND | wxALL, FromDIP(25)); - m_all_pages_sizer->Add(coarse_save_step->page, 1, wxEXPAND | wxALL, FromDIP(25)); - m_all_pages_sizer->Add(cali_fine_step->page, 1, wxEXPAND | wxALL, FromDIP(25)); - m_all_pages_sizer->Add(fine_save_step->page, 1, wxEXPAND | wxALL, FromDIP(25)); + add_build_step([this] { + m_page_steps.push_back(start_step); + m_page_steps.push_back(preset_step); + m_page_steps.push_back(cali_coarse_step); + m_page_steps.push_back(coarse_save_step); + m_page_steps.push_back(cali_fine_step); + m_page_steps.push_back(fine_save_step); - m_all_pages_sizer->Add(cali_step->page, 1, wxEXPAND | wxALL, FromDIP(25)); - m_all_pages_sizer->Add(save_step->page, 1, wxEXPAND | wxALL, FromDIP(25)); + //m_page_steps.push_back(cali_step); + //m_page_steps.push_back(save_step); - m_page_steps.push_back(start_step); - m_page_steps.push_back(preset_step); - m_page_steps.push_back(cali_coarse_step); - m_page_steps.push_back(coarse_save_step); - m_page_steps.push_back(cali_fine_step); - m_page_steps.push_back(fine_save_step); + for (int i = 0; i < m_page_steps.size() - 1; i++) { + m_page_steps[i]->chain(m_page_steps[i + 1]); + } - //m_page_steps.push_back(cali_step); - //m_page_steps.push_back(save_step); + for (int i = 0; i < m_page_steps.size(); i++) { + m_page_steps[i]->page->Bind(EVT_CALI_ACTION, &FlowRateWizard::on_cali_action, this); + } - for (int i = 0; i < m_page_steps.size() - 1; i++) { - m_page_steps[i]->chain(m_page_steps[i + 1]); - } + cali_step->page->Bind(EVT_CALI_ACTION, &FlowRateWizard::on_cali_action, this); + save_step->page->Bind(EVT_CALI_ACTION, &FlowRateWizard::on_cali_action, this); - // hide all pages - cali_step->page->Hide(); - save_step->page->Hide(); - for (int i = 0; i < m_page_steps.size(); i++) { - m_page_steps[i]->page->Hide(); - m_page_steps[i]->page->Bind(EVT_CALI_ACTION, &FlowRateWizard::on_cali_action, this); - } + if (!m_page_steps.empty()) + show_step(m_page_steps.front()); - - cali_step->page->Bind(EVT_CALI_ACTION, &FlowRateWizard::on_cali_action, this); - save_step->page->Bind(EVT_CALI_ACTION, &FlowRateWizard::on_cali_action, this); - - if (!m_page_steps.empty()) - show_step(m_page_steps.front()); - - set_cali_method(CalibrationMethod::CALI_METHOD_MANUAL); + set_cali_method(CalibrationMethod::CALI_METHOD_MANUAL); + }); } void FlowRateWizard::on_cali_action(wxCommandEvent& evt) diff --git a/src/slic3r/GUI/CalibrationWizard.hpp b/src/slic3r/GUI/CalibrationWizard.hpp index d72d5fcb7b..89c515eb80 100644 --- a/src/slic3r/GUI/CalibrationWizard.hpp +++ b/src/slic3r/GUI/CalibrationWizard.hpp @@ -9,6 +9,7 @@ #include "CalibrationWizardPresetPage.hpp" #include "CalibrationWizardCaliPage.hpp" #include "CalibrationWizardSavePage.hpp" +#include "StagedBuild.hpp" namespace Slic3r { namespace GUI { @@ -36,7 +37,7 @@ struct ConfigIndexValue int index{0}; }; -class CalibrationWizard : public wxPanel { +class CalibrationWizard : public wxPanel, public StagedBuild { public: CalibrationWizard(wxWindow* parent, CalibMode mode, wxWindowID id = wxID_ANY, @@ -79,6 +80,9 @@ public: protected: void on_cali_go_home(); + // Queues a page as a build step, created hidden and added to the pages sizer. + void add_page_step(CalibrationWizardPageStep*& step, std::function make); + protected: /* wx widgets*/ wxScrolledWindow* m_scrolledWindow; diff --git a/src/slic3r/GUI/CalibrationWizardCaliPage.cpp b/src/slic3r/GUI/CalibrationWizardCaliPage.cpp index 152f46f37c..2dc766dca3 100644 --- a/src/slic3r/GUI/CalibrationWizardCaliPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardCaliPage.cpp @@ -192,8 +192,10 @@ void CalibrationCaliPage::update(MachineObject* obj) set_cali_img(); } + // A calibration can run before the Device tab is ever opened, and only its status + // panel shows a print error. if (obj->print_error > 0) { - StatusPanel* status_panel = Slic3r::GUI::wxGetApp().mainframe->m_monitor->get_status_panel(); + StatusPanel* status_panel = MonitorPanel::ensure()->get_status_panel(); status_panel->obj = obj; status_panel->update_error_message(); } diff --git a/src/slic3r/GUI/DeviceCore/DevManager.cpp b/src/slic3r/GUI/DeviceCore/DevManager.cpp index feb6301df3..c03f0cfe59 100644 --- a/src/slic3r/GUI/DeviceCore/DevManager.cpp +++ b/src/slic3r/GUI/DeviceCore/DevManager.cpp @@ -10,6 +10,7 @@ #include "slic3r/GUI/I18N.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/Plater.hpp" +#include "slic3r/plugin/PluginManager.hpp" #include "slic3r/Utils/NetworkAgentFactory.hpp" #include "libslic3r/Time.hpp" @@ -355,7 +356,10 @@ namespace Slic3r obj->bind_state = "free"; obj->last_alive = Slic3r::Utils::get_current_time_utc(); - obj->m_is_online = true; + // Route through set_online_state() (rather than writing m_is_online directly) so the + // DeviceOnline lifecycle event fires consistently; same effective value/behavior + // here since the object was already online in the common case. + obj->set_online_state(true); obj->set_dev_name(dev_name); /* if (!obj->dev_ip.empty()) { Slic3r::GUI::wxGetApp().app_config->set_str("ip_address", obj->dev_id, obj->dev_ip); @@ -373,6 +377,10 @@ namespace Slic3r obj->bind_sec_link = sec_link; obj->dev_connection_name = connection_name; obj->bind_ssdp_version = ssdp_version; + // Discovery establishes the initial reachability state. Do not report it as an + // online transition; DeviceDiscovered below is the lifecycle event for a new + // device. Subsequent updates route through set_online_state(), so a known device + // still emits DeviceOnline/DeviceOffline when its reachability actually changes. obj->m_is_online = true; //load access code @@ -389,6 +397,15 @@ namespace Slic3r BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " New Machine, dev_id= " << dev_id << ", ip = " << dev_ip <<", printer_name = " << dev_name << ", con_type= " << connect_type <<", signal= " << printer_signal << ", bind_state= " << bind_state; + + // First discovery of a genuinely new device (not a periodic SSDP/heartbeat update to + // an already-known one, which is handled in the branch above). + { + LifecycleEventContext ctx; + ctx.name = dev_id; + ctx.code = LifecycleEvtCode::Ok; + fire_lifecycle_event(LifecycleEvent::DeviceDiscovered, ctx); + } } update_local_machine(*obj); } @@ -984,8 +1001,14 @@ namespace Slic3r } void DeviceManager::OnSelectedMachineChanged(const std::string& /*pre_dev_id*/, - const std::string& /*new_dev_id*/) + const std::string& new_dev_id) { + { + LifecycleEventContext ctx; + ctx.name = new_dev_id; // empty string is a valid deselection + ctx.code = LifecycleEvtCode::Ok; + fire_lifecycle_event(LifecycleEvent::DeviceSelected, ctx); + } if (MachineObject* obj_ = get_selected_machine()) { GUI::wxGetApp().sidebar().update_sync_status(obj_); if(m_agent->get_filament_sync_mode() == FilamentSyncMode::subscription) diff --git a/src/slic3r/GUI/DeviceErrorDialog.cpp b/src/slic3r/GUI/DeviceErrorDialog.cpp index 2a55d77d24..9790db67bd 100644 --- a/src/slic3r/GUI/DeviceErrorDialog.cpp +++ b/src/slic3r/GUI/DeviceErrorDialog.cpp @@ -538,7 +538,8 @@ void DeviceErrorDialog::on_button_click(ActionButton btn_id) break; } case DeviceErrorDialog::CHECK_ASSISTANT: { - wxGetApp().mainframe->m_monitor->jump_to_HMS(); // go to assistant page + if (MonitorPanel* monitor = MonitorPanel::if_built()) + monitor->jump_to_HMS(); // go to assistant page break; } case DeviceErrorDialog::FILAMENT_EXTRUDED: { @@ -568,7 +569,8 @@ void DeviceErrorDialog::on_button_click(ActionButton btn_id) } case DeviceErrorDialog::JUMP_TO_LIVEVIEW: { Slic3r::GUI::wxGetApp().mainframe->jump_to_monitor(); - Slic3r::GUI::wxGetApp().mainframe->m_monitor->jump_to_LiveView(); + if (MonitorPanel* monitor = MonitorPanel::if_built()) + monitor->jump_to_LiveView(); break; } case DeviceErrorDialog::NO_REMINDER_NEXT_TIME: { @@ -618,7 +620,8 @@ void DeviceErrorDialog::on_button_click(ActionButton btn_id) } case DeviceErrorDialog::OK_JUMP_RACK: { Slic3r::GUI::wxGetApp().mainframe->jump_to_monitor(); - Slic3r::GUI::wxGetApp().mainframe->m_monitor->jump_to_Rack(); + if (MonitorPanel* monitor = MonitorPanel::if_built()) + monitor->jump_to_Rack(); break; } case DeviceErrorDialog::ABORT: { diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index fd60f80d25..6bd690e9a6 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -5,6 +5,7 @@ #include "libslic3r/Time.hpp" #include "libslic3r/Thread.hpp" #include "slic3r/Utils/NetworkAgent.hpp" +#include "slic3r/plugin/PluginManager.hpp" #include "slic3r/Utils/NetworkAgentFactory.hpp" #include "GuiColor.hpp" @@ -2626,7 +2627,15 @@ void MachineObject::reset() void MachineObject::set_print_state(std::string status) { + const bool changed = (print_status != status); print_status = status; + if (changed) { + LifecycleEventContext ctx; + ctx.name = dev_id; + ctx.code = LifecycleEvtCode::Ok; + ctx.msg = print_status; + fire_lifecycle_event(LifecycleEvent::PrintStateChanged, ctx); + } } int MachineObject::connect(bool use_openssl) @@ -2648,7 +2657,10 @@ int MachineObject::connect(bool use_openssl) int MachineObject::disconnect() { if (m_agent) { - return m_agent->disconnect_printer(); + const int result = m_agent->disconnect_printer(); + if (result == 0) + set_online_state(false); + return result; } return -1; } @@ -2678,8 +2690,16 @@ bool MachineObject::is_connecting() void MachineObject::set_online_state(bool on_off) { + const bool changed = (m_is_online != on_off); m_is_online = on_off; if (!on_off) m_active_state = NotActive; + if (changed) { + LifecycleEventContext ctx; + ctx.name = dev_id; + ctx.code = LifecycleEvtCode::Ok; + ctx.msg = on_off ? "online" : "offline"; + fire_lifecycle_event(on_off ? LifecycleEvent::DeviceOnline : LifecycleEvent::DeviceOffline, ctx); + } } bool MachineObject::is_info_ready(bool check_version) const @@ -2806,13 +2826,6 @@ int MachineObject::parse_json(std::string tunnel, std::string payload, bool key_ parse_msg_count++; std::chrono::system_clock::time_point clock_start = std::chrono::system_clock::now(); - this->set_online_state(true); - - std::chrono::system_clock::time_point curr_time = std::chrono::system_clock::now(); - auto diff1 = std::chrono::duration_cast(curr_time - last_update_time); - - /* update last received time */ - last_update_time = std::chrono::system_clock::now(); json j_pre; bool parse_ok = false; @@ -2825,8 +2838,29 @@ int MachineObject::parse_json(std::string tunnel, std::string payload, bool key_ /* post process payload */ sanitizeToUtf8(payload); BOOST_LOG_TRIVIAL(info) << "parse_json: sanitize to utf8"; + try { + j_pre = json::parse(payload); + parse_ok = true; + } + catch (...) {} } + bool client_disconnected = false; + if (parse_ok && j_pre.is_object() && j_pre.contains("event") && j_pre["event"].is_object() && + j_pre["event"].contains("event") && j_pre["event"]["event"].is_string()) { + client_disconnected = j_pre["event"]["event"].get() == "client.disconnected"; + } + + // A disconnect notification is a transport message too, but it must not first mark an + // already-offline device as online through the generic message-received path. + set_online_state(!client_disconnected); + + std::chrono::system_clock::time_point curr_time = std::chrono::system_clock::now(); + auto diff1 = std::chrono::duration_cast(curr_time - last_update_time); + + /* update last received time */ + last_update_time = std::chrono::system_clock::now(); + try { bool restored_json = false; json j; @@ -4597,19 +4631,6 @@ int MachineObject::parse_json(std::string tunnel, std::string payload, bool key_ } } - // event info - try { - if (j.contains("event")) { - if (j["event"].contains("event")) { - if (j["event"]["event"].get() == "client.disconnected") - set_online_state(false); - else if (j["event"]["event"].get() == "client.connected") - set_online_state(true); - } - } - } - catch (...) {} - if (!key_field_only) { BOOST_LOG_TRIVIAL(trace) << "parse_json m_active_state =" << m_active_state; parse_state_changed_event(); diff --git a/src/slic3r/GUI/DeviceManager.hpp b/src/slic3r/GUI/DeviceManager.hpp index 914c8f7868..ca3b7c3c44 100644 --- a/src/slic3r/GUI/DeviceManager.hpp +++ b/src/slic3r/GUI/DeviceManager.hpp @@ -897,6 +897,7 @@ public: bool is_connected(); bool is_connecting(); + // Emits DeviceOnline or DeviceOffline only when the reachability state changes. void set_online_state(bool on_off); bool is_online() { return m_is_online; } bool is_info_ready(bool check_version = true) const; diff --git a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.cpp b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.cpp index 44394866c8..00d4c3e809 100644 --- a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.cpp +++ b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.cpp @@ -934,7 +934,8 @@ void wgtDeviceNozzleRackNozzleItem::OnBtnNozzleStatus(wxMouseEvent& evt) dlg.AddButton(wxID_OK,_L("Jump to the upgrade page"), true); if (dlg.ShowModal() == wxID_OK) { - wxGetApp().mainframe->m_monitor->jump_to_Upgrade(); + if (MonitorPanel* monitor = MonitorPanel::if_built()) + monitor->jump_to_Upgrade(); }; } } diff --git a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.cpp b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.cpp index fac14e31d9..eae377c147 100644 --- a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.cpp +++ b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.cpp @@ -344,7 +344,8 @@ void wgtDeviceNozzleRackHotendUpdate::OnStatusIconClick(wxMouseEvent& event) if (dlg.ShowModal() == wxID_OK) { - wxGetApp().mainframe->m_monitor->jump_to_Upgrade(); + if (MonitorPanel* monitor = MonitorPanel::if_built()) + monitor->jump_to_Upgrade(); wxCommandEvent evt(wxEVT_NOZZLE_JUMP_UPGRADE, GetId()); evt.SetEventObject(this); diff --git a/src/slic3r/GUI/DockPanel.cpp b/src/slic3r/GUI/DockPanel.cpp new file mode 100644 index 0000000000..0a5d25c4e7 --- /dev/null +++ b/src/slic3r/GUI/DockPanel.cpp @@ -0,0 +1,103 @@ +#include "DockPanel.hpp" + +#include "GUI_App.hpp" +#include "Plater.hpp" +#include "Widgets/WebHosting.hpp" + +#include + +#include +#include + +namespace Slic3r { namespace GUI { + +std::string plugin_pane_name(const std::string& plugin_key, const std::string& title) +{ + std::string name = "plugin:" + plugin_key + ":" + title; + std::replace_if(name.begin(), name.end(), [](char c) { return c == '|' || c == ';' || c == '=' || c == '\\'; }, '_'); + return name; +} + +DockPanel::DockPanel(wxWindow* parent, + const std::string& html, + MessageHandler on_message, + CloseHandler on_close, + CloseHandler on_destroyed) + : WebPanel(parent, web_hosting::orca_bridge_script()) + , m_html(html) + , m_on_message(std::move(on_message)) + , m_on_close(std::move(on_close)) + , m_on_destroyed(std::move(on_destroyed)) +{ + // A link asking for a new window has nowhere to open from a docked panel. + browser()->Bind(wxEVT_WEBVIEW_NEWWINDOW, [](wxWebViewEvent& event) { event.Veto(); }); +} + +DockPanel::~DockPanel() +{ + if (m_on_destroyed) + m_on_destroyed(); +} + +bool DockPanel::on_page_message(const std::string& kind, const nlohmann::json& data) +{ + if (kind == "message") { + if (m_on_message) + m_on_message(data); + return true; + } + if (kind == "close") { + request_close(); + return true; + } + return false; +} + +void DockPanel::push_message(const nlohmann::json& data) +{ + if (!m_closing) + post_to_page(data.dump(-1, ' ', false, nlohmann::json::error_handler_t::replace)); +} + +void DockPanel::fire_close() +{ + if (m_closing) + return; + m_closing = true; + if (m_on_close) { + CloseHandler on_close = std::move(m_on_close); + m_on_close = nullptr; + on_close(); + } +} + +void DockPanel::request_close() +{ + if (m_closing) + return; + fire_close(); + // A page-requested close arrives inside the web view's script callback, so destroy later; another + // close path may have destroyed the panel by then. + wxWeakRef self(this); + CallAfter([self]() { + if (self) + self->remove_pane(); + }); +} + +void DockPanel::destroy_silently() +{ + m_closing = true; + m_on_close = nullptr; + remove_pane(); +} + +void DockPanel::remove_pane() +{ + if (Plater* plater = wxGetApp().plater()) + plater->remove_dock_pane(this); + else + Destroy(); +} + +}} // namespace Slic3r::GUI diff --git a/src/slic3r/GUI/DockPanel.hpp b/src/slic3r/GUI/DockPanel.hpp new file mode 100644 index 0000000000..a9a0a0d6b3 --- /dev/null +++ b/src/slic3r/GUI/DockPanel.hpp @@ -0,0 +1,54 @@ +#pragma once + +#include "WebPanel.hpp" + +#include +#include + +namespace Slic3r { namespace GUI { + +// Stable across sessions so the saved layout finds the pane; free of wxAuiManager layout delimiters. +std::string plugin_pane_name(const std::string& plugin_key, const std::string& title); + +// A WebPanel docked in the Plater, on the plugin-window bridge minus submit. It can be destroyed +// without the GIL, so its hooks must not capture pybind11 objects. +class DockPanel : public WebPanel +{ +public: + using MessageHandler = std::function; + using CloseHandler = std::function; + + // on_close fires once, on a user or page close. on_destroyed runs on every destruction and must + // touch host-side state only. + DockPanel(wxWindow* parent, + const std::string& html, + MessageHandler on_message, + CloseHandler on_close, + CloseHandler on_destroyed); + ~DockPanel() override; + + // Main thread only. + void push_message(const nlohmann::json& data); + // Fires on_close, then removes the pane. + void request_close(); + // Removes the pane without on_close, for plugin unload. Destroys at once: unload always comes from + // the host, never from this panel's own callbacks. + void destroy_silently(); + // Fires on_close at most once; also run by the pane's own close button. + void fire_close(); + +protected: + std::optional page_html() override { return m_html; } + bool on_page_message(const std::string& kind, const nlohmann::json& data) override; + +private: + void remove_pane(); + + std::string m_html; + bool m_closing{false}; + MessageHandler m_on_message; + CloseHandler m_on_close; + CloseHandler m_on_destroyed; +}; + +}} // namespace Slic3r::GUI diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp index 425dda8dab..7eccc74980 100644 --- a/src/slic3r/GUI/GCodeViewer.cpp +++ b/src/slic3r/GUI/GCodeViewer.cpp @@ -108,6 +108,31 @@ static std::string get_view_type_string(libvgcode::EViewType view_type) return ""; } +// ORCA: Stable, locale independent names used to persist a view type in the application config. +// Keep these in sync with the entries of libvgcode::EViewType exposed in the preview combo box. +static const std::vector>& view_type_config_map() +{ + static const std::vector> map = { + { "summary", libvgcode::EViewType::Summary }, + { "feature_type", libvgcode::EViewType::FeatureType }, + { "color_print", libvgcode::EViewType::ColorPrint }, + { "speed", libvgcode::EViewType::Speed }, + { "actual_speed", libvgcode::EViewType::ActualSpeed }, + { "acceleration", libvgcode::EViewType::Acceleration }, + { "jerk", libvgcode::EViewType::Jerk }, + { "height", libvgcode::EViewType::Height }, + { "width", libvgcode::EViewType::Width }, + { "volumetric_flow_rate", libvgcode::EViewType::VolumetricFlowRate }, + { "actual_volumetric_flow_rate", libvgcode::EViewType::ActualVolumetricFlowRate }, + { "layer_time_linear", libvgcode::EViewType::LayerTimeLinear }, + { "layer_time_logarithmic", libvgcode::EViewType::LayerTimeLogarithmic }, + { "fan_speed", libvgcode::EViewType::FanSpeed }, + { "temperature", libvgcode::EViewType::Temperature }, + { "pressure_advance", libvgcode::EViewType::PressureAdvance }, + }; + return map; +} + // Find an index of a value in a sorted vector, which is in . // Returns -1 if there is no such member. static int find_close_layer_idx(const std::vector &zs, double &z, double eps) @@ -1100,9 +1125,7 @@ void GCodeViewer::init(ConfigOptionMode mode, PresetBundle* preset_bundle) // Default view type at first slice. // May be overridden in load() once we know how many tools are actually used in the G-code. m_nozzle_nums = preset_bundle ? preset_bundle->get_printer_extruder_count() : 1; - auto it = std::find(view_type_items.begin(), view_type_items.end(), libvgcode::EViewType::FeatureType); - m_view_type_sel = (it != view_type_items.end()) ? std::distance(view_type_items.begin(), it) : 0; - set_view_type(libvgcode::EViewType::FeatureType); + apply_default_view_type(); BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": finished"); } @@ -1123,6 +1146,73 @@ void GCodeViewer::set_scale(float scale) } } +// ORCA: Preview default view type preference, see "preview_default_view_type" in the application config. +std::string GCodeViewer::view_type_to_config_name(libvgcode::EViewType type) +{ + for (const auto& [name, value] : view_type_config_map()) { + if (value == type) + return name; + } + return std::string(); +} + +bool GCodeViewer::view_type_from_config_name(const std::string& name, libvgcode::EViewType& type) +{ + for (const auto& [config_name, value] : view_type_config_map()) { + if (config_name == name) { + type = value; + return true; + } + } + return false; +} + +std::vector> GCodeViewer::default_view_type_choices() +{ + std::vector> choices = { + { "auto", _u8L("Automatic") }, + { "last", _u8L("Last used") }, + }; + for (const auto& [name, type] : view_type_config_map()) + choices.push_back({ name, get_view_type_string(type) }); + return choices; +} + +void GCodeViewer::select_view_type(libvgcode::EViewType type) +{ + auto it = std::find(view_type_items.begin(), view_type_items.end(), type); + m_view_type_sel = (it != view_type_items.end()) ? static_cast(std::distance(view_type_items.begin(), it)) : 0; + set_view_type(type); +} + +// ORCA: Pick the view type the preview opens with, following the "preview_default_view_type" preference: +// a fixed view type, the one the user picked last ("last"), or the automatic choice ("auto", the default) +// which shows Filament for multi material prints and Line Type for single material ones. +// The default is only (re)applied when it actually changes, so a view type picked by hand survives a reslice. +void GCodeViewer::apply_default_view_type() +{ + const std::string preference = wxGetApp().app_config->get("preview_default_view_type"); + + std::string key = preference; + libvgcode::EViewType type = libvgcode::EViewType::FeatureType; + if (preference == "last") { + if (!view_type_from_config_name(wxGetApp().app_config->get("preview_last_view_type"), type)) + type = libvgcode::EViewType::FeatureType; + } + else if (!view_type_from_config_name(preference, type)) { + // "auto", or an unknown value written by a newer version + const bool multi_material = m_viewer.get_used_extruders_count() > 1; + type = multi_material ? libvgcode::EViewType::ColorPrint : libvgcode::EViewType::FeatureType; + key = multi_material ? "auto_multi_material" : "auto_single_material"; + } + + if (m_applied_default_view_type_key == key) + return; + + m_applied_default_view_type_key = key; + select_view_type(type); +} + void GCodeViewer::update_by_mode(ConfigOptionMode mode) { view_type_items.clear(); @@ -1404,27 +1494,8 @@ void GCodeViewer::load_as_gcode(const GCodeProcessorResult& gcode_result, const // load_toolpaths(gcode_result, build_volume, exclude_bounding_box); - // ORCA: Apply smart default view type when extruder count changes. - // Multi-color: ColorPrint (Filament), Single-color: FeatureType (Line Type). - // User selections persist within same extruder count, defaults reapply on count change. - int current_count = m_viewer.get_used_extruders_count(); - if (current_count > 1) { - if (m_last_extruder_count_default_applied != 2) { - auto it = std::find(view_type_items.begin(), view_type_items.end(), libvgcode::EViewType::ColorPrint); - if (it != view_type_items.end()) - m_view_type_sel = std::distance(view_type_items.begin(), it); - set_view_type(libvgcode::EViewType::ColorPrint); - m_last_extruder_count_default_applied = 2; - } - } else { - if (m_last_extruder_count_default_applied != 1) { - auto it = std::find(view_type_items.begin(), view_type_items.end(), libvgcode::EViewType::FeatureType); - if (it != view_type_items.end()) - m_view_type_sel = std::distance(view_type_items.begin(), it); - set_view_type(libvgcode::EViewType::FeatureType); - m_last_extruder_count_default_applied = 1; - } - } + // ORCA: Apply the default view type now that we know how many tools the G-code actually uses. + apply_default_view_type(); // BBS: data for rendering color arrangement recommendation m_nozzle_nums = print.config().option("nozzle_diameter")->values.size(); @@ -1851,7 +1922,7 @@ void GCodeViewer::render_scene(int canvas_width, int canvas_height) glsafe(::glEnable(GL_DEPTH_TEST)); render_shells(canvas_width, canvas_height); - if (m_viewer.get_extrusion_roles().empty()) + if (m_viewer.get_extrusion_roles_count() == 0) return; render_toolpaths(); @@ -2046,6 +2117,29 @@ void GCodeViewer::render_scene(int canvas_width, int canvas_height) } } +void GCodeViewer::render_shadow_casters(const Transform3d& light_view_matrix, const Transform3d& light_projection_matrix, const Vec3d& light_position) +{ + if (!has_data()) + return; + + m_viewer.render_shadow_casters( + libvgcode::convert(static_cast(light_view_matrix.matrix().cast())), + libvgcode::convert(static_cast(light_projection_matrix.matrix().cast())), + libvgcode::convert(static_cast(light_position.cast()))); +} + +void GCodeViewer::set_shadow_map(int texture_unit, const Transform3d& light_view_projection, float intensity, float texel_size) +{ + m_viewer.set_shadow_map(texture_unit, + libvgcode::convert(static_cast(light_view_projection.matrix().cast())), + intensity, texel_size); +} + +void GCodeViewer::set_tone(float exposure, float saturation) +{ + m_viewer.set_tone(exposure, saturation); +} + void GCodeViewer::render_overlay(int canvas_width, int canvas_height, int right_margin) { if (m_viewer.get_extrusion_roles().empty()) @@ -3832,6 +3926,12 @@ void GCodeViewer::render_legend(float &legend_height, int canvas_width, int canv std::vector>> ret; ret.reserve(custom_gcode_per_print_z.size()); + // Loop invariant, but built lazily: this lambda runs once per extruder on every frame + // and most prints reach neither colour change below, so fetching it up front would cost + // more than the per-item fetch it replaces. + std::vector zs; + bool zs_built = false; + for (const auto& item : custom_gcode_per_print_z) { if (extruder_id + 1 != static_cast(item.extruder)) continue; @@ -3839,7 +3939,10 @@ void GCodeViewer::render_legend(float &legend_height, int canvas_width, int canv if (item.type != ColorChange) continue; - const std::vector zs = m_viewer.get_layers_zs(); + if (!zs_built) { + zs = m_viewer.get_layers_zs(); + zs_built = true; + } auto lower_b = std::lower_bound(zs.begin(), zs.end(), static_cast(item.print_z - epsilon())); if (lower_b == zs.end()) @@ -3964,6 +4067,10 @@ void GCodeViewer::render_legend(float &legend_height, int canvas_width, int canv m_view_type_sel = i; set_view_type(view_type_items[m_view_type_sel]); reset_visible(view_type_items[m_view_type_sel]); + // ORCA: remember the pick so the "Last used" preview default can restore it + const std::string view_type_name = view_type_to_config_name(view_type_items[m_view_type_sel]); + if (!view_type_name.empty()) + wxGetApp().app_config->set("preview_last_view_type", view_type_name); update_moves_slider(); #if ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT imgui.set_requires_extra_frame(); @@ -4988,6 +5095,8 @@ void GCodeViewer::render_legend(float &legend_height, int canvas_width, int canv // ORCA: Get layer Zs as doubles std::vector layer_zs = get_layers_zs(); + // loop invariant, same reason as the layer Zs above + const std::vector layer_times = m_viewer.get_layers_estimated_times(); for (Slic3r::CustomGCode::Item custom_gcode : custom_gcode_per_print_z) { ImGui::Dummy({window_padding, window_padding}); @@ -5007,7 +5116,6 @@ void GCodeViewer::render_legend(float &legend_height, int canvas_width, int canv imgui.text(buf); ImGui::SameLine(max_len * 1.5); - std::vector layer_times = m_viewer.get_layers_estimated_times(); float custom_gcode_time = 0; if (layer > 0) { @@ -5056,7 +5164,7 @@ void GCodeViewer::render_legend(float &legend_height, int canvas_width, int canv std::string print_str = _u8L("Model printing time"); std::string total_str = _u8L("Total time"); float max_len = window_padding + 2 * ImGui::GetStyle().ItemSpacing.x; - if (m_viewer.get_layers_estimated_times().empty()) + if (m_viewer.get_layers_count() == 0) max_len += ImGui::CalcTextSize(total_str.c_str()).x; else { if (m_viewer.get_view_type() == libvgcode::EViewType::FeatureType) diff --git a/src/slic3r/GUI/GCodeViewer.hpp b/src/slic3r/GUI/GCodeViewer.hpp index 7f9ae333c7..9b496f0f2c 100644 --- a/src/slic3r/GUI/GCodeViewer.hpp +++ b/src/slic3r/GUI/GCodeViewer.hpp @@ -318,7 +318,8 @@ private: std::vector view_type_items; std::vector view_type_items_str; int m_view_type_sel = 0; - int m_last_extruder_count_default_applied{0}; // 0=unset, 1=single, 2+=multi + // ORCA: which default view type was last applied, see apply_default_view_type(). Empty until the first one is applied. + std::string m_applied_default_view_type_key; std::vector options_items; bool m_legend_visible{ true }; @@ -369,6 +370,13 @@ public: void render_scene(int canvas_width, int canvas_height); // Legend, sliders, the marker's position window and the G-code window, all ImGui. void render_overlay(int canvas_width, int canvas_height, int right_margin); + // ORCA: realistic view. Depth-only pass drawing the toolpaths as the light sees them, into + // the shadow map the caller has bound, and the map they sample back in render_scene. + void render_shadow_casters(const Transform3d& light_view_matrix, const Transform3d& light_projection_matrix, const Vec3d& light_position); + void set_shadow_map(int texture_unit, const Transform3d& light_view_projection, float intensity, float texel_size); + // ORCA: tone applied to the shaded toolpaths, paying back the light the lighting term, + // the shadow and the SSAO pass each take off. 1.0/1.0 is a no-op. + void set_tone(float exposure, float saturation); //BBS // void _render_calibration_thumbnail_internal(ThumbnailData& thumbnail_data, const ThumbnailsParams& thumbnail_params, PartPlateList& partplate_list, OpenGLManager& opengl_manager); // void _render_calibration_thumbnail_framebuffer(ThumbnailData& thumbnail_data, unsigned int w, unsigned int h, const ThumbnailsParams& thumbnail_params, PartPlateList& partplate_list, OpenGLManager& opengl_manager); @@ -414,6 +422,16 @@ public: void set_view_type(libvgcode::EViewType type) { m_viewer.set_view_type(type); } + // ORCA: select a view type in the preview combo box and apply it + void select_view_type(libvgcode::EViewType type); + // ORCA: apply the "preview_default_view_type" preference, see the definition for the supported values + void apply_default_view_type(); + + // ORCA: stable, locale independent name of a view type, as stored in the application config + static std::string view_type_to_config_name(libvgcode::EViewType type); + static bool view_type_from_config_name(const std::string& name, libvgcode::EViewType& type); + // ORCA: (config value, translated label) pairs for the "preview_default_view_type" preference combo box + static std::vector> default_view_type_choices(); void reset_visible(libvgcode::EViewType type) { if (type == libvgcode::EViewType::FeatureType) { auto roles = m_viewer.get_extrusion_roles(); diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index d2a86bd30a..18fa0418aa 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -20,6 +20,7 @@ #include "libslic3r/AppConfig.hpp" #include "3DScene.hpp" #include "BackgroundSlicingProcess.hpp" +#include "CameraUtils.hpp" #include "GLShader.hpp" #include "GUI.hpp" #include "Tab.hpp" @@ -29,6 +30,7 @@ #include "MainFrame.hpp" #include "WipeTowerDialog.hpp" #include "GUI_App.hpp" +#include "Shortcuts.hpp" #include "GUI_ObjectList.hpp" #include "GUI_Colors.hpp" #include "Mouse3DController.hpp" @@ -42,6 +44,7 @@ #include "slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp" #include "slic3r/Utils/UndoRedo.hpp" #include "slic3r/Utils/MacDarkMode.hpp" +#include "slic3r/plugin/PluginManager.hpp" #include @@ -77,6 +80,7 @@ #include #include #include +#include #ifndef IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS @@ -114,6 +118,36 @@ void GLCanvas3D::load_render_colors() namespace Slic3r { namespace GUI { +static void pan_camera(Camera& camera, const Vec2d& screen_delta, const Vec3d& anchor) +{ + // Orca: Derive world-units-per-pixel from the projection which produced the visible frame. + // Perspective additionally scales with the eye-space depth of the point being dragged. + const auto& viewport = camera.get_viewport(); + const auto& projection = camera.get_projection_matrix().matrix(); + const double depth_scale = camera.get_type() == Camera::EType::Perspective ? + (anchor - camera.get_position()).dot(camera.get_dir_forward()) : 1.0; + const double projection_x = projection(0, 0) * viewport[2]; + const double projection_y = projection(1, 1) * viewport[3]; + + // Orca: X/Y projection coefficients already include zoom. Using them directly avoids a + // project/unproject round-trip through window depth, whose precision depends on the scene frustum. + if (viewport[2] > 0 && viewport[3] > 0 && anchor.allFinite() && depth_scale > EPSILON && + std::abs(projection_x) > EPSILON && std::abs(projection_y) > EPSILON) { + const Vec3d displacement = 2.0 * depth_scale * + (screen_delta.y() / projection_y * camera.get_dir_up() - + screen_delta.x() / projection_x * camera.get_dir_right()); + if (displacement.allFinite()) { + camera.translate(displacement); + return; + } + } + + // Orca: Preserve the former target-plane behavior if the projection or anchor is invalid. + // Screen Y grows downward, and the camera moves opposite to the drag. + camera.translate(camera.get_inv_zoom() * + (screen_delta.y() * camera.get_dir_up() - screen_delta.x() * camera.get_dir_right())); +} + #ifdef __WXGTK3__ // wxGTK3 seems to simulate OSX behavior in regard to HiDPI scaling support. RetinaHelper::RetinaHelper(wxWindow* window) : m_window(window), m_self(nullptr) {} @@ -1055,7 +1089,6 @@ wxDEFINE_EVENT(EVT_GLCANVAS_UPDATE_BED_SHAPE, SimpleEvent); wxDEFINE_EVENT(EVT_GLCANVAS_TAB, SimpleEvent); wxDEFINE_EVENT(EVT_GLCANVAS_RESETGIZMOS, SimpleEvent); wxDEFINE_EVENT(EVT_GLCANVAS_MOVE_SLIDERS, wxKeyEvent); -wxDEFINE_EVENT(EVT_GLCANVAS_EDIT_COLOR_CHANGE, wxKeyEvent); wxDEFINE_EVENT(EVT_GLCANVAS_JUMP_TO, wxKeyEvent); wxDEFINE_EVENT(EVT_GLCANVAS_UNDO, SimpleEvent); wxDEFINE_EVENT(EVT_GLCANVAS_REDO, SimpleEvent); @@ -1174,7 +1207,6 @@ GLCanvas3D::GLCanvas3D(wxGLCanvas* canvas, Bed3D &bed) , m_dynamic_background_enabled(false) , m_multisample_allowed(false) , m_moving(false) - , m_tab_down(false) , m_camera_movement(false) , m_cursor_type(Standard) , m_color_by("volume") @@ -2207,21 +2239,20 @@ void GLCanvas3D::_render_scene(const Camera& camera, const Size& cnv_size) // Recorded by PartPlate::render_icons() below, when it runs. wxGetApp().plater()->get_partplate_list().clear_hover_tooltip(); glsafe(::glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)); - // Invalidate the shadow map each frame; only the View3D path below rebuilds it. This keeps - // the Preview / Assemble canvases from sampling a stale map with an outdated light matrix. + // Invalidate the shadow map each frame; the View3D and Preview paths below rebuild it. This + // keeps the Assemble canvas from sampling a stale map with an outdated light matrix. m_shadow_map_valid = false; _render_background(); //BBS add partplater rendering logic - bool only_current = false, only_body = false, no_partplate = false; + bool only_current = false, only_body = false; + const bool show_bed = is_bed_visible(); bool show_grid = true; GLGizmosManager::EType gizmo_type = m_gizmos.get_current_type(); if (!m_main_toolbar.is_enabled()) { //only_body = true; only_current = true; } - else if ((gizmo_type == GLGizmosManager::FdmSupports) || (gizmo_type == GLGizmosManager::Seam) || (gizmo_type == GLGizmosManager::MmSegmentation) || (gizmo_type == GLGizmosManager::FuzzySkin)) - no_partplate = true; else if (gizmo_type == GLGizmosManager::BrimEars && !camera.is_looking_downward()) show_grid = false; if (m_axes_at_bed_center) @@ -2235,11 +2266,11 @@ void GLCanvas3D::_render_scene(const Camera& camera, const Size& cnv_size) if (m_canvas_type == ECanvasType::CanvasView3D) { // m_show_bed gates the plate list too: hiding the bed but leaving its grid and outline // floating would read as a rendering fault rather than a deliberate view option. - if (!no_partplate && m_show_bed) + if (show_bed) _render_bed(camera.get_view_matrix(), camera.get_projection_matrix(), !camera.is_looking_downward(), m_show_world_axes); - if (!no_partplate && m_show_bed) //BBS: add outline logic + if (show_bed) //BBS: add outline logic _render_platelist(camera.get_view_matrix(), camera.get_projection_matrix(), !camera.is_looking_downward(), only_current, only_body, hover_id, true, show_grid); - if (m_axes_at_bed_center && m_show_bed && !no_partplate) + if (m_axes_at_bed_center && show_bed) // Design tab: replace the plate's corner-origin grid with the origin-centred CAD grid. _render_cad_grid(camera.get_view_matrix(), camera.get_projection_matrix()); @@ -2259,6 +2290,8 @@ void GLCanvas3D::_render_scene(const Camera& camera, const Size& cnv_size) _render_selection(); _render_bed(camera.get_view_matrix(), camera.get_projection_matrix(), !camera.is_looking_downward(), m_show_world_axes); _render_platelist(camera.get_view_matrix(), camera.get_projection_matrix(), !camera.is_looking_downward(), only_current, true, hover_id); + // Realistic view: the print casts a shadow onto the plate here as it does in View3D. + _render_shadows(camera.get_view_matrix(), camera.get_projection_matrix()); // BBS: GUI refactor: add canvas size as parameters _render_gcode(cnv_size.get_width(), cnv_size.get_height()); } @@ -3237,6 +3270,9 @@ void GLCanvas3D::bind_event_handlers() m_canvas->Bind(wxEVT_PAINT, &GLCanvas3D::on_paint, this); m_canvas->Bind(wxEVT_SET_FOCUS, &GLCanvas3D::on_set_focus, this); m_canvas->Bind(wxEVT_KILL_FOCUS, [this](wxFocusEvent& evt) { + // The key-up that would commit a keyboard edit goes to whatever took the focus. + if (m_selection_edit.kind != SelectionEdit::None) + finish_selection_edit(); ImGui::SetWindowFocus(nullptr); render(); evt.Skip(); @@ -3283,6 +3319,9 @@ void GLCanvas3D::unbind_event_handlers() m_canvas->Unbind(wxEVT_GESTURE_PAN, &GLCanvas3D::on_gesture, this); m_canvas->Unbind(wxEVT_GESTURE_ZOOM, &GLCanvas3D::on_gesture, this); m_canvas->Unbind(wxEVT_GESTURE_ROTATE, &GLCanvas3D::on_gesture, this); +#if __WXOSX__ + initGestures(m_canvas->GetHandle(), nullptr); +#endif } } @@ -3366,8 +3405,6 @@ void GLCanvas3D::on_char(wxKeyEvent& evt) // see include/wx/defs.h enum wxKeyCode int keyCode = evt.GetKeyCode(); - int ctrlMask = wxMOD_CONTROL; - int shiftMask = wxMOD_SHIFT; auto imgui = wxGetApp().imgui(); if (imgui->update_key_data(evt)) { @@ -3375,6 +3412,11 @@ void GLCanvas3D::on_char(wxKeyEvent& evt) return; } +#ifdef SLIC3R_CAD + const int ctrlMask = wxMOD_CONTROL; + const int shiftMask = wxMOD_SHIFT; +#endif + // Design tab: Delete/Backspace removes the selected sketch entities while a // sketch tool is active and the canvas has focus (dialog text fields are separate // wx controls, so this never eats their editing keys). @@ -3433,12 +3475,6 @@ void GLCanvas3D::on_char(wxKeyEvent& evt) } #endif - bool is_in_painting_mode = false; - GLGizmoPainterBase *current_gizmo_painter = dynamic_cast(get_gizmos_manager().get_current()); - if (current_gizmo_painter != nullptr) { - is_in_painting_mode = true; - } - //BBS: add orient deactivate logic if (keyCode == WXK_ESCAPE && (_deactivate_arrange_menu() || _deactivate_orient_menu())) @@ -3447,361 +3483,271 @@ void GLCanvas3D::on_char(wxKeyEvent& evt) if (m_gizmos.on_char(evt)) return; - if ((evt.GetModifiers() & ctrlMask) != 0) { - // CTRL is pressed - switch (keyCode) { -#ifdef __APPLE__ - case 'a': - case 'A': -#else /* __APPLE__ */ - case WXK_CONTROL_A: -#endif /* __APPLE__ */ - if (!is_in_painting_mode && !m_layers_editing.is_enabled()) { - if (evt.ShiftDown()) - post_event(SimpleEvent(EVT_GLCANVAS_SELECT_ALL)); - else - post_event(SimpleEvent(EVT_GLCANVAS_SELECT_CURR_PLATE_ALL)); - } + if (const KeyChord chord = KeyChord::from_event(evt); chord.is_punctuation() && handle_shortcut(chord)) + return; + + if (evt.HasModifiers()) { + evt.Skip(); + return; + } + + auto obj_list = wxGetApp().obj_list(); + switch (keyCode) + { + case WXK_ESCAPE: { deselect_all(); break; } + + // BBS: use keypad to change extruder + case '1': { + if (!m_timer_set_color.IsRunning()) { + m_timer_set_color.StartOnce(500); + break; + } + } + case '0': //Color logic for material 10 + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': { + if (m_timer_set_color.IsRunning()) { + if (keyCode < '7') keyCode += 10; + m_timer_set_color.Stop(); + } + if (m_gizmos.get_current_type() != GLGizmosManager::MmSegmentation) + obj_list->set_extruder_for_selected_items(keyCode - '0'); break; -#ifdef __APPLE__ - case 'c': - case 'C': -#else /* __APPLE__ */ - case WXK_CONTROL_C: -#endif /* __APPLE__ */ - if (!is_in_painting_mode) - post_event(SimpleEvent(EVT_GLTOOLBAR_COPY)); - break; -#ifdef __APPLE__ - case 'm': - case 'M': -#else /* __APPLE__ */ - case WXK_CONTROL_M: -#endif /* __APPLE__ */ - { -#ifdef _WIN32 - if (wxGetApp().app_config->get("use_legacy_3DConnexion") == "true") { -#endif //_WIN32 -#ifdef __APPLE__ - // On OSX use Cmd+Shift+M to "Show/Hide 3Dconnexion devices settings dialog" - if ((evt.GetModifiers() & shiftMask) != 0) { -#endif // __APPLE__ - Mouse3DController& controller = wxGetApp().plater()->get_mouse3d_controller(); - controller.show_settings_dialog(!controller.is_settings_dialog_shown()); - m_dirty = true; -#ifdef __APPLE__ - } - else - // and Cmd+M to minimize application - wxGetApp().mainframe->Iconize(); -#endif // __APPLE__ -#ifdef _WIN32 - } -#endif //_WIN32 - break; - } -#ifdef __APPLE__ - case 'v': - case 'V': -#else /* __APPLE__ */ - case WXK_CONTROL_V: -#endif /* __APPLE__ */ - if (!is_in_painting_mode) - post_event(SimpleEvent(EVT_GLTOOLBAR_PASTE)); - break; - -#ifdef __APPLE__ - case 'x': - case 'X': -#else /* __APPLE__ */ - case WXK_CONTROL_X: -#endif /* __APPLE__ */ - if (!is_in_painting_mode) - post_event(SimpleEvent(EVT_GLTOOLBAR_CUT)); - break; - -#ifdef __APPLE__ - case 'f': - case 'F': -#else /* __APPLE__ */ - case WXK_CONTROL_F: -#endif /* __APPLE__ */ - break; - - -#ifdef __APPLE__ - case 'y': - case 'Y': -#else /* __APPLE__ */ - case WXK_CONTROL_Y: -#endif /* __APPLE__ */ - if (m_canvas_type == CanvasView3D || m_canvas_type == CanvasAssembleView) { - post_event(SimpleEvent(EVT_GLCANVAS_REDO)); - } - break; -#ifdef __APPLE__ - case 'z': - case 'Z': -#else /* __APPLE__ */ - case WXK_CONTROL_Z: -#endif /* __APPLE__ */ - // only support redu/undo in CanvasView3D - if (m_canvas_type == CanvasView3D || m_canvas_type == CanvasAssembleView) { - post_event(SimpleEvent(EVT_GLCANVAS_UNDO)); - } - break; - - // BBS -#ifdef __APPLE__ - case 'E': - case 'e': -#else /* __APPLE__ */ - case WXK_CONTROL_E: -#endif /* __APPLE__ */ - { m_labels.show(!m_labels.is_shown()); m_dirty = true; break; } - case '0': { - select_view("plate"); - zoom_to_bed(); - break; } - case '1': { select_view("top"); break; } - case '2': { select_view("bottom"); break; } - case '3': { select_view("front"); break; } - case '4': { select_view("rear"); break; } - case '5': { select_view("left"); break; } - case '6': { select_view("right"); break; } - case '7': { select_plate(); break; } - - //case WXK_BACK: - //case WXK_DELETE: -#ifdef __APPLE__ - case 'd': - case 'D': -#else /* __APPLE__ */ - case WXK_CONTROL_D: -#endif /* __APPLE__ */ - post_event(SimpleEvent(EVT_GLTOOLBAR_DELETE_ALL)); - break; -#ifdef __APPLE__ - case 'k': - case 'K': -#else /* __APPLE__ */ - case WXK_CONTROL_K: -#endif /* __APPLE__ */ - post_event(SimpleEvent(EVT_GLTOOLBAR_CLONE)); - break; - default: evt.Skip(); - } - } else { - auto obj_list = wxGetApp().obj_list(); - switch (keyCode) - { - //case WXK_BACK: - case WXK_DELETE: { post_event(SimpleEvent(EVT_GLTOOLBAR_DELETE)); break; } - // BBS -#ifdef __APPLE__ - case WXK_BACK: { post_event(SimpleEvent(EVT_GLTOOLBAR_DELETE)); break; } -#endif - case WXK_ESCAPE: { deselect_all(); break; } - case WXK_F5: { - if (wxGetApp().mainframe->is_printer_view()) - wxGetApp().mainframe->load_printer_url(); - - //if ((wxGetApp().is_editor() && !wxGetApp().plater()->model().objects.empty()) || - // (wxGetApp().is_gcode_viewer() && !wxGetApp().plater()->get_last_loaded_gcode().empty())) - // post_event(SimpleEvent(EVT_GLCANVAS_RELOAD_FROM_DISK)); - break; - } - - // BBS: use keypad to change extruder - case '1': { - if (!m_timer_set_color.IsRunning()) { - m_timer_set_color.StartOnce(500); - break; - } - } - case '0': //Color logic for material 10 - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': { - if (m_timer_set_color.IsRunning()) { - if (keyCode < '7') keyCode += 10; - m_timer_set_color.Stop(); - } - if (m_gizmos.get_current_type() != GLGizmosManager::MmSegmentation) - obj_list->set_extruder_for_selected_items(keyCode - '0'); - break; - } - - case '+': { - if (dynamic_cast(m_canvas->GetParent()) != nullptr) - post_event(wxKeyEvent(EVT_GLCANVAS_EDIT_COLOR_CHANGE, evt)); - else - post_event(Event(EVT_GLCANVAS_INCREASE_INSTANCES, +1)); - break; - } - case '-': { - if (dynamic_cast(m_canvas->GetParent()) != nullptr) - post_event(wxKeyEvent(EVT_GLCANVAS_EDIT_COLOR_CHANGE, evt)); - else - post_event(Event(EVT_GLCANVAS_INCREASE_INSTANCES, -1)); - break; - } - case '?': { post_event(SimpleEvent(EVT_GLCANVAS_QUESTION_MARK)); break; } - case 'A': - case 'a': - { - if ((evt.GetModifiers() & shiftMask) != 0) - post_event(SimpleEvent(EVT_GLCANVAS_ARRANGE_PARTPLATE)); - else - post_event(SimpleEvent(EVT_GLCANVAS_ARRANGE)); - break; - } - //case 'B': - //case 'b': { zoom_to_bed(); break; } - case 'C': - case 'c': { wxGetApp().toggle_show_gcode_window(); m_dirty = true; request_extra_frame(); break; } - //case 'G': - //case 'g': { - // if ((evt.GetModifiers() & shiftMask) != 0) { - // if (dynamic_cast(m_canvas->GetParent()) != nullptr) - // post_event(wxKeyEvent(EVT_GLCANVAS_JUMP_TO, evt)); - // } - // break; - //} - case 'I': - case 'i': { _update_camera_zoom(1.0); break; } - //case 'K': - //case 'k': { wxGetApp().plater()->get_camera().select_next_type(); m_dirty = true; break; } - //case 'L': - //case 'l': { - //if (!m_main_toolbar.is_enabled()) { - // m_gcode_viewer.enable_legend(!m_gcode_viewer.is_legend_enabled()); - // m_dirty = true; - // wxGetApp().plater()->update_preview_bottom_toolbar(); - //} - //break; - //} - case 'O': - case 'o': { _update_camera_zoom(-1.0); break; } - case 'q': - case 'Q': - { - if ((evt.GetModifiers() & shiftMask) != 0) - post_event(SimpleEvent(EVT_GLCANVAS_ORIENT_PARTPLATE)); - else - post_event(SimpleEvent(EVT_GLCANVAS_ORIENT)); - break; - } - //case 'Z': - //case 'z': { - // if (!m_selection.is_empty()) - // zoom_to_selection(); - // else { - // if (!m_volumes.empty()) - // zoom_to_volumes(); - // else - // _zoom_to_box(m_gcode_viewer.get_paths_bounding_box()); - // } - // break; - //} - case 'v': - case 'V': { post_event(SimpleEvent(EVT_GLCANVAS_PRINTABLE)); break; } - default: { evt.Skip(); break; } - } + } + default: { evt.Skip(); break; } } } -class TranslationProcessor +bool GLCanvas3D::handle_shortcut(const KeyChord& chord) { - using UpAction = std::function; - using DownAction = std::function; + const ShortcutContext context = m_canvas_type == CanvasPreview ? ShortcutContext::Preview : ShortcutContext::Plater; + const std::optional match = wxGetApp().shortcuts().match(context, chord); + if (!match.has_value()) + return false; + const Shortcut shortcut = match->shortcut; + const int held = match->step_modifiers; + if (m_key_down.repeat && !shortcut_info(shortcut).repeatable) + return true; - UpAction m_up_action{ nullptr }; - DownAction m_down_action{ nullptr }; + const bool painting = dynamic_cast(m_gizmos.get_current()) != nullptr; + const bool can_edit = m_canvas_type == CanvasView3D || m_canvas_type == CanvasAssembleView; + auto edit_selection = [this](SelectionEdit::Kind kind, const Vec3d& direction) { + if (!m_gizmos.is_enabled() || m_selection.is_empty() || m_canvas_type == CanvasAssembleView) + return false; + m_selection_edit.kind = kind; + m_selection_edit.key = m_key_down.code; + m_selection_edit.direction = direction; + return true; + }; + auto move_selection = [&](const Vec3d& direction) { + if (edit_selection(SelectionEdit::Move, direction)) + apply_selection_move((held & wxMOD_SHIFT) != 0, (held & wxMOD_CONTROL) != 0); + }; + auto rotate_selection = [&](double angle_z_rad) { + if (edit_selection(SelectionEdit::Rotate, Vec3d::UnitZ())) + apply_selection_rotate(angle_z_rad); + }; + auto step_slider = [this, held](auto&& step) { + IMSlider* layers = get_gcode_viewer().get_layers_slider(); + IMSlider* moves = get_gcode_viewer().get_moves_slider(); + step(layers, moves, held != 0 ? 5 : 1); + if (layers->is_dirty() && layers->is_one_layer()) + layers->SetLowerValue(layers->GetHigherValue()); + m_dirty = true; + }; - bool m_running{ false }; - Vec3d m_direction{ Vec3d::UnitX() }; - -public: - TranslationProcessor(UpAction up_action, DownAction down_action) - : m_up_action(up_action), m_down_action(down_action) - { - } - - void process(wxKeyEvent& evt) - { - const int keyCode = evt.GetKeyCode(); - wxEventType type = evt.GetEventType(); - if (type == wxEVT_KEY_UP) { - switch (keyCode) - { - case WXK_NUMPAD_LEFT: case WXK_LEFT: - case WXK_NUMPAD_RIGHT: case WXK_RIGHT: - case WXK_NUMPAD_UP: case WXK_UP: - case WXK_NUMPAD_DOWN: case WXK_DOWN: - { - m_running = false; - m_up_action(); - break; - } - default: { break; } - } - } - else if (type == wxEVT_KEY_DOWN) { - bool apply = false; - - switch (keyCode) - { - case WXK_SHIFT: - { - if (m_running) - apply = true; - - break; - } - case WXK_NUMPAD_LEFT: - case WXK_LEFT: - { - m_direction = -Vec3d::UnitX(); - apply = true; - break; - } - case WXK_NUMPAD_RIGHT: - case WXK_RIGHT: - { - m_direction = Vec3d::UnitX(); - apply = true; - break; - } - case WXK_NUMPAD_UP: - case WXK_UP: - { - m_direction = Vec3d::UnitY(); - apply = true; - break; - } - case WXK_NUMPAD_DOWN: - case WXK_DOWN: - { - m_direction = -Vec3d::UnitY(); - apply = true; - break; - } - default: { break; } - } - - if (apply) { - m_running = true; - m_down_action(m_direction, evt.ShiftDown(), evt.CmdDown()); - } + switch (shortcut) { + case Shortcut::SelectAll: + if (!painting && !m_layers_editing.is_enabled()) + post_event(SimpleEvent(EVT_GLCANVAS_SELECT_CURR_PLATE_ALL)); + break; + case Shortcut::SelectAllPlates: + if (!painting && !m_layers_editing.is_enabled()) + post_event(SimpleEvent(EVT_GLCANVAS_SELECT_ALL)); + break; + case Shortcut::Copy: if (!painting) post_event(SimpleEvent(EVT_GLTOOLBAR_COPY)); break; + case Shortcut::Paste: if (!painting) post_event(SimpleEvent(EVT_GLTOOLBAR_PASTE)); break; + case Shortcut::Cut: if (!painting) post_event(SimpleEvent(EVT_GLTOOLBAR_CUT)); break; + case Shortcut::Undo: if (can_edit) post_event(SimpleEvent(EVT_GLCANVAS_UNDO)); break; + case Shortcut::Redo: if (can_edit) post_event(SimpleEvent(EVT_GLCANVAS_REDO)); break; + case Shortcut::DeleteSelected: + if (!m_gizmos.on_delete_key()) + post_event(SimpleEvent(EVT_GLTOOLBAR_DELETE)); + break; + case Shortcut::DeleteAll: post_event(SimpleEvent(EVT_GLTOOLBAR_DELETE_ALL)); break; + case Shortcut::CloneSelected: post_event(SimpleEvent(EVT_GLTOOLBAR_CLONE)); break; + case Shortcut::AddInstance: post_event(Event(EVT_GLCANVAS_INCREASE_INSTANCES, +1)); break; + case Shortcut::RemoveInstance: post_event(Event(EVT_GLCANVAS_INCREASE_INSTANCES, -1)); break; + case Shortcut::TogglePrintable: post_event(SimpleEvent(EVT_GLCANVAS_PRINTABLE)); break; + case Shortcut::Arrange: + if (!m_gizmos.is_running()) + post_event(SimpleEvent(EVT_GLCANVAS_ARRANGE)); + break; + case Shortcut::ArrangePlate: + if (!m_gizmos.is_running()) + post_event(SimpleEvent(EVT_GLCANVAS_ARRANGE_PARTPLATE)); + break; + case Shortcut::Orient: post_event(SimpleEvent(EVT_GLCANVAS_ORIENT)); break; + case Shortcut::OrientPlate: post_event(SimpleEvent(EVT_GLCANVAS_ORIENT_PARTPLATE)); break; + case Shortcut::RotateSelectionLeft: rotate_selection(0.25 * M_PI); break; + case Shortcut::RotateSelectionRight: rotate_selection(-0.25 * M_PI); break; + case Shortcut::MoveSelectionLeft: move_selection(-Vec3d::UnitX()); break; + case Shortcut::MoveSelectionRight: move_selection(Vec3d::UnitX()); break; + case Shortcut::MoveSelectionUp: move_selection(Vec3d::UnitY()); break; + case Shortcut::MoveSelectionDown: move_selection(-Vec3d::UnitY()); break; + case Shortcut::ZoomIn: _update_camera_zoom(1.0); break; + case Shortcut::ZoomOut: _update_camera_zoom(-1.0); break; + case Shortcut::SwitchView: post_event(SimpleEvent(EVT_GLCANVAS_TAB)); break; + case Shortcut::CollapseSidebar: + if (!wxGetApp().is_gcode_viewer()) + post_event(SimpleEvent(EVT_GLCANVAS_COLLAPSE_SIDEBAR)); + break; + case Shortcut::ShowWireframe: + wxGetApp().plater()->toggle_show_wireframe(); + m_dirty = true; + break; + case Shortcut::Mouse3DSettings: { +#ifdef _WIN32 + if (wxGetApp().app_config->get("use_legacy_3DConnexion") == "true") { +#endif //_WIN32 + Mouse3DController& controller = wxGetApp().plater()->get_mouse3d_controller(); + controller.show_settings_dialog(!controller.is_settings_dialog_shown()); + m_dirty = true; +#ifdef _WIN32 } +#endif //_WIN32 + break; } -}; + case Shortcut::ReloadDevicePage: + if (wxGetApp().mainframe->is_printer_view()) + wxGetApp().mainframe->load_printer_url(); + break; + case Shortcut::KeyboardShortcuts: post_event(SimpleEvent(EVT_GLCANVAS_QUESTION_MARK)); break; + case Shortcut::ToggleGcodeWindow: + wxGetApp().toggle_show_gcode_window(); + m_dirty = true; + request_extra_frame(); + break; + case Shortcut::ToggleOneLayerMode: + get_gcode_viewer().get_layers_slider()->switch_one_layer_mode(); + m_dirty = true; + break; + case Shortcut::GoToLayer: + if (!m_gizmos.is_enabled()) { + get_gcode_viewer().get_layers_slider()->show_go_to_layer(true); + m_dirty = true; + } + break; + case Shortcut::LayerSliderUp: + case Shortcut::LayerSliderDown: + step_slider([up = shortcut == Shortcut::LayerSliderUp](IMSlider* layers, IMSlider* moves, int increment) { + const int delta = up ? increment : -increment; + if (layers->GetSelection() == ssHigher) { + layers->SetHigherValue(layers->GetHigherValue() + delta); + moves->SetHigherValue(moves->GetMaxValue()); + } + else if (layers->GetSelection() == ssLower) + layers->SetLowerValue(layers->GetLowerValue() + delta); + }); + break; + case Shortcut::MovesSliderLeft: + step_slider([](IMSlider* layers, IMSlider* moves, int increment) { + if (moves->GetHigherValue() == moves->GetMinValue() && layers->GetHigherValue() > layers->GetMinValue()) { + layers->SetHigherValue(layers->GetHigherValue() - 1); + moves->SetHigherValue(moves->GetMaxValue()); + } + else + moves->SetHigherValue(moves->GetHigherValue() - increment); + }); + break; + case Shortcut::MovesSliderRight: + step_slider([](IMSlider* layers, IMSlider* moves, int increment) { + if (moves->GetHigherValue() == moves->GetMaxValue() && layers->GetHigherValue() < layers->GetMaxValue()) { + layers->SetHigherValue(layers->GetHigherValue() + 1); + moves->SetHigherValue(moves->GetMinValue()); + } + else + moves->SetHigherValue(moves->GetHigherValue() + increment); + }); + break; + case Shortcut::MovesSliderStart: + case Shortcut::MovesSliderEnd: + step_slider([start = shortcut == Shortcut::MovesSliderStart](IMSlider*, IMSlider* moves, int) { + moves->SetHigherValue(start ? moves->GetMinValue() : moves->GetMaxValue()); + moves->set_as_dirty(); + }); + break; + default: + if (!m_gizmos.open_gizmo_by_shortcut(shortcut)) + return false; + m_dirty = true; + break; + } + return true; +} + +void GLCanvas3D::apply_selection_move(bool slow, bool camera_space) +{ + m_selection.setup_cache(); + const double multiplier = slow ? 1.0 : 10.0; + + Vec3d displacement; + if (camera_space) { + Eigen::Matrix inv_view_3x3 = wxGetApp().plater()->get_camera().get_view_matrix().inverse().matrix().block(0, 0, 3, 3); + displacement = multiplier * (inv_view_3x3 * m_selection_edit.direction); + displacement.z() = 0.0; + } + else + displacement = multiplier * m_selection_edit.direction; + + TransformationType trafo_type; + trafo_type.set_relative(); + m_selection.translate(displacement, trafo_type); + m_dirty = true; +} + +void GLCanvas3D::apply_selection_rotate(double angle_z_rad) +{ + m_selection.setup_cache(); + m_selection.rotate(angle_z_rad * m_selection_edit.direction, TransformationType(TransformationType::World_Relative_Joint)); + m_dirty = true; +} + +void GLCanvas3D::finish_selection_edit() +{ + const SelectionEdit::Kind kind = m_selection_edit.kind; + m_selection_edit.kind = SelectionEdit::None; + if (kind == SelectionEdit::Move) + do_move(L("Tool move")); + else + do_rotate(L("Tool Rotate")); + m_gizmos.update_data(); + // Let the plater know that the dragging finished, so a delayed refresh + // of the scene with the background processing data should be performed. + post_event(SimpleEvent(EVT_GLCANVAS_MOUSE_DRAGGING_FINISHED)); + // updates camera target constraints + refresh_camera_scene_box(); + m_dirty = true; +} + +// Keys held since their last key-up, shared by every canvas because a shortcut can move the +// focus, and with it the key-up, to another one. +static std::set s_keys_down; + +static bool key_repeats(int key) +{ + for (auto it = s_keys_down.begin(); it != s_keys_down.end();) // drops keys released while no canvas had the focus + it = wxGetKeyState(wxKeyCode(*it)) ? std::next(it) : s_keys_down.erase(it); + return !s_keys_down.insert(key).second; +} + +static void key_released(int key) { s_keys_down.erase(key); } void GLCanvas3D::on_key(wxKeyEvent& evt) { @@ -3819,45 +3765,11 @@ void GLCanvas3D::on_key(wxKeyEvent& evt) } #endif - static GLCanvas3D const * thiz = nullptr; - static TranslationProcessor translationProcessor(nullptr, nullptr); - if (thiz != this) { - thiz = this; - translationProcessor = TranslationProcessor( - [this]() { - do_move(L("Tool move")); - m_gizmos.update_data(); - - // BBS - //wxGetApp().obj_manipul()->set_dirty(); - // Let the plater know that the dragging finished, so a delayed refresh - // of the scene with the background processing data should be performed. - post_event(SimpleEvent(EVT_GLCANVAS_MOUSE_DRAGGING_FINISHED)); - // updates camera target constraints - refresh_camera_scene_box(); - m_dirty = true; - }, - [this](const Vec3d& direction, bool slow, bool camera_space) { - m_selection.setup_cache(); - double multiplier = slow ? 1.0 : 10.0; - - Vec3d displacement; - if (camera_space) { - Eigen::Matrix inv_view_3x3 = wxGetApp().plater()->get_camera().get_view_matrix().inverse().matrix().block(0, 0, 3, 3); - displacement = multiplier * (inv_view_3x3 * direction); - displacement.z() = 0.0; - } - else - displacement = multiplier * direction; - - TransformationType trafo_type; - trafo_type.set_relative(); - m_selection.translate(displacement, trafo_type); - m_dirty = true; - } - );} - const int keyCode = evt.GetKeyCode(); + if (evt.GetEventType() == wxEVT_KEY_DOWN) + m_key_down = { keyCode, key_repeats(keyCode) }; + else if (evt.GetEventType() == wxEVT_KEY_UP) + key_released(keyCode); auto imgui = wxGetApp().imgui(); if (imgui->update_key_data(evt)) @@ -3871,23 +3783,8 @@ void GLCanvas3D::on_key(wxKeyEvent& evt) wxGetApp().plater()->toggle_render_statistic_dialog(); m_dirty = true; #endif - } else if ((evt.ShiftDown() && evt.ControlDown() && keyCode == WXK_RETURN) || - (evt.ShiftDown() && evt.AltDown() && keyCode == WXK_RETURN)) { - wxGetApp().plater()->toggle_show_wireframe(); - m_dirty = true; - } - else if (m_tab_down && keyCode == WXK_TAB && !evt.HasAnyModifiers()) { - // Enable switching between 3D and Preview with Tab - // m_canvas->HandleAsNavigationKey(evt); // XXX: Doesn't work in some cases / on Linux - post_event(SimpleEvent(EVT_GLCANVAS_TAB)); - } - else if (keyCode == WXK_TAB && evt.ShiftDown() && !evt.ControlDown() && ! wxGetApp().is_gcode_viewer()) { - // Collapse side-panel with Shift+Tab - post_event(SimpleEvent(EVT_GLCANVAS_COLLAPSE_SIDEBAR)); } else if (keyCode == WXK_SHIFT) { - translationProcessor.process(evt); - if (m_picking_enabled && m_rectangle_selection.is_dragging()) { _update_selection_from_hover(); m_rectangle_selection.stop_dragging(); @@ -3913,70 +3810,15 @@ void GLCanvas3D::on_key(wxKeyEvent& evt) } else if (keyCode == WXK_CONTROL) m_dirty = true; - else if (m_gizmos.is_enabled() && !m_selection.is_empty() && m_canvas_type != CanvasAssembleView) { - translationProcessor.process(evt); - - switch (keyCode) - { - case WXK_NUMPAD_PAGEUP: case WXK_PAGEUP: - case WXK_NUMPAD_PAGEDOWN: case WXK_PAGEDOWN: - { - do_rotate(L("Tool Rotate")); - m_gizmos.update_data(); - - // BBS - //wxGetApp().obj_manipul()->set_dirty(); - // Let the plater know that the dragging finished, so a delayed refresh - // of the scene with the background processing data should be performed. - post_event(SimpleEvent(EVT_GLCANVAS_MOUSE_DRAGGING_FINISHED)); - // updates camera target constraints - refresh_camera_scene_box(); - m_dirty = true; - - break; - } - default: { break; } - } - } - - // BBS: add select view logic - if (evt.ControlDown()) { - switch (keyCode) { - case '0': - case WXK_NUMPAD0: //0 on numpad - { select_view("plate"); - zoom_to_bed(); - break; - } - case '1': - case WXK_NUMPAD1: //1 on numpad - { select_view("top"); break; } - case '2': - case WXK_NUMPAD2: //2 on numpad - { select_view("bottom"); break; } - case '3': - case WXK_NUMPAD3: //3 on numpad - { select_view("front"); break; } - case '4': - case WXK_NUMPAD4: //4 on numpad - { select_view("rear"); break; } - case '5': - case WXK_NUMPAD5: //5 on numpad - { select_view("left"); break; } - case '6': - case WXK_NUMPAD6: //6 on numpad - { select_view("right"); break; } - case '7': - case WXK_NUMPAD7: //7 on numpad - { select_plate(); break; } - default: break; - } - } + else if (m_selection_edit.kind != SelectionEdit::None && keyCode == m_selection_edit.key) + finish_selection_edit(); } else if (evt.GetEventType() == wxEVT_KEY_DOWN) { - m_tab_down = keyCode == WXK_TAB && !evt.HasAnyModifiers(); + if (handle_shortcut(KeyChord::from_event(evt))) + return; if (keyCode == WXK_SHIFT) { - translationProcessor.process(evt); + if (m_selection_edit.kind == SelectionEdit::Move) + apply_selection_move(true, evt.CmdDown()); if (m_picking_enabled /*&& (m_gizmos.get_current_type() != GLGizmosManager::SlaSupports)*/) { @@ -3993,68 +3835,6 @@ void GLCanvas3D::on_key(wxKeyEvent& evt) } else if (keyCode == WXK_CONTROL) m_dirty = true; - else if (m_gizmos.is_enabled() && !m_selection.is_empty() && m_canvas_type != CanvasAssembleView) { - auto _do_rotate = [this](double angle_z_rad) { - m_selection.setup_cache(); - m_selection.rotate(Vec3d(0.0, 0.0, angle_z_rad), TransformationType(TransformationType::World_Relative_Joint)); - m_dirty = true; -// wxGetApp().obj_manipul()->set_dirty(); - }; - - translationProcessor.process(evt); - - switch (keyCode) - { - case WXK_NUMPAD_PAGEUP: case WXK_PAGEUP: { _do_rotate(0.25 * M_PI); break; } - case WXK_NUMPAD_PAGEDOWN: case WXK_PAGEDOWN: { _do_rotate(-0.25 * M_PI); break; } - default: { break; } - } - } else if (!m_gizmos.is_enabled()) { - // DoubleSlider navigation in Preview - if (m_canvas_type == CanvasPreview) { - IMSlider *m_layers_slider = get_gcode_viewer().get_layers_slider(); - IMSlider *m_moves_slider = get_gcode_viewer().get_moves_slider(); - int increment = (evt.CmdDown() || evt.ShiftDown()) ? 5 : 1; - if ((evt.CmdDown() || evt.ShiftDown()) && evt.GetKeyCode() == 'G') { - m_layers_slider->show_go_to_layer(true); - } - else if (keyCode == WXK_UP || keyCode == WXK_DOWN) { - int new_pos; - if (m_layers_slider->GetSelection() == ssHigher) { - new_pos = keyCode == WXK_UP ? m_layers_slider->GetHigherValue() + increment : m_layers_slider->GetHigherValue() - increment; - m_layers_slider->SetHigherValue(new_pos); - m_moves_slider->SetHigherValue(m_moves_slider->GetMaxValue()); - } - else if (m_layers_slider->GetSelection() == ssLower) { - new_pos = keyCode == WXK_UP ? m_layers_slider->GetLowerValue() + increment : m_layers_slider->GetLowerValue() - increment; - m_layers_slider->SetLowerValue(new_pos); - } - } else if (keyCode == WXK_LEFT) { - if (m_moves_slider->GetHigherValue() == m_moves_slider->GetMinValue() && (m_layers_slider->GetHigherValue() > m_layers_slider->GetMinValue())) { - m_layers_slider->SetHigherValue(m_layers_slider->GetHigherValue() - 1); - m_moves_slider->SetHigherValue(m_moves_slider->GetMaxValue()); - } else { - m_moves_slider->SetHigherValue(m_moves_slider->GetHigherValue() - increment); - } - } else if (keyCode == WXK_RIGHT) { - if (m_moves_slider->GetHigherValue() == m_moves_slider->GetMaxValue() && (m_layers_slider->GetHigherValue() < m_layers_slider->GetMaxValue())) { - m_layers_slider->SetHigherValue(m_layers_slider->GetHigherValue() + 1); - m_moves_slider->SetHigherValue(m_moves_slider->GetMinValue()); - } else { - m_moves_slider->SetHigherValue(m_moves_slider->GetHigherValue() + increment); - } - } else if (keyCode == WXK_HOME || keyCode == WXK_END) { - const int new_pos = keyCode == WXK_HOME ? m_moves_slider->GetMinValue() : m_moves_slider->GetMaxValue(); - m_moves_slider->SetHigherValue(new_pos); - m_moves_slider->set_as_dirty(); - } - - if (m_layers_slider->is_dirty() && m_layers_slider->is_one_layer()) - m_layers_slider->SetLowerValue(m_layers_slider->GetHigherValue()); - - m_dirty = true; - } - } } } else return; @@ -4290,27 +4070,38 @@ void GLCanvas3D::on_gesture(wxGestureEvent &evt) auto & camera = wxGetApp().plater()->get_camera(); if (evt.GetEventType() == wxEVT_GESTURE_PAN) { - auto p = evt.GetPosition(); + // Orca: Gesture coordinates must use framebuffer pixels, and one stable world-space + // anchor must be retained for the complete gesture to prevent perspective drift. + const auto p = evt.GetPosition(); auto d = static_cast(evt).GetDelta(); - float z = 0; - const Vec3d &p2 = _mouse_to_3d({p.x, p.y}, &z); - const Vec3d &p1 = _mouse_to_3d({p.x - d.x, p.y - d.y}, &z); - camera.set_target(camera.get_target() + p1 - p2); + Vec2d screen_position(p.x, p.y); + Vec2d screen_delta(d.x, d.y); + apply_retina_scale(screen_position); + apply_retina_scale(screen_delta); + if (evt.IsGestureStart() || !m_gesture_pan_anchor.has_value()) + m_gesture_pan_anchor = get_camera_pan_anchor(camera, ECameraNavigationType::Gesture, + screen_position - screen_delta); + pan_camera(camera, screen_delta, *m_gesture_pan_anchor); + if (evt.IsGestureEnd()) + m_gesture_pan_anchor.reset(); } else if (evt.GetEventType() == wxEVT_GESTURE_ZOOM) { static float zoom_start = 1; if (evt.IsGestureStart()) zoom_start = camera.get_zoom(); camera.set_zoom(zoom_start * static_cast(evt).GetZoomFactor()); } else if (evt.GetEventType() == wxEVT_GESTURE_ROTATE) { - PartPlate* plate = wxGetApp().plater()->get_partplate_list().get_curr_plate(); + // Orca: Rotation starts a different navigation operation, so a previous pan anchor + // must not be reused; rotation and pan fallbacks share the same navigation pivot. + m_gesture_pan_anchor.reset(); bool rotate_limit = current_printer_technology() != ptSLA; static double last_rotate = 0; if (evt.IsGestureStart()) last_rotate = 0; auto rotate = static_cast(evt).GetRotationAngle() - last_rotate; last_rotate += rotate; - if (plate) - camera.rotate_on_sphere_with_target(-rotate, 0, rotate_limit, plate->get_bounding_box().center()); + const std::optional rotate_target = get_camera_orbit_target(ECameraNavigationType::Gesture); + if (rotate_target.has_value()) + camera.rotate_on_sphere_with_target(-rotate, 0, rotate_limit, *rotate_target); else camera.rotate_on_sphere(-rotate, 0, rotate_limit); camera.auto_type(Camera::EType::Perspective); @@ -4600,6 +4391,10 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt) post_event(SimpleEvent(EVT_GLCANVAS_SWITCH_TO_GLOBAL)); } else if (evt.LeftDown() || evt.RightDown() || evt.MiddleDown()) { + // Orca: Retain the click position even if the first motion event crosses a surface edge. + m_mouse.set_start_position_2D_as_invalid(); + m_mouse.drag.start_position_2D = pos; + //BBS: add orient deactivate logic if (!m_gizmos.on_mouse(evt)) { if (_deactivate_arrange_menu() || _deactivate_orient_menu()) @@ -4795,6 +4590,9 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt) } // do not process the dragging if the left mouse was set down in another canvas else if (is_camera_rotate(evt, button_mappings)) { + // Orca: Rotation and panning use different drag coordinates and cached anchors. + // Clear the pan state before processing rotation or switching buttons mid-drag. + m_mouse.set_start_position_2D_as_invalid(); if (!has_mouse_capture()) // ORCA keep tracking mouse position while drag active and cursor not in window bounds m_canvas->CaptureMouse(); @@ -4812,12 +4610,12 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt) if (this->m_canvas_type == ECanvasType::CanvasAssembleView || m_gizmos.get_current_type() == GLGizmosManager::FdmSupports || m_gizmos.get_current_type() == GLGizmosManager::Seam || m_gizmos.get_current_type() == GLGizmosManager::MmSegmentation || m_gizmos.get_current_type() == GLGizmosManager::FuzzySkin) { - Vec3d rotate_target = Vec3d::Zero(); - if (!m_selection.is_empty()) - rotate_target = m_selection.get_bounding_box().center(); + // Orca: Reuse the centralized pivot policy for scene-oriented tools. + const std::optional rotate_target = get_camera_orbit_target(ECameraNavigationType::Mouse); + if (rotate_target.has_value()) + camera.rotate_on_sphere_with_target(rot.x(), rot.y(), false, *rotate_target); else - rotate_target = volumes_bounding_box().center(); - camera.rotate_on_sphere_with_target(rot.x(), rot.y(), false, rotate_target); + camera.rotate_on_sphere(rot.x(), rot.y(), false); } else { if (wxGetApp().app_config->get_bool("use_free_camera")) @@ -4841,28 +4639,11 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt) } camera.rotate_on_sphere_with_target(rot.x(), rot.y(), rotate_limit, m_rotation_center); } else { - Vec3d rotate_target = Vec3d::Zero(); - if (m_canvas_type == ECanvasType::CanvasPreview) { - PartPlate *plate = wxGetApp().plater()->get_partplate_list().get_curr_plate(); - if (plate) - rotate_target = plate->get_bounding_box().center(); - } - else { - if (!m_selection.is_empty()) - rotate_target = m_selection.get_bounding_box().center(); - else { - // Rotate around the center of objects on current plate - auto bbox = volumes_bounding_box(true); - if (!bbox.defined) { - // Rotate around current plate center if current plate is empty - bbox = wxGetApp().plater()->get_partplate_list().get_curr_plate()->get_bounding_box(); - } - rotate_target = bbox.center(); - } - } - - if (!rotate_target.isZero()) - camera.rotate_on_sphere_with_target(rot.x(), rot.y(), rotate_limit, rotate_target); + // Orca: Keep regular mouse orbit and perspective-pan fallback centered + // on the same selection, active-plate, or scene reference. + const std::optional rotate_target = get_camera_orbit_target(ECameraNavigationType::Mouse); + if (rotate_target.has_value()) + camera.rotate_on_sphere_with_target(rot.x(), rot.y(), rotate_limit, *rotate_target); else camera.rotate_on_sphere(rot.x(), rot.y(), rotate_limit); } @@ -4878,16 +4659,14 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt) m_mouse.drag.start_position_3D = Vec3d((double)pos(0), (double)pos(1), 0.0); } else if (is_camera_pan(evt, button_mappings)) { + // Orca: Pan uses screen coordinates and must not inherit the rotation start point. + m_mouse.set_start_position_3D_as_invalid(); if (!has_mouse_capture()) // ORCA keep tracking mouse position while drag active and cursor not in window bounds m_canvas->CaptureMouse(); // if dragging with right button or if button functions swapped and dragging with left button over blank area then pan if (m_mouse.is_start_position_2D_defined()) { - // get point in model space at Z = 0 - float z = 0.0f; - const Vec3d& cur_pos = _mouse_to_3d(pos, &z); - Vec3d orig = _mouse_to_3d(m_mouse.drag.start_position_2D, &z); Camera& camera = wxGetApp().plater()->get_camera(); if (this->m_canvas_type != ECanvasType::CanvasAssembleView) { // Orca: Use a constrained camera when navigating the 3D scene with a regular mouse, if the free camera is not selected @@ -4899,7 +4678,14 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt) camera.recover_from_free_camera(); } - camera.set_target(camera.get_target() + orig - cur_pos); + // Orca: Cache the surface under the initial click and apply every incremental + // cursor delta at that depth, so perspective zoom and camera angle stay exact. + const Vec2d screen_delta = + pos.cast() - m_mouse.drag.start_position_2D.cast(); + if (!m_mouse.drag.camera_pan_anchor.has_value()) + m_mouse.drag.camera_pan_anchor = get_camera_pan_anchor(camera, ECameraNavigationType::Mouse, + m_mouse.drag.start_position_2D.cast()); + pan_camera(camera, screen_delta, *m_mouse.drag.camera_pan_anchor); m_dirty = true; m_mouse.ignore_right_up = true; // will be reset on button up event even if not right button is pressed } @@ -5300,8 +5086,16 @@ void GLCanvas3D::do_move(const std::string& snapshot_type) //BBS: nofity object list to update wxGetApp().plater()->sidebar().obj_list()->update_plate_values_for_items(); - if (object_moved) + if (object_moved) { + Slic3r::LifecycleEventContext ctx; + ctx.code = Slic3r::LifecycleEvtCode::Ok; + ctx.msg = "moved"; + if (done.size() == 1) + ctx.name = m_model->objects[done.begin()->first]->name; + Slic3r::fire_lifecycle_event(Slic3r::LifecycleEvent::ObjectTransformed, ctx); + post_event(SimpleEvent(EVT_GLCANVAS_INSTANCE_MOVED)); + } // BBS: support wipe-tower for multi-plates for (int plate_id = 0; plate_id < wipe_tower_origins.size(); plate_id++) { @@ -5426,8 +5220,16 @@ void GLCanvas3D::do_rotate(const std::string& snapshot_type) //BBS: nofity object list to update wxGetApp().plater()->sidebar().obj_list()->update_plate_values_for_items(); - if (!done.empty()) + if (!done.empty()) { + Slic3r::LifecycleEventContext ctx; + ctx.code = Slic3r::LifecycleEvtCode::Ok; + ctx.msg = "rotated"; + if (done.size() == 1) + ctx.name = m_model->objects[done.begin()->first]->name; + Slic3r::fire_lifecycle_event(Slic3r::LifecycleEvent::ObjectTransformed, ctx); + post_event(SimpleEvent(EVT_GLCANVAS_INSTANCE_ROTATED)); + } // IMEX: rotate changes per-instance transforms without touching the ghost cache key. wxGetApp().plater()->get_partplate_list().invalidate_all_imex_ghosts(); @@ -5521,8 +5323,16 @@ void GLCanvas3D::do_scale(const std::string& snapshot_type) //BBS: notify object info update wxGetApp().plater()->show_object_info(); - if (!done.empty()) + if (!done.empty()) { + Slic3r::LifecycleEventContext ctx; + ctx.code = Slic3r::LifecycleEvtCode::Ok; + ctx.msg = "scaled"; + if (done.size() == 1) + ctx.name = m_model->objects[done.begin()->first]->name; + Slic3r::fire_lifecycle_event(Slic3r::LifecycleEvent::ObjectTransformed, ctx); + post_event(SimpleEvent(EVT_GLCANVAS_INSTANCE_SCALED)); + } // IMEX: scale changes per-instance transforms without touching the ghost cache key. wxGetApp().plater()->get_partplate_list().invalidate_all_imex_ghosts(); @@ -7146,7 +6956,6 @@ bool GLCanvas3D::_init_main_toolbar() item.name = "add"; item.icon_filename = m_is_dark ? "toolbar_open_dark.svg" : "toolbar_open.svg"; - item.tooltip = _utf8(L("Add")) + " [" + GUI::shortkey_ctrl_prefix() + "I]"; item.sprite_id = 0; item.left.action_callback = [this]() { if (m_canvas != nullptr) wxPostEvent(m_canvas, SimpleEvent(EVT_GLTOOLBAR_ADD)); }; item.enabling_callback = []()->bool {return wxGetApp().plater()->can_add_model(); }; @@ -7164,7 +6973,6 @@ bool GLCanvas3D::_init_main_toolbar() item.name = "orient"; item.icon_filename = m_is_dark ? "toolbar_orient_dark.svg" : "toolbar_orient.svg"; - item.tooltip = _utf8(L("Auto orient all/selected objects")) + " [Q]\n" + _utf8(L("Auto orient all objects on current plate")) + " [" + _utf8(L("Shift+")) + "Q]"; item.sprite_id++; item.left.render_callback = nullptr; item.enabling_callback = []()->bool { return wxGetApp().plater()->can_arrange(); }; @@ -7186,7 +6994,6 @@ bool GLCanvas3D::_init_main_toolbar() item.name = "arrange"; item.icon_filename = m_is_dark ? "toolbar_arrange_dark.svg" : "toolbar_arrange.svg"; - item.tooltip = _utf8(L("Arrange all objects")) + " [A]\n" + _utf8(L("Arrange objects on selected plates")) + " [" + _utf8(L("Shift+")) + "A]"; item.sprite_id++; item.left.action_callback = []() {}; item.enabling_callback = []()->bool { return wxGetApp().plater()->can_arrange(); }; @@ -7210,7 +7017,6 @@ bool GLCanvas3D::_init_main_toolbar() item.name = "more"; item.icon_filename = m_is_dark ? "instance_add_dark.svg" : "instance_add.svg"; - item.tooltip = _utf8(L("Add instance")) + " [+]"; item.sprite_id++; item.left.render_callback = nullptr; item.left.action_callback = [this]() { if (m_canvas != nullptr) wxPostEvent(m_canvas, SimpleEvent(EVT_GLTOOLBAR_MORE)); }; @@ -7222,7 +7028,6 @@ bool GLCanvas3D::_init_main_toolbar() item.name = "fewer"; item.icon_filename = m_is_dark ? "instance_remove_dark.svg" : "instance_remove.svg"; - item.tooltip = _utf8(L("Remove instance")) + " [-]"; item.sprite_id++; item.left.render_callback = nullptr; item.left.action_callback = [this]() { if (m_canvas != nullptr) wxPostEvent(m_canvas, SimpleEvent(EVT_GLTOOLBAR_FEWER)); }; @@ -7272,9 +7077,20 @@ bool GLCanvas3D::_init_main_toolbar() if (!m_main_toolbar.add_item(item)) return false; + update_shortcut_tooltips(); return true; } +void GLCanvas3D::update_shortcut_tooltips() +{ + const ShortcutRegistry& shortcuts = wxGetApp().shortcuts(); + m_main_toolbar.set_tooltip(m_main_toolbar.get_item_id("add"), shortcuts.with_key(_u8L("Add"), Shortcut::ImportModel)); + m_main_toolbar.set_tooltip(m_main_toolbar.get_item_id("orient"), shortcuts.with_key(_u8L("Auto orient all/selected objects"), Shortcut::Orient) + "\n" + shortcuts.with_key(_u8L("Auto orient all objects on current plate"), Shortcut::OrientPlate)); + m_main_toolbar.set_tooltip(m_main_toolbar.get_item_id("arrange"), shortcuts.with_key(_u8L("Arrange all objects"), Shortcut::Arrange) + "\n" + shortcuts.with_key(_u8L("Arrange objects on selected plates"), Shortcut::ArrangePlate)); + m_main_toolbar.set_tooltip(m_main_toolbar.get_item_id("more"), shortcuts.with_key(_u8L("Add instance"), Shortcut::AddInstance)); + m_main_toolbar.set_tooltip(m_main_toolbar.get_item_id("fewer"), shortcuts.with_key(_u8L("Remove instance"), Shortcut::RemoveInstance)); +} + //BBS: GUI refactor: GLToolbar bool GLCanvas3D::_init_select_plate_toolbar() { @@ -7583,11 +7399,8 @@ void GLCanvas3D::_picking_pass() m_hover_volume_idxs.clear(); m_hover_plate_idxs.clear(); - // Orca: ignore clipping plane if not applying - GLGizmoBase *current_gizmo = m_gizmos.get_current(); - const ClippingPlane clipping_plane = ((!current_gizmo || current_gizmo->apply_clipping_plane()) ? m_gizmos.get_clipping_plane() : - ClippingPlane::ClipsNothing()) - .inverted_normal(); + // Orca: Picking and camera navigation must interpret the active gizmo clipping plane identically. + const ClippingPlane clipping_plane = get_raycaster_clipping_plane(); const SceneRaycaster::HitResult hit = m_scene_raycaster.hit(m_mouse.position, wxGetApp().plater()->get_camera(), &clipping_plane); if (hit.is_valid()) { switch (hit.type) @@ -8096,11 +7909,20 @@ bool GLCanvas3D::_is_fxaa_enabled() const return wxGetApp().app_config != nullptr && wxGetApp().app_config->get_bool(SETTING_OPENGL_FXAA_ENABLED); } +bool GLCanvas3D::_is_realistic_view_enabled() const +{ + const AppConfig* cfg = wxGetApp().app_config; + if (cfg == nullptr || !cfg->get_bool(SETTING_OPENGL_REALISTIC_MODE)) + return false; + // Prepare and Assemble follow the umbrella toggle alone; Preview needs its own opt-in. + return m_canvas_type != ECanvasType::CanvasPreview || cfg->get_bool(SETTING_OPENGL_REALISTIC_PREVIEW); +} + bool GLCanvas3D::_is_ssao_enabled() const { if (wxGetApp().app_config == nullptr) return false; - return wxGetApp().app_config->get_bool(SETTING_OPENGL_REALISTIC_MODE) && + return _is_realistic_view_enabled() && wxGetApp().app_config->get_bool(SETTING_OPENGL_PHONG_SSAO); } @@ -8255,95 +8077,23 @@ void GLCanvas3D::_render_ssao_pass(unsigned int width, unsigned int height) const Camera& camera = wxGetApp().plater()->get_camera(); - GLint prev_stencil_mask = 0xFF; - glsafe(::glGetIntegerv(GL_STENCIL_WRITEMASK, &prev_stencil_mask)); - GLboolean prev_stencil_test = GL_FALSE; - glsafe(::glGetBooleanv(GL_STENCIL_TEST, &prev_stencil_test)); - GLboolean prev_depth_mask = GL_TRUE; - glsafe(::glGetBooleanv(GL_DEPTH_WRITEMASK, &prev_depth_mask)); - GLint prev_depth_func = GL_LESS; - glsafe(::glGetIntegerv(GL_DEPTH_FUNC, &prev_depth_func)); - glsafe(::glDisable(GL_DEPTH_TEST)); glsafe(::glDisable(GL_BLEND)); - // Build stencil mask for bed/plate and apply SSAO only outside this mask. - glsafe(::glEnable(GL_STENCIL_TEST)); - glsafe(::glStencilMask(0xFF)); - glsafe(::glClearStencil(0)); - glsafe(::glClear(GL_STENCIL_BUFFER_BIT)); - glsafe(::glStencilFunc(GL_ALWAYS, 1, 0xFF)); - glsafe(::glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE)); - // Mark only visible plate pixels (do not exclude objects in front of plate). - glsafe(::glEnable(GL_DEPTH_TEST)); - glsafe(::glDepthMask(GL_FALSE)); - glsafe(::glDepthFunc(GL_LEQUAL)); - - GLboolean prev_color_mask[4] = { GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE }; - glsafe(::glGetBooleanv(GL_COLOR_WRITEMASK, prev_color_mask)); - glsafe(::glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE)); - - if (const BuildVolume& build_volume = m_bed.build_volume(); build_volume.valid()) { - GLShaderProgram* flat = wxGetApp().get_shader("flat"); - if (flat != nullptr) { - flat->start_using(); - flat->set_uniform("projection_matrix", camera.get_projection_matrix()); - - GLModel plate_mask; - GLModel::Geometry mask; - mask.format = { GLModel::Geometry::EPrimitiveType::Triangles, GLModel::Geometry::EVertexLayout::P3 }; - - if (build_volume.type() == BuildVolume_Type::Rectangle) { - const BoundingBox3Base bb = build_volume.bounding_volume(); - mask.reserve_vertices(4); - mask.reserve_indices(6); - mask.add_vertex(Vec3f((float)bb.min.x(), (float)bb.min.y(), 0.0f)); - mask.add_vertex(Vec3f((float)bb.max.x(), (float)bb.min.y(), 0.0f)); - mask.add_vertex(Vec3f((float)bb.max.x(), (float)bb.max.y(), 0.0f)); - mask.add_vertex(Vec3f((float)bb.min.x(), (float)bb.max.y(), 0.0f)); - mask.add_triangle(0, 1, 2); - mask.add_triangle(0, 2, 3); - } else if (build_volume.type() == BuildVolume_Type::Circle) { - const Vec2f c = Vec2f(unscaled(build_volume.circle().center.x()), unscaled(build_volume.circle().center.y())); - const float r = unscaled(build_volume.circle().radius); - const int segments = 64; - mask.reserve_vertices(segments + 1); - mask.reserve_indices(segments * 3); - mask.add_vertex(Vec3f(c.x(), c.y(), 0.0f)); - for (int i = 0; i < segments; ++i) { - const float a = (2.0f * float(PI) * float(i)) / float(segments); - mask.add_vertex(Vec3f(c.x() + r * std::cos(a), c.y() + r * std::sin(a), 0.0f)); - } - for (int i = 0; i < segments; ++i) { - const unsigned int i1 = 1 + i; - const unsigned int i2 = 1 + ((i + 1) % segments); - mask.add_triangle(0, i1, i2); - } - } - - if (mask.vertices_count() > 0 && mask.indices_count() > 0) { - plate_mask.init_from(std::move(mask)); - flat->set_uniform("view_model_matrix", camera.get_view_matrix()); - plate_mask.render(flat); - } - flat->stop_using(); - } - } - - glsafe(::glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE)); - glsafe(::glDisable(GL_DEPTH_TEST)); - glsafe(::glStencilMask(0x00)); - glsafe(::glStencilFunc(GL_NOTEQUAL, 1, 0xFF)); - glsafe(::glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP)); - shader->start_using(); shader->set_uniform("view_model_matrix", Transform3d::Identity()); shader->set_uniform("projection_matrix", Transform3d::Identity()); shader->set_uniform("color_texture", 0); shader->set_uniform("depth_texture", 1); shader->set_uniform("inv_tex_size", Vec2f(1.0f / static_cast(width), 1.0f / static_cast(height))); - shader->set_uniform("z_near", camera.get_near_z()); shader->set_uniform("z_far", camera.get_far_z()); + // The shader reconstructs the surface normal from the depth buffer, there being no normal + // target to read: it unprojects a pixel back into view space, then measures the result + // against world +Z expressed in view space to tell a top surface from a wall. + const Matrix4d inv_projection_matrix = camera.get_projection_matrix().matrix().inverse(); + shader->set_uniform("inv_projection_matrix", inv_projection_matrix); + const Vec3d up_view = (camera.get_view_matrix().matrix().block<3, 3>(0, 0) * Vec3d::UnitZ()).normalized(); + shader->set_uniform("up_view", up_view); glsafe(::glActiveTexture(GL_TEXTURE0)); glsafe(::glBindTexture(GL_TEXTURE_2D, m_ssao_color_texture_id)); @@ -8355,13 +8105,6 @@ void GLCanvas3D::_render_ssao_pass(unsigned int width, unsigned int height) glsafe(::glBindTexture(GL_TEXTURE_2D, 0)); shader->stop_using(); - if (!prev_stencil_test) - glsafe(::glDisable(GL_STENCIL_TEST)); - glsafe(::glStencilMask(prev_stencil_mask)); - glsafe(::glColorMask(prev_color_mask[0], prev_color_mask[1], prev_color_mask[2], prev_color_mask[3])); - - glsafe(::glDepthMask(prev_depth_mask)); - glsafe(::glDepthFunc(prev_depth_func)); glsafe(::glEnable(GL_DEPTH_TEST)); glsafe(::glEnable(GL_BLEND)); glsafe(::glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)); @@ -8606,15 +8349,19 @@ void GLCanvas3D::_render_shadows(const Transform3d& view_matrix, const Transform { if (wxGetApp().app_config == nullptr) return; - if (!wxGetApp().app_config->get_bool(SETTING_OPENGL_REALISTIC_MODE)) + if (!_is_realistic_view_enabled()) return; if (!wxGetApp().app_config->get_bool(SETTING_OPENGL_PHONG_BASIC_PLATE_SHADOWS)) return; - if (m_volumes.empty()) - return; - GLShaderProgram* shader = wxGetApp().get_shader("flat"); - if (shader == nullptr) + // The preview canvas holds no volumes of its own for FFF. Once slicing has run its printed + // geometry is the G-code toolpaths, which both cast into the map here and sample it back in + // _render_gcode; before slicing there are only shells, and nothing casts at all. View3D and + // SLA preview use m_volumes. The shells are deliberately never casters: they are a + // translucent ghost of the whole object, so they would drop the solid shadow of a print that + // has not been sliced, and at any layer below the last, one that is not there yet. + const bool toolpath_casters = m_canvas_type == ECanvasType::CanvasPreview && m_gcode_viewer.has_data(); + if (!toolpath_casters && m_volumes.empty()) return; if (OpenGLManager::get_framebuffers_type() == OpenGLManager::EFramebufferType::Arb) { @@ -8626,10 +8373,30 @@ void GLCanvas3D::_render_shadows(const Transform3d& view_matrix, const Transform // Bounding box of the printable objects (the shadow casters). BoundingBoxf3 obj_bb; - for (const GLVolume* volume : m_volumes.volumes) { - if (volume == nullptr || !volume->is_active || !volume->printable || volume->is_modifier || volume->is_wipe_tower) - continue; - obj_bb.merge(volume->transformed_bounding_box()); + if (toolpath_casters) { + // Merged corner by corner: BoundingBoxf3(min, max) marks itself undefined at zero + // Z extent, which a single layer print gives, and the check below would then drop + // every shadow in the frame. + const BoundingBoxf3& paths_bb = m_gcode_viewer.get_paths_bounding_box(); + if ((paths_bb.min.array() <= paths_bb.max.array()).all()) { + obj_bb.merge(paths_bb.min); + obj_bb.merge(paths_bb.max); + } + // Only the enabled layers are drawn, so fitting the map to the whole print wastes + // its depth range and makes contact shadows shift as the slider moves. The z = 0 + // shadow is enclosed separately below, so the plate shadow is unaffected. + const std::vector layer_zs = m_gcode_viewer.get_layers_zs(); + if (!layer_zs.empty()) { + const size_t top = std::min(m_gcode_viewer.get_layers_z_range()[1], layer_zs.size() - 1); + obj_bb.max.z() = std::max(obj_bb.min.z(), std::min(obj_bb.max.z(), layer_zs[top])); + } + } + else { + for (const GLVolume* volume : m_volumes.volumes) { + if (volume == nullptr || !volume->is_active || !volume->printable || volume->is_modifier || volume->is_wipe_tower) + continue; + obj_bb.merge(volume->transformed_bounding_box()); + } } if (!obj_bb.defined) return; // no objects to cast shadows @@ -8751,16 +8518,21 @@ void GLCanvas3D::_render_shadows(const Transform3d& view_matrix, const Transform glsafe(::glPolygonOffset(4.0f, 4.0f)); glsafe(::glDisable(GL_CULL_FACE)); - shader->start_using(); - shader->set_uniform("projection_matrix", Transform3d(light_proj)); - for (GLVolume* volume : m_volumes.volumes) { - if (volume == nullptr || !volume->is_active || !volume->printable || volume->is_modifier || volume->is_wipe_tower) - continue; - const Transform3d view_model = Transform3d(light_view) * volume->world_matrix(); - shader->set_uniform("view_model_matrix", view_model); - volume->model.render(shader); + if (toolpath_casters) + m_gcode_viewer.render_shadow_casters(Transform3d(light_view), Transform3d(light_proj), eye); + // Only this branch draws through "flat"; the toolpaths bring their own program. + else if (GLShaderProgram* shader = wxGetApp().get_shader("flat"); shader != nullptr) { + shader->start_using(); + shader->set_uniform("projection_matrix", Transform3d(light_proj)); + for (GLVolume* volume : m_volumes.volumes) { + if (volume == nullptr || !volume->is_active || !volume->printable || volume->is_modifier || volume->is_wipe_tower) + continue; + const Transform3d view_model = Transform3d(light_view) * volume->world_matrix(); + shader->set_uniform("view_model_matrix", view_model); + volume->model.render(shader); + } + shader->stop_using(); } - shader->stop_using(); // Restore state glsafe(::glDisable(GL_POLYGON_OFFSET_FILL)); @@ -8960,7 +8732,16 @@ void GLCanvas3D::_render_objects(GLVolumeCollection::ERenderType type, bool with else m_volumes.set_show_sinking_contours(!m_gizmos.is_hiding_instances()); - const bool realistic_mode = wxGetApp().app_config != nullptr && wxGetApp().app_config->get_bool(SETTING_OPENGL_REALISTIC_MODE); + // Orca: X-Ray replaces both shaded passes with a single one, driven from the opaque call, and + // reuses the volume state (print volume, z range, clipping plane) set up above. + if (_is_xray_view_active()) { + if (type == GLVolumeCollection::ERenderType::Opaque) + _render_xray_volumes(); + m_camera_clipping_plane = ClippingPlane::ClipsNothing(); + return; + } + + const bool realistic_mode = _is_realistic_view_enabled(); const bool realistic_phong = wxGetApp().app_config != nullptr && wxGetApp().app_config->get_bool(SETTING_OPENGL_REALISTIC_PHONG); const std::string shader_name = (realistic_mode && realistic_phong) ? "phong" : "gouraud"; GLShaderProgram* shader = wxGetApp().get_shader(shader_name); @@ -9099,6 +8880,51 @@ void GLCanvas3D::_render_objects(GLVolumeCollection::ERenderType type, bool with m_camera_clipping_plane = ClippingPlane::ClipsNothing(); } +bool GLCanvas3D::_is_xray_view_active() const +{ + if (m_canvas_type == ECanvasType::CanvasPreview || !wxGetApp().plater()->is_show_xray()) + return false; + + // A painting gizmo and the layer height editor draw the object through their own shaders, and + // would lose what they draw if X-Ray took the pass over. + if (dynamic_cast(m_gizmos.get_current()) != nullptr) + return false; + return !(m_picking_enabled && m_layers_editing.is_enabled() && m_layers_editing.last_object_id != -1 && + m_layers_editing.object_max_z() > 0.0f); +} + +void GLCanvas3D::_render_xray_volumes() +{ + if (m_volumes.empty()) + return; + + GLShaderProgram* shader = wxGetApp().get_shader("xray"); + if (shader == nullptr) + return; + + const Camera& camera = wxGetApp().plater()->get_camera(); + const ECanvasType canvas_type = m_canvas_type; + + // Depth writes off so every surface along a view ray composites, not just the nearest one, and + // back faces kept for the far wall of a hollow part. The low, near-uniform coverage the shader + // emits saturates towards the volume color whatever the order, so the volumes are not sorted. + glsafe(::glDepthMask(GL_FALSE)); + glsafe(::glEnable(GL_BLEND)); + glsafe(::glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)); + + shader->start_using(); + m_volumes.render(GLVolumeCollection::ERenderType::All, true, camera.get_view_matrix(), camera.get_projection_matrix(), + get_canvas_size(), [this, canvas_type](const GLVolume& volume) { + if (canvas_type == ECanvasType::CanvasAssembleView) + return !volume.is_modifier && !volume.is_wipe_tower; + return m_render_sla_auxiliaries || volume.composite_id.volume_id >= 0; + }); + shader->stop_using(); + + glsafe(::glDisable(GL_BLEND)); + glsafe(::glDepthMask(GL_TRUE)); +} + void GLCanvas3D::_render_wireframe_overlay() { if (!wxGetApp().plater()->is_show_wireframe()) @@ -9142,7 +8968,34 @@ void GLCanvas3D::_render_wireframe_overlay() //BBS: GUI refactor: add canvas size as parameters void GLCanvas3D::_render_gcode(int canvas_width, int canvas_height) { + // Realistic view: the toolpaths receive the same depth map they were rendered into by + // _render_shadows, which is what gives them object-on-object and self shadows. Intensity 0 + // short-circuits the lookup in the shader, so this is inert whenever the map is missing. + const bool receive_shadows = m_shadow_map_valid && m_shadow_map_texture_id != 0 && m_shadow_map_size != 0; + if (receive_shadows) { + glsafe(::glActiveTexture(GL_TEXTURE4)); + glsafe(::glBindTexture(GL_TEXTURE_2D, m_shadow_map_texture_id)); + glsafe(::glActiveTexture(GL_TEXTURE0)); + m_gcode_viewer.set_shadow_map(4, m_shadow_light_vp, 0.35f, 1.0f / static_cast(m_shadow_map_size)); + } + else + m_gcode_viewer.set_shadow_map(4, Transform3d::Identity(), 0.0f, 0.0f); + + // The lighting term leaves the print dimmer and duller than the legend colours. Saturation + // pays back the duller half in both modes; brightness only where something takes light off + // again - realistic view with at least one lossy pass on - else the lift would just clip. + const AppConfig* cfg = wxGetApp().app_config; + const bool lossy_passes = cfg != nullptr && _is_realistic_view_enabled() && + (cfg->get_bool(SETTING_OPENGL_PHONG_BASIC_PLATE_SHADOWS) || cfg->get_bool(SETTING_OPENGL_PHONG_SSAO)); + m_gcode_viewer.set_tone(lossy_passes ? 1.1f : 1.0f, 1.15f); + m_gcode_viewer.render_scene(canvas_width, canvas_height); + + if (receive_shadows) { + glsafe(::glActiveTexture(GL_TEXTURE4)); + glsafe(::glBindTexture(GL_TEXTURE_2D, 0)); + glsafe(::glActiveTexture(GL_TEXTURE0)); + } } void GLCanvas3D::_render_gcode_overlay(int canvas_width, int canvas_height) @@ -10225,8 +10078,14 @@ void GLCanvas3D::_render_canvas_toolbar() [this, p]{p->toggle_show_wireframe(); m_dirty = true;} ); - create_menu_item( _utf8(L("Realistic View")), + create_menu_item( _utf8(L("X-Ray")), m_canvas_type != ECanvasType::CanvasPreview, // not work on preview + p->is_show_xray(), + [this, p]{p->toggle_show_xray(); m_dirty = true;} + ); + + create_menu_item( _utf8(L("Realistic View")), + true, // work on all cfg->get_bool(SETTING_OPENGL_REALISTIC_MODE), [&cfg]{ cfg->set_bool(SETTING_OPENGL_REALISTIC_MODE, !cfg->get_bool(SETTING_OPENGL_REALISTIC_MODE)); @@ -11009,6 +10868,129 @@ Vec3d GLCanvas3D::_mouse_to_bed_3d(const Point& mouse_pos) return mouse_ray(mouse_pos).intersect_plane(0.0); } +ClippingPlane GLCanvas3D::get_raycaster_clipping_plane() const +{ + // Orca: Ignore the gizmo clipping plane when the active tool does not apply it, and + // invert the result into the convention expected by SceneRaycaster. + GLGizmoBase* current_gizmo = m_gizmos.get_current(); + return ((!current_gizmo || current_gizmo->apply_clipping_plane()) ? m_gizmos.get_clipping_plane() : + ClippingPlane::ClipsNothing()) + .inverted_normal(); +} + +std::optional GLCanvas3D::get_camera_orbit_target(ECameraNavigationType navigation_type) const +{ + // Orca: Centralize the pre-existing pivot rules so orbiting and pan fallback cannot + // choose different reference depths for the same canvas and active tool. + PartPlate* current_plate = wxGetApp().plater()->get_partplate_list().get_curr_plate(); + if (navigation_type == ECameraNavigationType::Gesture) + return current_plate == nullptr ? std::nullopt : + std::make_optional(current_plate->get_bounding_box().center()); + + const GLGizmosManager::EType gizmo_type = m_gizmos.get_current_type(); + const bool use_scene_target = m_canvas_type == ECanvasType::CanvasAssembleView || + gizmo_type == GLGizmosManager::FdmSupports || gizmo_type == GLGizmosManager::Seam || + gizmo_type == GLGizmosManager::MmSegmentation || gizmo_type == GLGizmosManager::FuzzySkin; + if (use_scene_target) { + if (!m_selection.is_empty()) + return m_selection.get_bounding_box().center(); + + // Orca: Preserve the world-origin fallback used by orbit in an empty scene. + return volumes_bounding_box().center(); + } + + // Orca: Free-camera rotation uses Camera::m_target rather than a plate or selection pivot. + if (wxGetApp().app_config->get_bool("use_free_camera")) + return std::nullopt; + + Vec3d target = Vec3d::Zero(); + if (m_canvas_type == ECanvasType::CanvasPreview) { + if (current_plate != nullptr) + target = current_plate->get_bounding_box().center(); + } else if (!m_selection.is_empty()) { + target = m_selection.get_bounding_box().center(); + } else { + // Orca: Match regular mouse orbit: objects on the active plate, then the plate itself. + BoundingBoxf3 bbox = volumes_bounding_box(true); + if (!bbox.defined && current_plate != nullptr) + bbox = current_plate->get_bounding_box(); + if (bbox.defined) + target = bbox.center(); + } + + // Orca: Preserve the existing zero sentinel used by regular mouse orbit. + return target.isZero() ? std::nullopt : std::make_optional(target); +} + +bool GLCanvas3D::is_bed_visible() const +{ + if (m_canvas_type == ECanvasType::CanvasPreview) + return m_render_preview; + if (m_canvas_type != ECanvasType::CanvasView3D || !m_show_bed) + return false; + if (!m_main_toolbar.is_enabled()) + return true; + + const auto type = m_gizmos.get_current_type(); + return type != GLGizmosManager::FdmSupports && type != GLGizmosManager::Seam && + type != GLGizmosManager::MmSegmentation && type != GLGizmosManager::FuzzySkin; +} + +Vec3d GLCanvas3D::get_camera_pan_anchor(Camera& camera, ECameraNavigationType navigation_type, + const Vec2d& screen_position) const +{ + // Orthographic panning has the same scale at every depth, so no raycast is needed. + if (camera.get_type() != Camera::EType::Perspective) + return camera.get_target(); + + // Orca: Reject non-finite anchors and points behind the camera before their depth is + // allowed to scale a perspective pan. + const Vec3d camera_position = camera.get_position(); + const Vec3d camera_forward = camera.get_dir_forward(); + const auto is_valid_anchor = [&camera_position, &camera_forward](const Vec3d& anchor) { + return anchor.allFinite() && (anchor - camera_position).dot(camera_forward) > EPSILON; + }; + + // Orca: Prefer the nearest visible bed or volume surface and exclude gizmos and + // selected-volume picking priority from navigation depth selection. + const ClippingPlane clipping_plane = get_raycaster_clipping_plane(); + const bool bed_visible = is_bed_visible(); + const SceneRaycaster::HitResult hit = m_scene_raycaster.hit(screen_position, camera, &clipping_plane, + bed_visible ? SceneRaycaster::EHitMode::SceneOnly : SceneRaycaster::EHitMode::VolumesOnly); + if (hit.is_valid()) { + const Vec3d hit_position = hit.position.cast(); + if (is_valid_anchor(hit_position)) + return hit_position; + } + + // Orca: When the cursor is just outside the visible plate, use the point under it on the active + // plate plane. Using the plate center here would give it a different perspective depth. + PartPlate* current_plate = wxGetApp().plater()->get_partplate_list().get_curr_plate(); + // Orca: An almost edge-on perspective makes intersection depth extremely sensitive to + // the cursor's vertical position. Use the stable orbit depth around horizontal views. + static constexpr double min_plate_plane_forward_z = 0.05; + if (bed_visible && std::abs(camera_forward.z()) >= min_plate_plane_forward_z && + current_plate != nullptr && current_plate->get_bounding_box().defined) { + Vec3d ray_origin; + Vec3d ray_direction; + CameraUtils::ray_from_screen_pos(camera, screen_position, ray_origin, ray_direction); + const double z_direction = ray_direction.z(); + if (ray_origin.allFinite() && ray_direction.allFinite() && std::abs(z_direction) > EPSILON) { + const double plate_z = current_plate->get_bounding_box().center().z(); + const double distance = (plate_z - ray_origin.z()) / z_direction; + const Vec3d plate_position = ray_origin + distance * ray_direction; + const double eye_depth = (plate_position - camera_position).dot(camera_forward); + if (distance >= 0.0 && is_valid_anchor(plate_position) && + eye_depth >= camera.get_near_z() && eye_depth <= camera.get_far_z()) + return plate_position; + } + } + + // Orca: Near-horizontal rays and points outside the scene depth use the orbit reference point. + const std::optional orbit_target = get_camera_orbit_target(navigation_type); + return orbit_target.has_value() && is_valid_anchor(*orbit_target) ? *orbit_target : camera.get_target(); +} + // While it looks like we can call // this->reload_scene(true, true) // the two functions are quite different: diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp index 6f7fd52f78..dd49bf715b 100644 --- a/src/slic3r/GUI/GLCanvas3D.hpp +++ b/src/slic3r/GUI/GLCanvas3D.hpp @@ -63,6 +63,7 @@ class PartPlateList; #ifdef SLIC3R_CAD class DesignSketchTool; // Design tab: interactive 2D sketch tool #endif +struct KeyChord; #if ENABLE_RETINA_GL class RetinaHelper; @@ -185,7 +186,6 @@ wxDECLARE_EVENT(EVT_GLCANVAS_UPDATE_BED_SHAPE, SimpleEvent); wxDECLARE_EVENT(EVT_GLCANVAS_TAB, SimpleEvent); wxDECLARE_EVENT(EVT_GLCANVAS_RESETGIZMOS, SimpleEvent); wxDECLARE_EVENT(EVT_GLCANVAS_MOVE_SLIDERS, wxKeyEvent); -wxDECLARE_EVENT(EVT_GLCANVAS_EDIT_COLOR_CHANGE, wxKeyEvent); wxDECLARE_EVENT(EVT_GLCANVAS_JUMP_TO, wxKeyEvent); wxDECLARE_EVENT(EVT_GLCANVAS_UNDO, SimpleEvent); wxDECLARE_EVENT(EVT_GLCANVAS_REDO, SimpleEvent); @@ -338,6 +338,8 @@ class GLCanvas3D int move_volume_idx{ -1 }; bool move_requires_threshold{ false }; Point move_start_threshold_position_2D{ Invalid_2D_Point }; + // Orca: Keep the world-space point selected at the start of a mouse pan. + std::optional camera_pan_anchor; }; bool dragging{ false }; @@ -346,7 +348,12 @@ class GLCanvas3D Drag drag; bool ignore_right_up; - void set_start_position_2D_as_invalid() { drag.start_position_2D = Drag::Invalid_2D_Point; } + // Orca: The screen-space start and world-space anchor describe the same pan session. + // Invalidating one must invalidate the other so a new drag cannot reuse stale depth. + void set_start_position_2D_as_invalid() { + drag.start_position_2D = Drag::Invalid_2D_Point; + drag.camera_pan_anchor.reset(); + } void set_start_position_3D_as_invalid() { drag.start_position_3D = Drag::Invalid_3D_Point; } void set_move_start_threshold_position_2D_as_invalid() { drag.move_start_threshold_position_2D = Drag::Invalid_2D_Point; } @@ -549,6 +556,8 @@ private: bool m_fps_overlay_tick{ false }; LayersEditing m_layers_editing; Mouse m_mouse; + // Orca: Gesture pans have their own lifecycle and stable world-space anchor. + std::optional m_gesture_pan_anchor; GLGizmosManager m_gizmos; //BBS: GUI refactor: GLToolbar mutable GLToolbar m_main_toolbar; @@ -626,7 +635,23 @@ private: bool m_dynamic_background_enabled; bool m_multisample_allowed; bool m_moving; - bool m_tab_down; + // The key-down being dispatched, kept for the char event that may follow it. + struct KeyDown + { + int code = WXK_NONE; + bool repeat = false; + }; + KeyDown m_key_down; + // A keyboard move or rotation of the selection runs from the key-down that started it to + // that key's release, so a held key becomes one undo step. + struct SelectionEdit + { + enum Kind { None, Move, Rotate }; + Kind kind = None; + int key = WXK_NONE; // raw key code of the key-down, matched against the key-up + Vec3d direction{ Vec3d::UnitX() }; + }; + SelectionEdit m_selection_edit; bool m_camera_movement; //BBS: add toolpath outside bool m_toolpath_outside{ false }; @@ -1097,6 +1122,13 @@ public: void on_idle(wxIdleEvent& evt); void on_char(wxKeyEvent& evt); void on_key(wxKeyEvent& evt); + // Runs the Plater/Preview shortcut bound to chord, swallowing auto-repeats of one-shot + // shortcuts; false when nothing is bound. + bool handle_shortcut(const KeyChord& chord); + void apply_selection_move(bool slow, bool camera_space); + void apply_selection_rotate(double angle_z_rad); + void finish_selection_edit(); + void update_shortcut_tooltips(); void on_mouse_wheel(wxMouseEvent& evt); void on_timer(wxTimerEvent& evt); void on_render_timer(wxTimerEvent& evt); @@ -1308,6 +1340,7 @@ private: // IMEX ghost picking (ray vs. ghost bbox). Runs at the end of _picking_pass. void _picking_pass_imex_ghosts(); bool _is_fxaa_enabled() const; + bool _is_realistic_view_enabled() const; bool _is_ssao_enabled() const; int _get_effective_fps_cap() const; bool _is_fps_overlay_enabled() const; @@ -1344,6 +1377,8 @@ private: // IMEX ghost hover tooltip: filament swatch + label drawn as an ImGui overlay. void _render_imex_ghost_tooltip(); void _render_wireframe_overlay(); + bool _is_xray_view_active() const; + void _render_xray_volumes(); //BBS: GUI refactor: add canvas size as parameters void _render_gcode(int canvas_width, int canvas_height); void _render_gcode_overlay(int canvas_width, int canvas_height); @@ -1391,6 +1426,20 @@ private: // Convert the screen space coordinate to world coordinate on the bed. Vec3d _mouse_to_bed_3d(const Point& mouse_pos); + // Orca: Navigation type selects the legacy pivot policy used when no visible surface is hit. + enum class ECameraNavigationType : unsigned char + { + Mouse, + Gesture + }; + + // Orca: These helpers keep clipping, orbit pivots, and perspective-pan depth selection consistent. + ClippingPlane get_raycaster_clipping_plane() const; + bool is_bed_visible() const; + std::optional get_camera_orbit_target(ECameraNavigationType navigation_type) const; + Vec3d get_camera_pan_anchor(Camera& camera, ECameraNavigationType navigation_type, + const Vec2d& screen_position) const; + void _start_timer() { m_timer.Start(100, wxTIMER_CONTINUOUS); } void _stop_timer() { m_timer.Stop(); } diff --git a/src/slic3r/GUI/GLShadersManager.cpp b/src/slic3r/GUI/GLShadersManager.cpp index 2b8a0edf0a..b35d598829 100644 --- a/src/slic3r/GUI/GLShadersManager.cpp +++ b/src/slic3r/GUI/GLShadersManager.cpp @@ -90,6 +90,8 @@ std::pair GLShadersManager::init() , { "ENABLE_ENVIRONMENT_MAP"sv } #endif // ENABLE_ENVIRONMENT_MAP ); + // used to render objects as translucent, edge weighted surfaces in the X-Ray view + valid &= append_shader("xray", { prefix + "xray.vs", prefix + "xray.fs" }); // used to render variable layers heights in 3d editor valid &= append_shader("variable_layer_height", { prefix + "variable_layer_height.vs", prefix + "variable_layer_height.fs" }); // used to render highlight contour around selected triangles inside the multi-material gizmo diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index ab53b773a2..1a153ed4fb 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -3,6 +3,7 @@ #include "libslic3r/Technologies.hpp" #include "libslic3r/Platform.hpp" #include "GUI_App.hpp" +#include "Shortcuts.hpp" #include "BindDialog.hpp" #include "DeviceManager.hpp" #include "HMS.hpp" @@ -862,8 +863,11 @@ void GUI_App::post_init() mainframe->Freeze(); #endif plater_->canvas3D()->enable_render(false); - mainframe->select_tab(TAB_ID_PREPARE); + mainframe->select_prepare_for_gl_init(); plater_->select_view_3D("3D"); + // The first render happens before the queued new_project() sets the same view. + plater_->get_camera().select_view("topfront"); + plater_->get_camera().requires_zoom_to_bed = true; //BBS init the opengl resource here if (!plater_->canvas3D()->get_wxglcanvas()->IsShownOnScreen() || !plater_->canvas3D()->make_current_for_postinit()) { @@ -899,10 +903,10 @@ void GUI_App::post_init() BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ", finished rendering a first frame for test"; } } - if (is_editor()) - mainframe->select_tab(TAB_ID_HOME); - if (app_config->get("default_page") == "1") + if (starts_on_prepare()) mainframe->select_tab(TAB_ID_PREPARE); + else if (is_editor()) + mainframe->select_tab(TAB_ID_HOME); #ifndef __linux__ mainframe->Thaw(); #endif @@ -911,6 +915,7 @@ void GUI_App::post_init() plater_->trigger_restore_project(1); //#endif + mainframe->prebuild_pages_when_idle(); //BBS: remove GCodeViewer as seperate APP logic /*if (this->init_params->start_as_gcodeviewer) { @@ -1120,6 +1125,8 @@ GUI_App::GUI_App() { //app config initializes early becasuse it is used in instance checking in OrcaSlicer.cpp this->init_app_config(); + m_shortcuts = std::make_unique(); + m_shortcuts->load(*app_config); this->init_download_path(); // Note: the WebView2 runtime check (init_webview_runtime) used to run here, but // the constructor executes before wxWidgets is fully initialized and before the @@ -1923,9 +1930,9 @@ bool GUI_App::hot_reload_network_plugin() m_device_manager->add_user_subscribe(); } - if (mainframe && mainframe->m_monitor) { - mainframe->m_monitor->update_network_version_footer(); - mainframe->m_monitor->set_default(); + if (MonitorPanel* monitor = MonitorPanel::if_built()) { + monitor->update_network_version_footer(); + monitor->set_default(); BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": reset monitor panel"; } @@ -2179,6 +2186,8 @@ void GUI_App::init_networking_callbacks() obj->command_get_access_code(); if (m_agent) m_agent->install_device_cert(obj->get_dev_id(), obj->is_lan_mode_printer()); + + obj->set_online_state(true); } }); }); @@ -2217,6 +2226,8 @@ void GUI_App::init_networking_callbacks() obj->command_get_version(); event.SetInt(0); event.SetString(obj->get_dev_id()); + + obj->set_online_state(true); } else if (state == ConnectStatus::ConnectStatusFailed) { // Orca: only update status if same device id if (m_device_manager->selected_machine != dev_id) return; @@ -2232,10 +2243,14 @@ void GUI_App::init_networking_callbacks() wxGetApp().show_dialog(text); } event.SetInt(-1); + + obj->set_online_state(false); } else if (state == ConnectStatus::ConnectStatusLost) { m_device_manager->set_selected_machine(""); event.SetInt(-1); BOOST_LOG_TRIVIAL(info) << "set_on_local_connect_fn: state = lost"; + + obj->set_online_state(false); } else { event.SetInt(-1); BOOST_LOG_TRIVIAL(info) << "set_on_local_connect_fn: state = " << state; @@ -3408,14 +3423,16 @@ bool GUI_App::on_init_inner() } BOOST_LOG_TRIVIAL(info) << "create the main window"; mainframe = new MainFrame(); - // hide settings tabs after first Layout if (is_editor()) { - mainframe->select_tab(TAB_ID_HOME); + if (starts_on_prepare()) { + mainframe->select_tab(TAB_ID_PREPARE); + } else { + mainframe->select_tab(TAB_ID_HOME); + } } sidebar().obj_list()->init(); //sidebar().aux_list()->init_auxiliary(); - mainframe->m_project->init_auxiliary(); // update_mode(); // !!! do that later SetTopWindow(mainframe); @@ -4126,13 +4143,13 @@ void GUI_App::select_machine(const std::string& agent_id) // Use MonitorPanel::select_machine() to trigger full selection flow // This reuses existing logic for machine switching (UI updates, callbacks, etc.) - if (mainframe && mainframe->m_monitor) { - mainframe->m_monitor->select_machine(dev_id); + if (MonitorPanel* monitor = MonitorPanel::if_built()) { + monitor->select_machine(dev_id); BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": triggered select_machine for dev_id=" << dev_id; - } else { - // Fallback if MonitorPanel not available - m_device_manager->set_selected_machine(dev_id); - BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": fallback set_selected_machine dev_id=" << dev_id; + } else if (m_device_manager->set_selected_machine(dev_id)) { + // The Device tab's own state is set when the tab is built. + MonitorPanel::on_machine_selected(m_device_manager->get_selected_machine()); + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": set_selected_machine dev_id=" << dev_id; } } @@ -4656,6 +4673,7 @@ void GUI_App::recreate_GUI(const wxString &msg_name) //BBS: trigger restore project logic here, and skip confirm plater_->trigger_restore_project(1); + mainframe->prebuild_pages_when_idle(); // #ys_FIXME_delete_after_testing Do we still need this ? // CallAfter([]() { @@ -4677,12 +4695,28 @@ void GUI_App::system_info() //dlg.ShowModal(); } -void GUI_App::keyboard_shortcuts() +void GUI_App::keyboard_shortcuts(ShortcutContext page, wxWindow* parent) { - KBShortcutsDialog dlg; + KBShortcutsDialog dlg(parent != nullptr ? parent : mainframe, page); dlg.ShowModal(); } +void GUI_App::on_shortcuts_changed() +{ + m_shortcuts->save(*app_config); + app_config->save(); + if (mainframe == nullptr) + return; + mainframe->update_shortcut_labels(); + if (Plater* plater = this->plater(); plater != nullptr) { + if (GLCanvas3D* canvas = plater->get_view3D_canvas3D(); canvas != nullptr) + canvas->update_shortcut_tooltips(); +#ifdef __WXOSX__ + obj_list()->update_shortcut_accelerators(); +#endif + } +} + void GUI_App::troubleshoot() { TroubleshootDialog dlg; @@ -4981,7 +5015,8 @@ void GUI_App::get_login_info(const std::string& provider/* = ORCA_CLOUD_PROVIDER wxString strJS = wxString::Format("window.postMessage(%s)", from_u8(logout_cmd)); GUI::wxGetApp().run_script(strJS); } - mainframe->m_webview->SetLoginPanelVisibility(true); + if (WebViewPanel* home = WebViewPanel::if_built()) + home->SetLoginPanelVisibility(true); } } @@ -5113,9 +5148,9 @@ std::string GUI_App::handle_web_request(std::string cmd) "homepage_bambu_login_or_register", }; if (app_config->get_stealth_mode() && stealth_blocked_info_commands.count(command_str)) { - CallAfter([this] { - if (mainframe && mainframe->m_webview) - mainframe->m_webview->SendCloudProvidersInfo(); + CallAfter([] { + if (WebViewPanel* home = WebViewPanel::if_built()) + home->SendCloudProvidersInfo(); }); return ""; } @@ -5129,8 +5164,8 @@ std::string GUI_App::handle_web_request(std::string cmd) if (dlg.ShowModal() == wxID_OK) { app_config->set_bool("stealth_mode", false); app_config->save(); - if (mainframe && mainframe->m_webview) - mainframe->m_webview->SendCloudProvidersInfo(); + if (WebViewPanel* home = WebViewPanel::if_built()) + home->SendCloudProvidersInfo(); // Continue with login if (command_str == "homepage_login_or_register") this->request_login(true); @@ -5211,8 +5246,8 @@ std::string GUI_App::handle_web_request(std::string cmd) } else if (command_str.compare("get_recent_projects") == 0) { if (mainframe) { - if (mainframe->m_webview) { - mainframe->m_webview->SendRecentList(INT_MAX); + if (WebViewPanel* home = WebViewPanel::if_built()) { + home->SendRecentList(INT_MAX); } } } @@ -7745,8 +7780,8 @@ void GUI_App::on_stealth_mode_enter() BOOST_LOG_TRIVIAL(info) << "logout: on_stealth_mode_enter"; request_user_logout(ORCA_CLOUD_PROVIDER); request_user_logout(BBL_CLOUD_PROVIDER); - if (mainframe && mainframe->m_webview) { - mainframe->m_webview->SendCloudProvidersInfo(); + if (WebViewPanel* home = WebViewPanel::if_built()) { + home->SendCloudProvidersInfo(); } } @@ -8156,6 +8191,24 @@ ConfigOptionMode GUI_App::get_saved_mode() return saved_mode_from_string(app_config->get("user_mode")); } +bool GUI_App::starts_on_prepare() const +{ + return app_config->get("default_page") == "1"; +} + +int GUI_App::input_idle_ms() const +{ + return int(std::chrono::duration_cast(std::chrono::steady_clock::now() - m_last_input).count()); +} + +// Every wxCommandEvent claims the user-input category, so only real mouse and key events count. +int GUI_App::FilterEvent(wxEvent& event) +{ + if (!event.IsCommandEvent() && (event.GetEventCategory() & wxEVT_CATEGORY_USER_INPUT)) + m_last_input = std::chrono::steady_clock::now(); + return Event_Skip; +} + ConfigOptionMode GUI_App::get_mode() { return app_config->get_bool("developer_mode") ? comDevelop : get_saved_mode(); @@ -8207,9 +8260,10 @@ void GUI_App::update_mode() mainframe->m_param_panel->update_mode(); if (mainframe->m_param_dialog) mainframe->m_param_dialog->panel()->update_mode(); - if (mainframe->m_printer_view) - mainframe->m_printer_view->update_mode(); - mainframe->m_webview->update_mode(); + if (PrinterWebView* view = PrinterWebView::if_built()) + view->update_mode(); + if (WebViewPanel* home = WebViewPanel::if_built()) + home->update_mode(); #ifdef _MSW_DARK_MODE if (!wxGetApp().tabs_as_menu()) @@ -8227,9 +8281,10 @@ void GUI_App::update_mode() } void GUI_App::update_internal_development() { - mainframe->m_webview->update_mode(); - if (mainframe->m_printer_view) - mainframe->m_printer_view->update_mode(); + if (WebViewPanel* home = WebViewPanel::if_built()) + home->update_mode(); + if (PrinterWebView* view = PrinterWebView::if_built()) + view->update_mode(); } void GUI_App::show_ip_address_enter_dialog(wxString title) @@ -8465,7 +8520,9 @@ void GUI_App::open_exportpresetbundledialog(size_t open_on_tab, const std::strin } } -void GUI_App::open_preferences(size_t open_on_tab, const std::string& highlight_option) +void GUI_App::open_preferences() { open_preferences(PreferencesTab::General); } + +void GUI_App::open_preferences(PreferencesTab tab, const std::string& highlight_option) { // Render settings the canvas reads every frame; a change needs one redraw to show. static constexpr const char* opengl_render_setting_keys[] = { @@ -8482,7 +8539,8 @@ void GUI_App::open_preferences(size_t open_on_tab, const std::string& highlight_ // the dialog needs to be destroyed before the call to recreate_GUI() // or sometimes the application crashes into wxDialogBase() destructor // so we put it into an inner scope - PreferencesDialog dlg(mainframe, open_on_tab, highlight_option); + PreferencesDialog dlg(mainframe); + dlg.select_tab(tab, highlight_option); dlg.ShowModal(); need_recreate_gui = dlg.recreate_GUI(); pending_language = dlg.pending_language(); diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp index 97213d170b..e888a52b06 100644 --- a/src/slic3r/GUI/GUI_App.hpp +++ b/src/slic3r/GUI/GUI_App.hpp @@ -1,6 +1,7 @@ #ifndef slic3r_GUI_App_hpp_ #define slic3r_GUI_App_hpp_ +#include #include #include #include @@ -70,6 +71,9 @@ namespace GUI{ class RemovableDriveManager; class OtherInstanceMessageHandler; +class ShortcutRegistry; +enum class ShortcutContext : uint8_t; +enum class PreferencesTab; class MainFrame; class Sidebar; class ObjectSettings; @@ -245,6 +249,7 @@ private: bool m_app_conf_exists{ false }; EAppMode m_app_mode{ EAppMode::Editor }; bool m_is_recreating_gui{ false }; + std::chrono::steady_clock::time_point m_last_input{ std::chrono::steady_clock::now() }; #ifdef __linux__ bool m_opengl_initialized{ false }; #endif @@ -286,6 +291,7 @@ private: std::unique_ptr m_removable_drive_manager; std::unique_ptr m_imgui; + std::unique_ptr m_shortcuts; std::unique_ptr m_printhost_job_queue; std::unique_ptr m_other_instance_message_handler; std::unique_ptr m_single_instance_checker; @@ -383,6 +389,11 @@ public: bool is_editor() const { return m_app_mode == EAppMode::Editor; } bool is_gcode_viewer() const { return m_app_mode == EAppMode::GCodeViewer; } bool is_recreating_gui() const { return m_is_recreating_gui; } + // Milliseconds since the last mouse or keyboard event the app processed. + int input_idle_ms() const; + int FilterEvent(wxEvent& event) override; + // The Preferences "Default page" choice, stored as its index: 0 Home, 1 Prepare. + bool starts_on_prepare() const; std::string logo_name() const { return is_editor() ? "OrcaSlicer" : "OrcaSlicer-gcodeviewer"; } bool is_closing() const { return m_is_closing.load(std::memory_order_acquire); } @@ -483,7 +494,7 @@ public: void recreate_GUI(const wxString& message); void system_info(); - void keyboard_shortcuts(); + void keyboard_shortcuts(ShortcutContext page, wxWindow* parent = nullptr); // the main frame when null void troubleshoot(); void load_project(wxWindow *parent, wxString& input_file) const; void import_model(wxWindow *parent, wxArrayString& input_files) const; @@ -639,7 +650,8 @@ public: wxString current_language_code_safe() const; bool is_localized() const { return m_wxLocale->GetLocale() != "English"; } - void open_preferences(size_t open_on_tab = 0, const std::string& highlight_option = std::string()); + void open_preferences(); // on the General tab + void open_preferences(PreferencesTab tab, const std::string& highlight_option = std::string()); void open_presetbundledialog(size_t open_on_tab = 0, const std::string& highlight_option = std::string()); void open_plugins_dialog(size_t open_on_tab = 0, const std::string& highlight_option = std::string()); // Dialog-free plugin actions used by the speed dial: they never require the Plugins dialog to be open. @@ -737,6 +749,9 @@ public: size_t get_instance_hash_int () { return m_instance_hash_int; } ImGuiWrapper* imgui() { return m_imgui.get(); } + ShortcutRegistry& shortcuts() { return *m_shortcuts; } + // Saves the bindings and refreshes every menu label, tooltip and accelerator table that shows one. + void on_shortcuts_changed(); PrintHostJobQueue& printhost_job_queue() { return *m_printhost_job_queue.get(); } diff --git a/src/slic3r/GUI/GUI_Factories.cpp b/src/slic3r/GUI/GUI_Factories.cpp index d02922497e..ecca540aa9 100644 --- a/src/slic3r/GUI/GUI_Factories.cpp +++ b/src/slic3r/GUI/GUI_Factories.cpp @@ -6,6 +6,7 @@ #include "GUI_Factories.hpp" #include "GUI_ObjectList.hpp" #include "GUI_App.hpp" +#include "Shortcuts.hpp" #include "I18N.hpp" #include "Plater.hpp" #include "ObjectDataViewModel.hpp" @@ -2083,13 +2084,8 @@ wxMenu* MenuFactory::assemble_part_menu() void MenuFactory::append_menu_item_clone(wxMenu* menu) { -#ifdef __APPLE__ - static const wxString ctrl = ("Ctrl+"); -#else - // FIXME: maybe should be using GUI::shortkey_ctrl_prefix() or equivalent? - static const wxString ctrl = _L("Ctrl+"); -#endif - append_menu_item(menu, wxID_ANY, _L("Clone") + "\t" + ctrl + "K", "", + const std::string accel = wxGetApp().shortcuts().accelerator(Shortcut::CloneSelected); + append_menu_item(menu, wxID_ANY, _L("Clone") + (accel.empty() ? wxString() : "\t" + from_u8(accel)), "", [](wxCommandEvent&) { plater()->clone_selection(); }, "", nullptr, diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index 8067afd8df..5220e026c7 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -1,14 +1,17 @@ #include "libslic3r/libslic3r.h" #include "libslic3r/PresetBundle.hpp" +#include "libslic3r/LifecycleEvents.hpp" #include "GUI_ObjectList.hpp" #include "GUI_Factories.hpp" //#include "GUI_ObjectLayers.hpp" #include "GUI_App.hpp" +#include "Shortcuts.hpp" #include "I18N.hpp" #include "Plater.hpp" #include "BitmapComboBox.hpp" #include "MainFrame.hpp" #include "slic3r/Utils/UndoRedo.hpp" +#include "slic3r/plugin/PluginManager.hpp" #include "OptionsGroup.hpp" #include "Tab.hpp" @@ -245,56 +248,15 @@ ObjectList::ObjectList(wxWindow* parent) : // Key events are not correctly processed by the wxDataViewCtrl on OSX. // Our patched wxWidgets process the keyboard accelerators. // On the other hand, using accelerators will break in-place editing on Windows & Linux/GTK (there is no in-place editing working on OSX for wxDataViewCtrl for now). -// Bind(wxEVT_KEY_DOWN, &ObjectList::OnChar, this); - { - // Accelerators - // wxAcceleratorEntry entries[25]; - wxAcceleratorEntry entries[26]; - int index = 0; - entries[index++].Set(wxACCEL_CTRL, (int)'C', wxID_COPY); - entries[index++].Set(wxACCEL_CTRL, (int)'X', wxID_CUT); - entries[index++].Set(wxACCEL_CTRL, (int)'V', wxID_PASTE); - entries[index++].Set(wxACCEL_CTRL, (int)'M', wxID_DUPLICATE); - entries[index++].Set(wxACCEL_CTRL, (int)'A', wxID_SELECTALL); - entries[index++].Set(wxACCEL_CTRL, (int)'Z', wxID_UNDO); - entries[index++].Set(wxACCEL_CTRL, (int)'Y', wxID_REDO); - entries[index++].Set(wxACCEL_NORMAL, WXK_BACK, wxID_DELETE); - //entries[index++].Set(wxACCEL_NORMAL, int('+'), wxID_ADD); - //entries[index++].Set(wxACCEL_NORMAL, WXK_NUMPAD_ADD, wxID_ADD); - //entries[index++].Set(wxACCEL_NORMAL, int('-'), wxID_REMOVE); - //entries[index++].Set(wxACCEL_NORMAL, WXK_NUMPAD_SUBTRACT, wxID_REMOVE); - //entries[index++].Set(wxACCEL_NORMAL, int('p'), wxID_PRINT); - - int numbers_cnt = 0; - for (auto char_number : { '1', '2', '3', '4', '5', '6', '7', '8', '9' }) { - entries[index + numbers_cnt].Set(wxACCEL_NORMAL, int(char_number), wxID_LAST + numbers_cnt+1); - entries[index + 9 + numbers_cnt].Set(wxACCEL_NORMAL, WXK_NUMPAD0 + numbers_cnt - 1, wxID_LAST + numbers_cnt+1); - numbers_cnt++; - // index++; - } - wxAcceleratorTable accel(26, entries); - SetAcceleratorTable(accel); - - this->Bind(wxEVT_MENU, [this](wxCommandEvent &evt) { this->copy(); }, wxID_COPY); - this->Bind(wxEVT_MENU, [this](wxCommandEvent &evt) { this->paste(); }, wxID_PASTE); - this->Bind(wxEVT_MENU, [this](wxCommandEvent &evt) { this->select_item_all_children(); }, wxID_SELECTALL); - this->Bind(wxEVT_MENU, [this](wxCommandEvent &evt) { this->remove(); }, wxID_DELETE); - this->Bind(wxEVT_MENU, [this](wxCommandEvent &evt) { this->undo(); }, wxID_UNDO); - this->Bind(wxEVT_MENU, [this](wxCommandEvent &evt) { this->redo(); }, wxID_REDO); - this->Bind(wxEVT_MENU, [this](wxCommandEvent &evt) { this->cut(); }, wxID_CUT); - this->Bind(wxEVT_MENU, [this](wxCommandEvent &evt) { this->clone(); }, wxID_DUPLICATE); - //this->Bind(wxEVT_MENU, [this](wxCommandEvent &evt) { this->increase_instances(); }, wxID_ADD); - //this->Bind(wxEVT_MENU, [this](wxCommandEvent &evt) { this->decrease_instances(); }, wxID_REMOVE); - //this->Bind(wxEVT_MENU, [this](wxCommandEvent &evt) { this->toggle_printable_state(); }, wxID_PRINT); - - for (int i = 1; i < 10; i++) - this->Bind(wxEVT_MENU, [this, i](wxCommandEvent &evt) { - if (filaments_count() > 1 && i <= filaments_count()) - this->set_extruder_for_selected_items(i); - }, wxID_LAST+i); - - m_accel = accel; - } + m_shortcut_id_base = wxWindow::NewControlId(int(Shortcut::Count)); + for (size_t i = 0; i < size_t(Shortcut::Count); ++i) + this->Bind(wxEVT_MENU, [this, shortcut = Shortcut(i)](wxCommandEvent&) { dispatch_shortcut(shortcut); }, m_shortcut_id_base + int(i)); + for (int i = 1; i < 10; i++) + this->Bind(wxEVT_MENU, [this, i](wxCommandEvent &evt) { + if (filaments_count() > 1 && i <= filaments_count()) + this->set_extruder_for_selected_items(i); + }, wxID_LAST+i); + update_shortcut_accelerators(); #else //__WXOSX__ Bind(wxEVT_CHAR, [this](wxKeyEvent& event) { key_event(event); }); // doesn't work on OSX #endif @@ -1199,17 +1161,39 @@ void ObjectList::update_name_in_model(const wxDataViewItem& item) const if (m_objects_model->GetItemType(item) & itObject) { std::string name = m_objects_model->GetName(item).ToUTF8().data(); if (obj->name != name) { + const std::string previous_name = obj->name; obj->name = name; // if object has just one volume, rename this volume too if (obj->volumes.size() == 1) obj->volumes[0]->name = obj->name; Slic3r::save_object_mesh(*obj); + + LifecycleEventContext ctx; + ctx.name = name; + ctx.previous_name = previous_name; + ctx.id = std::to_string(obj->id().id); + ctx.index = obj_idx; + ctx.source = "object"; + fire_lifecycle_event(LifecycleEvent::ObjectRenamed, ctx); } return; } if (volume_id < 0) return; - obj->volumes[volume_id]->name = m_objects_model->GetName(item).ToUTF8().data(); + std::string name = m_objects_model->GetName(item).ToUTF8().data(); + if (obj->volumes[volume_id]->name == name) + return; + + const std::string previous_name = obj->volumes[volume_id]->name; + obj->volumes[volume_id]->name = name; + + LifecycleEventContext ctx; + ctx.name = name; + ctx.previous_name = previous_name; + ctx.id = std::to_string(obj->volumes[volume_id]->id().id); + ctx.index = volume_id; + ctx.source = "volume"; + fire_lifecycle_event(LifecycleEvent::ObjectRenamed, ctx); } void ObjectList::update_name_in_list(int obj_idx, int vol_idx) const @@ -1796,36 +1780,10 @@ void ObjectList::decrease_instances() #ifndef __WXOSX__ void ObjectList::key_event(wxKeyEvent& event) { - //if (event.GetKeyCode() == WXK_TAB) - // Navigate(event.ShiftDown() ? wxNavigationKeyEvent::IsBackward : wxNavigationKeyEvent::IsForward); - //else - if (event.GetKeyCode() == WXK_DELETE /*|| event.GetKeyCode() == WXK_BACK*/ ) - remove(); - //else if (event.GetKeyCode() == WXK_F5) - // wxGetApp().plater()->reload_all_from_disk(); - else if (wxGetKeyState(wxKeyCode('A')) && wxGetKeyState(WXK_CONTROL/*WXK_SHIFT*/)) - select_item_all_children(); - else if (wxGetKeyState(wxKeyCode('C')) && wxGetKeyState(WXK_CONTROL)) - copy(); - else if (wxGetKeyState(wxKeyCode('V')) && wxGetKeyState(WXK_CONTROL)) - paste(); - else if (wxGetKeyState(wxKeyCode('Y')) && wxGetKeyState(WXK_CONTROL)) - redo(); - else if (wxGetKeyState(wxKeyCode('Z')) && wxGetKeyState(WXK_CONTROL)) - undo(); - else if (wxGetKeyState(wxKeyCode('X')) && wxGetKeyState(WXK_CONTROL)) - cut(); - else if (wxGetKeyState(wxKeyCode('K')) && wxGetKeyState(WXK_CONTROL)) - clone(); - else if (event.GetUnicodeKey() == '+') - increase_instances(); - else if (event.GetUnicodeKey() == '-') - decrease_instances(); - else if (event.GetUnicodeKey() == 'p') - toggle_printable_state(); - else if (event.GetUnicodeKey() == 'd') - toggle_auto_drop(); - else if (filaments_count() > 1) { + const std::optional shortcut = wxGetApp().shortcuts().lookup(ShortcutContext::ObjectList, KeyChord::from_event(event)); + if (shortcut.has_value() && dispatch_shortcut(*shortcut)) + return; + if (filaments_count() > 1) { std::vector numbers = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' }; wxChar key_char = event.GetUnicodeKey(); if (std::find(numbers.begin(), numbers.end(), key_char) != numbers.end()) { @@ -1842,6 +1800,43 @@ void ObjectList::key_event(wxKeyEvent& event) } #endif /* __WXOSX__ */ +#ifdef __WXOSX__ +void ObjectList::update_shortcut_accelerators() +{ + std::vector entries; + const ShortcutRegistry& shortcuts = wxGetApp().shortcuts(); + for (Shortcut shortcut : shortcuts_in(ShortcutContext::ObjectList)) + if (const KeyChord chord = shortcuts.binding(shortcut); chord.valid()) + entries.push_back(chord.to_accelerator_entry(m_shortcut_id_base + int(shortcut))); + for (int i = 1; i < 10; ++i) { + entries.emplace_back(wxACCEL_NORMAL, '0' + i, wxID_LAST + i); + entries.emplace_back(wxACCEL_NORMAL, WXK_NUMPAD0 + i, wxID_LAST + i); + } + m_accel = wxAcceleratorTable(int(entries.size()), entries.data()); + SetAcceleratorTable(m_accel); +} +#endif /* __WXOSX__ */ + +bool ObjectList::dispatch_shortcut(Shortcut shortcut) +{ + switch (shortcut) { + case Shortcut::DeleteSelected: remove(); break; + case Shortcut::SelectAll: select_item_all_children(); break; + case Shortcut::Copy: copy(); break; + case Shortcut::Paste: paste(); break; + case Shortcut::Cut: cut(); break; + case Shortcut::Undo: undo(); break; + case Shortcut::Redo: redo(); break; + case Shortcut::CloneSelected: clone(); break; + case Shortcut::AddInstance: increase_instances(); break; + case Shortcut::RemoveInstance: decrease_instances(); break; + case Shortcut::TogglePrintable: toggle_printable_state(); break; + case Shortcut::ToggleAutoDrop: toggle_auto_drop(); break; + default: return false; + } + return true; +} + void ObjectList::OnBeginDrag(wxDataViewEvent &event) { const bool mult_sel = multiple_selection(); @@ -3548,7 +3543,14 @@ void ObjectList::delete_all_connectors_for_object(int obj_idx) obj->delete_connectors(); if (obj->volumes.empty() || !obj->has_solid_mesh()) { + const std::string deleted_obj_name = obj->name; model.delete_object(idx); + { + Slic3r::LifecycleEventContext ctx; + ctx.name = deleted_obj_name; + ctx.code = Slic3r::LifecycleEvtCode::Ok; + Slic3r::fire_lifecycle_event(Slic3r::LifecycleEvent::ObjectDeleted, ctx); + } m_objects_model->Delete(m_objects_model->GetItemById(idx)); continue; } @@ -4117,6 +4119,13 @@ void ObjectList::add_object_to_list(size_t obj_idx, bool call_selection_changed, const auto item = m_objects_model->AddObject(model_object, warning_bitmap, model_object->is_cut()); Expand(m_objects_model->GetParent(item)); + { + Slic3r::LifecycleEventContext ctx; + ctx.name = model_object->name; + ctx.code = Slic3r::LifecycleEvtCode::Ok; + Slic3r::fire_lifecycle_event(Slic3r::LifecycleEvent::ObjectAdded, ctx); + } + if (!do_info_update) return; diff --git a/src/slic3r/GUI/GUI_ObjectList.hpp b/src/slic3r/GUI/GUI_ObjectList.hpp index cab78b6adc..5705aa2c8b 100644 --- a/src/slic3r/GUI/GUI_ObjectList.hpp +++ b/src/slic3r/GUI/GUI_ObjectList.hpp @@ -40,6 +40,9 @@ typedef std::map t_layer_config_ranges; #define FIX_THROUGH_CGAL_ALWAYS 1 namespace GUI { + +enum class Shortcut : uint8_t; + struct ObjectVolumeID { ModelObject* object{ nullptr }; ModelVolume* volume{ nullptr }; @@ -270,7 +273,11 @@ public: void extruder_editing(); #ifndef __WXOSX__ void key_event(wxKeyEvent& event); +#else + // wxDataViewCtrl never sees key events on macOS, so the bindings are installed as accelerators. + void update_shortcut_accelerators(); #endif /* __WXOSX__ */ + bool dispatch_shortcut(Shortcut shortcut); void copy(); void paste(); @@ -482,8 +489,8 @@ public: private: #ifdef __WXOSX__ -// void OnChar(wxKeyEvent& event); wxAcceleratorTable m_accel; + wxWindowID m_shortcut_id_base; #endif /* __WXOSX__ */ void OnContextMenu(wxDataViewEvent &event); void list_manipulation(const wxPoint& mouse_pos, bool evt_context_menu = false); diff --git a/src/slic3r/GUI/GUI_Preview.cpp b/src/slic3r/GUI/GUI_Preview.cpp index ea3ae5d21d..2c44202876 100644 --- a/src/slic3r/GUI/GUI_Preview.cpp +++ b/src/slic3r/GUI/GUI_Preview.cpp @@ -280,8 +280,6 @@ bool Preview::init(wxWindow* parent, Bed3D& bed, Model* model) m_canvas->enable_assemble_view_toolbar(false); // sizer, m_canvas_widget - m_canvas_widget->Bind(wxEVT_KEY_DOWN, &Preview::update_layers_slider_from_canvas, this); - wxBoxSizer *main_sizer = new wxBoxSizer(wxVERTICAL); main_sizer->Add(m_canvas_widget, 1, wxALL | wxEXPAND, 0); @@ -505,28 +503,6 @@ void Preview::update_layers_slider_mode() m_layers_slider->SetModeAndOnlyExtruder(one_extruder_printed_model, only_extruder, can_change_color); } -void Preview::update_layers_slider_from_canvas(wxKeyEvent &event) -{ - if (event.HasModifiers()) { - event.Skip(); - return; - } - - const auto key = event.GetKeyCode(); - - IMSlider *m_layers_slider = m_canvas->get_gcode_viewer().get_layers_slider(); - IMSlider *m_moves_slider = m_canvas->get_gcode_viewer().get_moves_slider(); - if (key == 'L') { - if(!m_layers_slider->switch_one_layer_mode()) - event.Skip(); - m_canvas->set_as_dirty(); - } - /*else if (key == WXK_SHIFT) - m_layers_slider->UseDefaultColors(false);*/ - else - event.Skip(); -} - void Preview::update_layers_slider(const std::vector& layers_z, bool keep_z_range) { IMSlider *m_layers_slider = m_canvas->get_gcode_viewer().get_layers_slider(); diff --git a/src/slic3r/GUI/GUI_Preview.hpp b/src/slic3r/GUI/GUI_Preview.hpp index 5469e32b71..fdfe364fb8 100644 --- a/src/slic3r/GUI/GUI_Preview.hpp +++ b/src/slic3r/GUI/GUI_Preview.hpp @@ -171,7 +171,6 @@ private: void update_layers_slider(const std::vector& layers_z, bool keep_z_range = false); void update_layers_slider_mode(); - void update_layers_slider_from_canvas(wxKeyEvent &event); //BBS: add only gcode mode void load_print_as_fff(bool keep_z_range = false, bool only_gcode = false); }; diff --git a/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp b/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp index 99ad00fe55..09bb92dddf 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp @@ -354,7 +354,6 @@ bool GLGizmoAdvancedCut::on_init() if (!GLGizmoRotate3D::on_init()) return false; - m_shortcut_key = WXK_CONTROL_C; // initiate info shortcuts const wxString ctrl = GUI::shortkey_ctrl_prefix(); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp b/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp index e686d5bb8f..9560078cb2 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp @@ -1,6 +1,7 @@ #include "GLGizmoAssembly.hpp" #include "slic3r/GUI/GLCanvas3D.hpp" #include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/Shortcuts.hpp" #include "slic3r/GUI/Plater.hpp" #include "slic3r/GUI/Gizmos/GizmoObjectManipulation.hpp" #include "slic3r/Utils/UndoRedo.hpp" @@ -46,7 +47,7 @@ bool GLGizmoAssembly::on_init() { GLGizmoMeasure::on_init(); - m_shortcut_key = WXK_CONTROL_Y; + m_shortcut = Shortcut::GizmoAssembly; return true; } diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp index 1aaac99d40..6ff2c8213d 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp @@ -4,6 +4,7 @@ #include #include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/Shortcuts.hpp" #include "slic3r/GUI/Plater.hpp" #include "slic3r/GUI/GUI_Colors.hpp" @@ -299,7 +300,6 @@ GLGizmoBase::GLGizmoBase(GLCanvas3D &parent, const std::string &icon_filename, u : m_parent(parent) , m_group_id(-1) , m_state(Off) - , m_shortcut_key(NO_SHORTCUT_KEY_VALUE) , m_icon_filename(icon_filename) , m_sprite_id(sprite_id) , m_imgui(wxGetApp().imgui()) @@ -515,11 +515,8 @@ void GLGizmoBase::render_input_window(float x, float y, float bottom_limit) std::string GLGizmoBase::get_name(bool include_shortcut) const { - int key = get_shortcut_key(); - std::string out = on_get_name(); - if (include_shortcut && key >= WXK_CONTROL_A && key <= WXK_CONTROL_Z) - out += std::string(" [") + char(int('A') + key - int(WXK_CONTROL_A)) + "]"; - return out; + const std::string name = on_get_name(); + return include_shortcut && m_shortcut.has_value() ? wxGetApp().shortcuts().with_key(name, *m_shortcut) : name; } } // namespace GUI diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp b/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp index 92491d0d44..47e8f832a6 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp @@ -11,6 +11,7 @@ #include "slic3r/GUI/3DScene.hpp" #include +#include #include @@ -29,6 +30,7 @@ namespace GUI { class ImGuiWrapper; +enum class Shortcut : uint8_t; class GLCanvas3D; enum class CommonGizmosDataID; class CommonGizmosDataPool; @@ -72,9 +74,6 @@ public: NegZ = 1 << 5, }; - // Represents NO key(button on keyboard) value - static const int NO_SHORTCUT_KEY_VALUE = 0; - protected: struct Grabber { @@ -138,7 +137,7 @@ protected: int m_group_id; // TODO: remove only for rotate EState m_state; - int m_shortcut_key; + std::optional m_shortcut; // the registry entry that opens this gizmo std::string m_icon_filename; unsigned int m_sprite_id; int m_hover_id{ -1 }; @@ -169,7 +168,7 @@ public: EState get_state() const { return m_state; } void set_state(EState state) { m_state = state; on_set_state(); } - int get_shortcut_key() const { return m_shortcut_key; } + std::optional shortcut() const { return m_shortcut; } const std::string& get_icon_filename() const { return m_icon_filename; } diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp b/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp index 6d9e810815..750e5fe6cb 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp @@ -5,6 +5,7 @@ #include "slic3r/GUI/Camera.hpp" #include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp" #include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/Shortcuts.hpp" #include "slic3r/GUI/Plater.hpp" #include "libslic3r/ClipperUtils.hpp" #include "libslic3r/ExPolygon.hpp" @@ -46,7 +47,7 @@ bool GLGizmoBrimEars::on_init() { m_new_point_head_radius = get_brim_default_radius(); - m_shortcut_key = WXK_CONTROL_E; + m_shortcut = Shortcut::GizmoBrimEars; const wxString ctrl = GUI::shortkey_ctrl_prefix(); const wxString alt = GUI::shortkey_alt_prefix(); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp index 273bb94b90..2100b1fca7 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp @@ -6,6 +6,7 @@ #include #include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/Shortcuts.hpp" #include "slic3r/GUI/Plater.hpp" #include "slic3r/GUI/Gizmos/GizmoObjectManipulation.hpp" #include "slic3r/GUI/format.hpp" @@ -1310,7 +1311,7 @@ void GLGizmoCut3D::render_cut_line() bool GLGizmoCut3D::on_init() { m_grabbers.emplace_back(); - m_shortcut_key = WXK_CONTROL_C; + m_shortcut = Shortcut::GizmoCut; // initiate info shortcuts const wxString ctrl = GUI::shortkey_ctrl_prefix(); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp index ecf465afe7..1009a6e89b 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp @@ -1,6 +1,7 @@ #include "GLGizmoEmboss.hpp" #include "slic3r/GUI/GLCanvas3D.hpp" #include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/Shortcuts.hpp" #include "slic3r/GUI/GUI_ObjectList.hpp" #include "slic3r/GUI/Gizmos/GizmoObjectManipulation.hpp" #include "slic3r/GUI/MainFrame.hpp" // to update title when add text @@ -727,7 +728,7 @@ bool GLGizmoEmboss::on_init() m_rotate_gizmo.set_highlight_color(gray_color); // NOTE: It has special handling in GLGizmosManager::handle_shortcut - m_shortcut_key = WXK_CONTROL_T; + m_shortcut = Shortcut::GizmoEmboss; m_shortcuts = { {_L("Drag"), _L("Position on surface")} diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp index 035fb895aa..06d69c3e82 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp @@ -8,6 +8,7 @@ //#include "slic3r/GUI/3DScene.hpp" #include "slic3r/GUI/GLCanvas3D.hpp" #include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/Shortcuts.hpp" #include "slic3r/GUI/ImGuiWrapper.hpp" #include "slic3r/GUI/Plater.hpp" #include "slic3r/GUI/GUI_ObjectList.hpp" @@ -78,7 +79,7 @@ std::string GLGizmoFdmSupports::on_get_name() const bool GLGizmoFdmSupports::on_init() { // BBS - m_shortcut_key = WXK_CONTROL_L; + m_shortcut = Shortcut::GizmoFdmSupports; m_desc["perform"] = _L("Apply"); m_desc["on_overhangs_only"] = _L("On highlighted overhangs only"); @@ -149,25 +150,14 @@ void GLGizmoFdmSupports::render_painter_gizmo() glsafe(::glDisable(GL_BLEND)); } -// BBS -bool GLGizmoFdmSupports::on_key_down_select_tool_type(int keyCode) { - switch (keyCode) - { - case 'F': - m_current_tool = ImGui::FillButtonIcon; - break; - case 'S': - m_current_tool = ImGui::SphereButtonIcon; - break; - case 'C': - m_current_tool = ImGui::CircleButtonIcon; - break; - case 'G': - m_current_tool = ImGui::GapFillIcon; - break; - default: - return false; - break; +bool GLGizmoFdmSupports::on_tool_shortcut(Shortcut shortcut) +{ + switch (shortcut) { + case Shortcut::PaintToolFill: m_current_tool = ImGui::FillButtonIcon; break; + case Shortcut::PaintToolSphere: m_current_tool = ImGui::SphereButtonIcon; break; + case Shortcut::PaintToolCircle: m_current_tool = ImGui::CircleButtonIcon; break; + case Shortcut::PaintToolGapFill: m_current_tool = ImGui::GapFillIcon; break; + default: return false; } return true; } diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.hpp b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.hpp index 57a6cc1981..d282a06b65 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.hpp @@ -26,8 +26,7 @@ public: state_ready }; - //BBS - bool on_key_down_select_tool_type(int keyCode); + bool on_tool_shortcut(Shortcut shortcut) override; protected: void on_render_input_window(float x, float y, float bottom_limit) override; diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp index e9d8598423..54dbd96ba7 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp @@ -1,6 +1,7 @@ #include "GLGizmoFlatten.hpp" #include "slic3r/GUI/GLCanvas3D.hpp" #include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/Shortcuts.hpp" #include "slic3r/GUI/Plater.hpp" #include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp" @@ -54,7 +55,7 @@ void GLGizmoFlatten::data_changed(bool is_serializing) bool GLGizmoFlatten::on_init() { - m_shortcut_key = WXK_CONTROL_F; + m_shortcut = Shortcut::GizmoFlatten; return true; } diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp index d807e466c8..8938e8a264 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp @@ -6,6 +6,7 @@ #include "slic3r/GUI/GLCanvas3D.hpp" #include "slic3r/GUI/GUI.hpp" #include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/Shortcuts.hpp" #include "slic3r/GUI/GUI_ObjectList.hpp" #include "slic3r/GUI/ImGuiWrapper.hpp" #include "slic3r/GUI/MsgDialog.hpp" @@ -31,7 +32,7 @@ std::string GLGizmoFuzzySkin::on_get_name() const bool GLGizmoFuzzySkin::on_init() { - m_shortcut_key = WXK_CONTROL_H; + m_shortcut = Shortcut::GizmoFuzzySkin; const wxString ctrl = GUI::shortkey_ctrl_prefix(); const wxString alt = GUI::shortkey_alt_prefix(); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp b/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp index 843a4b45fe..e5c6502452 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp @@ -25,7 +25,6 @@ GLGizmoHollow::GLGizmoHollow(GLCanvas3D& parent, const std::string& icon_filenam bool GLGizmoHollow::on_init() { - m_shortcut_key = WXK_CONTROL_H; m_desc["enable"] = _(L("Hollow this object")); m_desc["preview"] = _(L("Preview hollowed and drilled model")); m_desc["offset"] = _(L("Offset")) + ": "; diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp index ba2f54d5c5..8ec564e5b4 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp @@ -2,6 +2,7 @@ #include "slic3r/GUI/GUI.hpp" #include "slic3r/GUI/GLCanvas3D.hpp" #include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/Shortcuts.hpp" #include "slic3r/GUI/Plater.hpp" #include "slic3r/GUI/Gizmos/GizmoObjectManipulation.hpp" #include "slic3r/Utils/UndoRedo.hpp" @@ -449,7 +450,7 @@ bool GLGizmoMeasure::gizmo_event(SLAGizmoEventType action, const Vec2d& mouse_po bool GLGizmoMeasure::on_init() { - m_shortcut_key = WXK_CONTROL_U; + m_shortcut = Shortcut::GizmoMeasure; const wxString shift = GUI::shortkey_shift_prefix(); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp index 8b12da14f9..b91f0a9468 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp @@ -1,5 +1,6 @@ #include "GLGizmoMeshBoolean.hpp" #include "slic3r/GUI/GLCanvas3D.hpp" +#include "slic3r/GUI/Shortcuts.hpp" #include "slic3r/GUI/ImGuiWrapper.hpp" #include "slic3r/GUI/GUI.hpp" #include "libslic3r/MeshBoolean.hpp" @@ -104,7 +105,7 @@ bool GLGizmoMeshBoolean::on_mouse(const wxMouseEvent &mouse_event) bool GLGizmoMeshBoolean::on_init() { - m_shortcut_key = WXK_CONTROL_B; + m_shortcut = Shortcut::GizmoMeshBoolean; return true; } diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp index 3d4af75cde..2e741fa5e5 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp @@ -2,6 +2,7 @@ #include "slic3r/GUI/GLCanvas3D.hpp" #include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/Shortcuts.hpp" #include "slic3r/GUI/ImGuiWrapper.hpp" #include "slic3r/GUI/Camera.hpp" #include "slic3r/GUI/Plater.hpp" @@ -90,7 +91,7 @@ void GLGizmoMmuSegmentation::init_extruders_data() bool GLGizmoMmuSegmentation::on_init() { // BBS - m_shortcut_key = WXK_CONTROL_N; + m_shortcut = Shortcut::GizmoMmuSegmentation; const wxString ctrl = GUI::shortkey_ctrl_prefix(); const wxString alt = GUI::shortkey_alt_prefix(); @@ -209,30 +210,16 @@ bool GLGizmoMmuSegmentation::on_number_key_down(int number) return true; } -bool GLGizmoMmuSegmentation::on_key_down_select_tool_type(int keyCode) { - switch (keyCode) - { - case 'F': - m_current_tool = ImGui::FillButtonIcon; - break; - case 'T': - m_current_tool = ImGui::TriangleButtonIcon; - break; - case 'S': - m_current_tool = ImGui::SphereButtonIcon; - break; - case 'C': - m_current_tool = ImGui::CircleButtonIcon; - break; - case 'H': - m_current_tool = ImGui::HeightRangeIcon; - break; - case 'G': - m_current_tool = ImGui::GapFillIcon; - break; - default: - return false; - break; +bool GLGizmoMmuSegmentation::on_tool_shortcut(Shortcut shortcut) +{ + switch (shortcut) { + case Shortcut::PaintToolFill: m_current_tool = ImGui::FillButtonIcon; break; + case Shortcut::PaintToolTriangle: m_current_tool = ImGui::TriangleButtonIcon; break; + case Shortcut::PaintToolSphere: m_current_tool = ImGui::SphereButtonIcon; break; + case Shortcut::PaintToolCircle: m_current_tool = ImGui::CircleButtonIcon; break; + case Shortcut::PaintToolHeightRange: m_current_tool = ImGui::HeightRangeIcon; break; + case Shortcut::PaintToolGapFill: m_current_tool = ImGui::GapFillIcon; break; + default: return false; } return true; } diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp index 70cfde5aed..b2b04acdbe 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp @@ -82,7 +82,7 @@ public: // BBS bool on_number_key_down(int number); - bool on_key_down_select_tool_type(int keyCode); + bool on_tool_shortcut(Shortcut shortcut) override; protected: // BBS diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp index 2f3195620a..4bee1a6cfc 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp @@ -1,6 +1,7 @@ #include "GLGizmoMove.hpp" #include "slic3r/GUI/GLCanvas3D.hpp" #include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/Shortcuts.hpp" //BBS: GUI refactor #include "slic3r/GUI/Plater.hpp" #include "libslic3r/AppConfig.hpp" @@ -61,7 +62,7 @@ bool GLGizmoMove3D::on_init() m_grabbers[0].angles = { 0.0, 0.5 * double(PI), 0.0 }; m_grabbers[1].angles = { -0.5 * double(PI), 0.0, 0.0 }; - m_shortcut_key = WXK_CONTROL_M; + m_shortcut = Shortcut::GizmoMove; return true; } diff --git a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp index 63e9d3f436..9ba6065458 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp @@ -192,6 +192,8 @@ public: ~GLGizmoPainterBase() override; void data_changed(bool is_serializing) override; virtual bool gizmo_event(SLAGizmoEventType action, const Vec2d& mouse_position, bool shift_down, bool alt_down, bool control_down); + // Switches the painting tool a Painting-context shortcut names; false when this gizmo has no such tool. + virtual bool on_tool_shortcut(Shortcut shortcut) { return false; } // Following function renders the triangles and cursor. Having this separated // from usual on_render method allows to render them before transparent diff --git a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp index 5521640eee..835b97f072 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp @@ -3,6 +3,7 @@ #include "slic3r/GUI/ImGuiWrapper.hpp" #include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/Shortcuts.hpp" #include "slic3r/GUI/GUI.hpp" #include "slic3r/GUI/Plater.hpp" #include "slic3r/GUI/Jobs/RotoptimizeJob.hpp" @@ -555,7 +556,7 @@ bool GLGizmoRotate3D::on_init() for (unsigned int i = 0; i < 3; ++i) m_gizmos[i].set_highlight_color(AXES_COLOR[i]); - m_shortcut_key = WXK_CONTROL_R; + m_shortcut = Shortcut::GizmoRotate; return true; } diff --git a/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp b/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp index 88e744c2b8..c30acba386 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp @@ -1,6 +1,7 @@ #include "GLGizmoScale.hpp" #include "slic3r/GUI/GLCanvas3D.hpp" #include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/Shortcuts.hpp" #include "slic3r/GUI/Plater.hpp" #include @@ -135,7 +136,7 @@ bool GLGizmoScale3D::on_init() // BBS m_grabbers[4].enabled = false; - m_shortcut_key = WXK_CONTROL_S; + m_shortcut = Shortcut::GizmoScale; return true; } diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp index b211a18fb2..f36a47c8ec 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp @@ -5,6 +5,7 @@ //#include "slic3r/GUI/3DScene.hpp" #include "slic3r/GUI/GLCanvas3D.hpp" #include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/Shortcuts.hpp" #include "slic3r/GUI/ImGuiWrapper.hpp" #include "slic3r/GUI/Plater.hpp" #include "slic3r/GUI/GUI_ObjectList.hpp" @@ -28,7 +29,7 @@ void GLGizmoSeam::on_shutdown() bool GLGizmoSeam::on_init() { - m_shortcut_key = WXK_CONTROL_P; + m_shortcut = Shortcut::GizmoSeam; const wxString ctrl = GUI::shortkey_ctrl_prefix(); const wxString alt = GUI::shortkey_alt_prefix(); @@ -86,19 +87,12 @@ void GLGizmoSeam::render_painter_gizmo() glsafe(::glDisable(GL_BLEND)); } -// BBS -bool GLGizmoSeam::on_key_down_select_tool_type(int keyCode) { - switch (keyCode) - { - case 'S': - m_current_tool = ImGui::SphereButtonIcon; - break; - case 'C': - m_current_tool = ImGui::CircleButtonIcon; - break; - default: - return false; - break; +bool GLGizmoSeam::on_tool_shortcut(Shortcut shortcut) +{ + switch (shortcut) { + case Shortcut::PaintToolSphere: m_current_tool = ImGui::SphereButtonIcon; break; + case Shortcut::PaintToolCircle: m_current_tool = ImGui::CircleButtonIcon; break; + default: return false; } return true; } diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSeam.hpp b/src/slic3r/GUI/Gizmos/GLGizmoSeam.hpp index 5b143dc32c..f1c48a12d6 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSeam.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSeam.hpp @@ -12,8 +12,7 @@ public: void render_painter_gizmo() override; - //BBS - bool on_key_down_select_tool_type(int keyCode); + bool on_tool_shortcut(Shortcut shortcut) override; protected: // BBS diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp index ca22b14d99..49818e8e11 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp @@ -34,7 +34,6 @@ GLGizmoSlaSupports::GLGizmoSlaSupports(GLCanvas3D& parent, const std::string& ic bool GLGizmoSlaSupports::on_init() { - m_shortcut_key = WXK_CONTROL_L; m_desc["head_diameter"] = _L("Head diameter") + ": "; m_desc["lock_supports"] = _L("Lock supports under new islands"); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoText.cpp b/src/slic3r/GUI/Gizmos/GLGizmoText.cpp index df3e9be584..9ae979eeef 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoText.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoText.cpp @@ -261,7 +261,6 @@ bool GLGizmoText::on_init() //m_avail_font_names = init_occt_fonts(); update_font_texture(); m_scale = m_imgui->get_font_size(); - m_shortcut_key = WXK_CONTROL_T; m_grabbers.push_back(Grabber()); diff --git a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp index 17a7b769c3..dc51518acc 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp @@ -4,6 +4,7 @@ #include "slic3r/GUI/3DScene.hpp" #include "slic3r/GUI/Camera.hpp" #include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/Shortcuts.hpp" #include "slic3r/GUI/GUI_ObjectList.hpp" #include "slic3r/GUI/Plater.hpp" #include "slic3r/Utils/UndoRedo.hpp" @@ -486,15 +487,13 @@ bool GLGizmosManager::is_running() const return m_current != Undefined; } -bool GLGizmosManager::handle_shortcut(int key) +bool GLGizmosManager::open_gizmo_by_shortcut(Shortcut shortcut) { if (!m_enabled) return false; - auto is_key = [pressed_key = key](int gizmo_key) { return (gizmo_key == pressed_key - 64) || (gizmo_key == pressed_key - 96); }; - // allowe open shortcut even when selection is empty - if (GLGizmoBase* gizmo_emboss = m_gizmos[Emboss].get(); - is_key(gizmo_emboss->get_shortcut_key())) { + // The text tool opens without a selection because it creates its own object. + if (GLGizmoBase* gizmo_emboss = m_gizmos[Emboss].get(); gizmo_emboss->shortcut() == shortcut) { dynamic_cast(gizmo_emboss)->on_shortcut_key(); return true; } @@ -502,16 +501,21 @@ bool GLGizmosManager::handle_shortcut(int key) if (m_parent.get_selection().is_empty()) return false; - auto is_gizmo = [is_key](const std::unique_ptr &gizmo) { - return gizmo->is_activable() && is_key(gizmo->get_shortcut_key()); - }; - auto it = std::find_if(m_gizmos.begin(), m_gizmos.end(), is_gizmo); - + auto it = std::find_if(m_gizmos.begin(), m_gizmos.end(), [shortcut](const std::unique_ptr &gizmo) { + return gizmo->is_activable() && gizmo->shortcut() == shortcut; + }); if (it == m_gizmos.end()) return false; - EType gizmo_type = EType(it - m_gizmos.begin()); - return open_gizmo(gizmo_type); + return open_gizmo(EType(it - m_gizmos.begin())); +} + +bool GLGizmosManager::on_delete_key() +{ + const bool processed = (m_current == Cut || m_current == Measure || m_current == Assembly) && gizmo_event(SLAGizmoEventType::Delete); + if (processed) + m_parent.set_as_dirty(); + return processed; } bool GLGizmosManager::is_dragging() const @@ -856,15 +860,6 @@ bool GLGizmosManager::on_char(wxKeyEvent& evt) } break; } - //skip some keys when gizmo - case 'A': - case 'a': - { - if (is_running()) { - processed = true; - } - break; - } //case WXK_RETURN: //{ // if ((m_current == SlaSupports) && gizmo_event(SLAGizmoEventType::ApplyChanges)) @@ -883,12 +878,6 @@ bool GLGizmosManager::on_char(wxKeyEvent& evt) //} - case WXK_BACK: - case WXK_DELETE: { - if ((m_current == Cut || m_current == Measure || m_current == Assembly) && gizmo_event(SLAGizmoEventType::Delete)) - processed = true; - break; - } //case 'A': //case 'a': //{ @@ -932,11 +921,6 @@ bool GLGizmosManager::on_char(wxKeyEvent& evt) } } - if (!processed && !evt.HasModifiers()) { - if (handle_shortcut(keyCode)) - processed = true; - } - if (processed) m_parent.set_as_dirty(); @@ -1077,40 +1061,24 @@ bool GLGizmosManager::on_key(wxKeyEvent& evt) processed = select(digit); } } - else if (keyCode == 'F' || keyCode == 'T' || keyCode == 'S' || keyCode == 'C' || keyCode == 'H' || keyCode == 'G') { - processed = mmu_seg->on_key_down_select_tool_type(keyCode); - if (processed) { - // force extra frame to automatically update window size - wxGetApp().imgui()->set_requires_extra_frame(); - } - } } } - else if (m_current == FdmSupports) { - GLGizmoFdmSupports* fdm_support = dynamic_cast(get_current()); - if (fdm_support != nullptr && (keyCode == 'F' || keyCode == 'S' || keyCode == 'C' || keyCode == 'G')) { - processed = fdm_support->on_key_down_select_tool_type(keyCode); - } - if (processed) { - // force extra frame to automatically update window size - wxGetApp().imgui()->set_requires_extra_frame(); - } - } - else if (m_current == Seam) { - GLGizmoSeam* seam = dynamic_cast(get_current()); - if (seam != nullptr && (keyCode == 'S' || keyCode == 'C')) { - processed = seam->on_key_down_select_tool_type(keyCode); - } - if (processed) { - // force extra frame to automatically update window size - wxGetApp().imgui()->set_requires_extra_frame(); - } - } else if (m_current == Measure || m_current == Assembly) { + else if (m_current == Measure || m_current == Assembly) { if (keyCode == WXK_CONTROL) gizmo_event(SLAGizmoEventType::CtrlDown, Vec2d::Zero(), evt.ShiftDown(), evt.AltDown(), evt.CmdDown()); else if (keyCode == WXK_SHIFT) gizmo_event(SLAGizmoEventType::ShiftDown, Vec2d::Zero(), evt.ShiftDown(), evt.AltDown(), evt.CmdDown()); } + + if (!processed) { + if (auto painter = dynamic_cast(get_current()); painter != nullptr) { + const std::optional shortcut = wxGetApp().shortcuts().lookup(ShortcutContext::Painting, KeyChord::from_event(evt)); + processed = shortcut.has_value() && painter->on_tool_shortcut(*shortcut); + if (processed) + // force extra frame to automatically update window size + wxGetApp().imgui()->set_requires_extra_frame(); + } + } } if (processed) diff --git a/src/slic3r/GUI/Gizmos/GLGizmosManager.hpp b/src/slic3r/GUI/Gizmos/GLGizmosManager.hpp index 5f249d2ef7..2a4afac16d 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmosManager.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.hpp @@ -263,7 +263,10 @@ public: EType get_gizmo_from_name(const std::string& gizmo_name) const; bool is_running() const; - bool handle_shortcut(int key); + // Opens the gizmo bound to a Plater-context shortcut; false when no gizmo has it or it cannot open now. + bool open_gizmo_by_shortcut(Shortcut shortcut); + // Lets the current gizmo consume the delete key; false when it did not. + bool on_delete_key(); bool is_dragging() const; diff --git a/src/slic3r/GUI/HMSPanel.cpp b/src/slic3r/GUI/HMSPanel.cpp index cd3d35bfc8..c2a8314bd5 100644 --- a/src/slic3r/GUI/HMSPanel.cpp +++ b/src/slic3r/GUI/HMSPanel.cpp @@ -122,7 +122,8 @@ HMSNotifyItem::HMSNotifyItem(const std::string& dev_id, wxWindow *parent, DevHMS m_hms_content->Bind(wxEVT_LEFT_UP, [this](wxMouseEvent& e) { wxCommandEvent evt(EVT_ALREADY_READ_HMS); evt.SetString(long_error_code); - wxPostEvent(wxGetApp().mainframe->m_monitor, evt); + if (MonitorPanel* monitor = MonitorPanel::if_built()) + wxPostEvent(monitor, evt); if (!m_url.empty()) wxLaunchDefaultBrowser(m_url); }); diff --git a/src/slic3r/GUI/HintNotification.cpp b/src/slic3r/GUI/HintNotification.cpp index c08a447e1e..de5f12e07e 100644 --- a/src/slic3r/GUI/HintNotification.cpp +++ b/src/slic3r/GUI/HintNotification.cpp @@ -5,6 +5,7 @@ #include "GUI_ObjectList.hpp" #include "GLCanvas3D.hpp" #include "MainFrame.hpp" +#include "Preferences.hpp" #include "Tab.hpp" #include "libslic3r/AppConfig.hpp" #include "libslic3r/Utils.hpp" @@ -444,9 +445,8 @@ void HintDatabase::load_hints_from_file(const boost::filesystem::path& path) // open preferences } else if (dict["hypertext_type"] == "preferences") { - std::string page = dict["hypertext_preferences_page"]; std::string item = dict["hypertext_preferences_item"]; - HintData hint_data{ id_string, text1, weight, was_displayed, hypertext_text, follow_text, disabled_tags, enabled_tags, false, documentation_link, img_url, [page, item]() { wxGetApp().open_preferences(1, page); } };// 1 is to modify + HintData hint_data{ id_string, text1, weight, was_displayed, hypertext_text, follow_text, disabled_tags, enabled_tags, false, documentation_link, img_url, [item]() { wxGetApp().open_preferences(PreferencesTab::Control, item); } }; m_loaded_hints.emplace_back(hint_data); } else if (dict["hypertext_type"] == "plater") { diff --git a/src/slic3r/GUI/IdleScheduler.cpp b/src/slic3r/GUI/IdleScheduler.cpp new file mode 100644 index 0000000000..2b71a9f8e6 --- /dev/null +++ b/src/slic3r/GUI/IdleScheduler.cpp @@ -0,0 +1,100 @@ +#include "IdleScheduler.hpp" + +#include + +#include + +#include "libslic3r/Utils.hpp" + +#ifdef _WIN32 +#include +#endif + +namespace Slic3r { namespace GUI { + +namespace { + +// The timer's period while waiting for the user to go quiet. +constexpr int tick_ms = 250; +// Input-free time before a slice may start, about a double-click interval, so a user +// mid-gesture is left alone. +constexpr int quiet_ms = 500; +// Budget of one slice. The next slice is a timer message, so paint, timers and input +// queued meanwhile are handled first; a click waits at most a slice plus the unit that +// overran it. +constexpr int slice_ms = 40; +// On GTK a due timer runs ahead of repaints and posted events, so the next slice waits a few ms. +#ifdef __WXGTK__ +constexpr int next_slice_ms = 5; +#else +constexpr int next_slice_ms = 0; +#endif + +// True when unhandled keyboard, button, touch or pen input is queued; only Windows can ask. +bool input_pending() +{ +#ifdef _WIN32 + // Windows synthesizes a mouse move whenever a window appears under the cursor, so those + // do not count. + return (GetQueueStatus(QS_INPUT & ~QS_MOUSEMOVE) >> 16) != 0; +#else + return false; +#endif +} + +} // namespace + +IdleScheduler::IdleScheduler(std::function input_idle_ms) : m_input_idle_ms(std::move(input_idle_ms)) +{ + m_timer.Bind(wxEVT_TIMER, [this](wxTimerEvent&) { tick(); }); +} + +void IdleScheduler::start() +{ + if (!m_timer.IsRunning()) + m_timer.Start(tick_ms); +} + +void IdleScheduler::stop() +{ + m_timer.Stop(); +} + +void IdleScheduler::tick() +{ + // A unit that pumps the event loop lets the timer fire inside its own slice. + if (m_in_slice) + return; + if (!m_queue.pending()) { + stop(); + return; + } + if (m_input_idle_ms() < quiet_ms || input_pending()) { + start(); + return; + } + const auto now_ms = [] { + return std::chrono::duration_cast(std::chrono::steady_clock::now().time_since_epoch()).count(); + }; + const char* const fn = __FUNCTION__; + m_in_slice = true; + PrebuildQueue::Slice slice; + { + ScopeGuard in_slice([this] { m_in_slice = false; }); + slice = m_queue.run_slice(slice_ms, now_ms, input_pending, [fn](const std::string& name, long long ms) { + BOOST_LOG_TRIVIAL(debug) << fn << ": " << name << ": unit took " << ms << " ms"; + }); + } + if (slice.completed) + BOOST_LOG_TRIVIAL(info) << fn << ": task complete: " << slice.name << ", " << slice.units << " unit(s) in " << slice.ms << " ms this slice"; + else + BOOST_LOG_TRIVIAL(debug) << fn << ": " << slice.name << ": " << slice.units << " unit(s) in " << slice.ms << " ms, yielding"; + if (!slice.remaining) + stop(); + else if (input_pending()) + m_timer.Start(tick_ms); + else + m_timer.StartOnce(next_slice_ms); +} + +}} // namespace Slic3r::GUI diff --git a/src/slic3r/GUI/IdleScheduler.hpp b/src/slic3r/GUI/IdleScheduler.hpp new file mode 100644 index 0000000000..7c31e9414c --- /dev/null +++ b/src/slic3r/GUI/IdleScheduler.hpp @@ -0,0 +1,41 @@ +#pragma once + +#include +#include + +#include +#include + +#include "PrebuildQueue.hpp" + +namespace Slic3r { namespace GUI { + +// Runs the queue's units while the user is idle. Once the user has been idle long enough, +// slices run one per timer message until the work is done or input arrives, so the event +// loop handles what it has between slices. Main thread only. +class IdleScheduler +{ +public: + // input_idle_ms reports how long ago the user last touched the mouse or keyboard. + explicit IdleScheduler(std::function input_idle_ms); + + void add(LazyBase& task) { m_queue.add(task); } + void clear() { m_queue.clear(); } + // The task names in queue order, for a log line. + std::string names() const { return m_queue.names(); } + + // Arms the timer; it stops itself once no task is pending, so call again when a task + // appears. + void start(); + void stop(); + +private: + void tick(); + + PrebuildQueue m_queue; + wxTimer m_timer; + std::function m_input_idle_ms; + bool m_in_slice{ false }; +}; + +}} // namespace Slic3r::GUI diff --git a/src/slic3r/GUI/Jobs/ArrangeJob.cpp b/src/slic3r/GUI/Jobs/ArrangeJob.cpp index 0362008593..8766194a0f 100644 --- a/src/slic3r/GUI/Jobs/ArrangeJob.cpp +++ b/src/slic3r/GUI/Jobs/ArrangeJob.cpp @@ -13,6 +13,7 @@ #include "slic3r/GUI/NotificationManager.hpp" #include "slic3r/GUI/format.hpp" #include "slic3r/GUI/GUI_ObjectList.hpp" +#include "slic3r/plugin/PluginManager.hpp" #include "libnest2d/common.hpp" @@ -747,6 +748,13 @@ void ArrangeJob::finalize(bool canceled, std::exception_ptr &eptr) { BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(":arrange m_unprintable: name: %4%, bed_id %1%, trans {%2%,%3%}") % ap.bed_idx % unscale(ap.translation(X)) % unscale(ap.translation(Y)) % ap.name; } + { + Slic3r::LifecycleEventContext ctx; + ctx.code = Slic3r::LifecycleEvtCode::Ok; + ctx.msg = "arranged"; + Slic3r::fire_lifecycle_event(Slic3r::LifecycleEvent::ObjectTransformed, ctx); + } + m_plater->update(); // BBS //wxGetApp().obj_manipul()->set_dirty(); diff --git a/src/slic3r/GUI/Jobs/FillBedJob.cpp b/src/slic3r/GUI/Jobs/FillBedJob.cpp index 5364cb5648..961b8af566 100644 --- a/src/slic3r/GUI/Jobs/FillBedJob.cpp +++ b/src/slic3r/GUI/Jobs/FillBedJob.cpp @@ -6,6 +6,7 @@ #include "slic3r/GUI/Plater.hpp" #include "slic3r/GUI/GLCanvas3D.hpp" #include "slic3r/GUI/GUI_ObjectList.hpp" +#include "slic3r/plugin/PluginManager.hpp" #include "libnest2d/common.hpp" #include @@ -347,6 +348,13 @@ void FillBedJob::finalize(bool canceled, std::exception_ptr &eptr) m_plater->arrange(); } m_plater->update(); + + { + Slic3r::LifecycleEventContext ctx; + ctx.code = Slic3r::LifecycleEvtCode::Ok; + ctx.msg = "arranged"; + Slic3r::fire_lifecycle_event(Slic3r::LifecycleEvent::ObjectTransformed, ctx); + } } m_plater->mark_plate_toolbar_image_dirty(); diff --git a/src/slic3r/GUI/Jobs/OrientJob.cpp b/src/slic3r/GUI/Jobs/OrientJob.cpp index ee8ea875c0..ed9117e8bf 100644 --- a/src/slic3r/GUI/Jobs/OrientJob.cpp +++ b/src/slic3r/GUI/Jobs/OrientJob.cpp @@ -5,6 +5,7 @@ #include "slic3r/GUI/GUI.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/NotificationManager.hpp" +#include "slic3r/plugin/PluginManager.hpp" #include "libslic3r/PresetBundle.hpp" @@ -254,6 +255,12 @@ void OrientJob::finalize(bool canceled, std::exception_ptr &eptr) mesh.apply(); } + if (!m_selected.empty()) { + Slic3r::LifecycleEventContext ctx; + ctx.code = Slic3r::LifecycleEvtCode::Ok; + ctx.msg = "auto_oriented"; + Slic3r::fire_lifecycle_event(Slic3r::LifecycleEvent::ObjectTransformed, ctx); + } m_plater->update(); diff --git a/src/slic3r/GUI/Jobs/PrintJob.cpp b/src/slic3r/GUI/Jobs/PrintJob.cpp index dae05494e3..76e45eb1d7 100644 --- a/src/slic3r/GUI/Jobs/PrintJob.cpp +++ b/src/slic3r/GUI/Jobs/PrintJob.cpp @@ -1,4 +1,5 @@ #include "PrintJob.hpp" +#include "libslic3r/LifecycleEvents.hpp" #include "libslic3r/MTUtils.hpp" #include "libslic3r/Model.hpp" #include "libslic3r/PresetBundle.hpp" @@ -152,6 +153,18 @@ void PrintJob::process(Ctl &ctl) int result = -1; std::string http_body; + const auto mark_lifecycle_started = [this]() { + if (m_lifecycle_started) + return; + + LifecycleEventContext start_ctx; + start_ctx.name = m_project_name; + start_ctx.device_id = m_dev_id; + start_ctx.source = "print_job"; + fire_lifecycle_event(LifecycleEvent::PrintJobStarted, start_ctx); + m_lifecycle_started = true; + }; + int total_plate_num = plate_data.plate_count; if (!plate_data.is_valid) { total_plate_num = m_plater->get_partplate_list().get_plate_count(); @@ -173,7 +186,7 @@ void PrintJob::process(Ctl &ctl) } } - m_project_name = truncate_string(m_project_name, 100); + const std::string transport_project_name = truncate_string(m_project_name, 100); int curr_plate_idx = 0; if (m_print_type == "from_normal") { @@ -372,11 +385,11 @@ void PrintJob::process(Ctl &ctl) } } - if (params.preset_name.empty() && m_print_type == "from_normal") { params.preset_name = wxString::Format("%s_plate_%d", m_project_name, curr_plate_idx).ToStdString(); } - if (params.project_name.empty()) {params.project_name = m_project_name;} + if (params.preset_name.empty() && m_print_type == "from_normal") { params.preset_name = wxString::Format("%s_plate_%d", transport_project_name, curr_plate_idx).ToStdString(); } + if (params.project_name.empty()) {params.project_name = transport_project_name;} if (m_is_calibration_task) { - params.project_name = m_project_name; + params.project_name = transport_project_name; params.origin_model_id = ""; } @@ -543,6 +556,7 @@ void PrintJob::process(Ctl &ctl) if (m_print_type == "from_sdcard_view") { BOOST_LOG_TRIVIAL(info) << "print_job: try to send with cloud, model is sdcard view"; ctl.update_status(curr_percent, _u8L("Sending print job through cloud service")); + mark_lifecycle_started(); result = m_agent->start_sdcard_print(params, update_fn, cancel_fn); } else if (params.connection_type != "lan") { if (params.dev_ip.empty()) @@ -566,6 +580,7 @@ void PrintJob::process(Ctl &ctl) BOOST_LOG_TRIVIAL(info) << "print_job: use ftp send print only"; ctl.update_status(curr_percent, _u8L("Sending print job over LAN")); is_try_lan_mode = true; + mark_lifecycle_started(); result = m_agent->start_local_print_with_record(params, update_fn, cancel_fn, wait_fn); if (result < 0) { error_text = wxString::Format(_L("Access code:%s IP address:%s"), params.password, params.dev_ip); @@ -582,6 +597,7 @@ void PrintJob::process(Ctl &ctl) // try to send local with record BOOST_LOG_TRIVIAL(info) << "print_job: try to start local print with record"; ctl.update_status(curr_percent, _u8L("Sending print job over LAN")); + mark_lifecycle_started(); result = m_agent->start_local_print_with_record(params, update_fn, cancel_fn, wait_fn); if (result == 0) { params.comments = ""; @@ -597,18 +613,21 @@ void PrintJob::process(Ctl &ctl) // try to send with cloud BOOST_LOG_TRIVIAL(warning) << "print_job: try to send with cloud"; ctl.update_status(curr_percent, _u8L("Sending print job through cloud service")); + // Started was already emitted before the local attempt. result = m_agent->start_print(params, update_fn, cancel_fn, wait_fn); } } else { BOOST_LOG_TRIVIAL(info) << "print_job: send with cloud"; ctl.update_status(curr_percent, _u8L("Sending print job through cloud service")); + mark_lifecycle_started(); result = m_agent->start_print(params, update_fn, cancel_fn, wait_fn); } } } else { if (this->could_emmc_print) { ctl.update_status(curr_percent, _u8L("Sending print job over LAN")); + mark_lifecycle_started(); result = m_agent->start_local_print(params, update_fn, cancel_fn); } else { switch(this->sdcard_state) { @@ -619,6 +638,7 @@ void PrintJob::process(Ctl &ctl) if(this->has_sdcard) { // means the storage is abnormal but can be used option is enabled ctl.update_status(curr_percent, _u8L("Sending print job over LAN, but the Storage in the printer is abnormal and print-issues may be caused by this.")); + mark_lifecycle_started(); result = m_agent->start_local_print(params, update_fn, cancel_fn); break; } @@ -629,6 +649,7 @@ void PrintJob::process(Ctl &ctl) return; case DevStorage::SdcardState::HAS_SDCARD_NORMAL: ctl.update_status(curr_percent, _u8L("Sending print job over LAN")); + mark_lifecycle_started(); result = m_agent->start_local_print(params, update_fn, cancel_fn); break; default: @@ -686,6 +707,7 @@ void PrintJob::process(Ctl &ctl) } wxQueueEvent(m_plater, evt); m_job_finished = true; + m_lifecycle_success = true; } } @@ -698,6 +720,19 @@ void PrintJob::finalize(bool canceled, std::exception_ptr &eptr) { eptr = std::current_exception(); } + if (m_lifecycle_started && !m_lifecycle_finished) { + LifecycleEventContext finish_ctx; + finish_ctx.name = m_project_name; + finish_ctx.device_id = m_dev_id; + finish_ctx.source = "print_job"; + finish_ctx.code = canceled ? LifecycleEvtCode::Warn : + (eptr || !m_lifecycle_success ? LifecycleEvtCode::Error : LifecycleEvtCode::Ok); + finish_ctx.msg = canceled ? "cancelled" : (eptr ? "exception" : + (m_lifecycle_success ? "" : "failed")); + fire_lifecycle_event(LifecycleEvent::PrintJobFinished, finish_ctx); + m_lifecycle_finished = true; + } + if (canceled || eptr) return; } diff --git a/src/slic3r/GUI/Jobs/PrintJob.hpp b/src/slic3r/GUI/Jobs/PrintJob.hpp index 9a23b04054..4be68031d9 100644 --- a/src/slic3r/GUI/Jobs/PrintJob.hpp +++ b/src/slic3r/GUI/Jobs/PrintJob.hpp @@ -43,6 +43,9 @@ class PrintJob : public Job std::function m_success_fun{nullptr}; std::string m_dev_id; bool m_job_finished{ false }; + bool m_lifecycle_started{ false }; + bool m_lifecycle_finished{ false }; + bool m_lifecycle_success{ false }; int m_print_job_completed_id = 0; wxString m_completed_evt_data; std::function m_enter_ip_address_fun_fail{ nullptr }; diff --git a/src/slic3r/GUI/Jobs/SendJob.cpp b/src/slic3r/GUI/Jobs/SendJob.cpp index d27b18f24b..505475e4a9 100644 --- a/src/slic3r/GUI/Jobs/SendJob.cpp +++ b/src/slic3r/GUI/Jobs/SendJob.cpp @@ -1,4 +1,5 @@ #include "SendJob.hpp" +#include "libslic3r/LifecycleEvents.hpp" #include "slic3r/GUI/I18N.hpp" #include "slic3r/Utils/NetworkAgent.hpp" #include "libslic3r/MTUtils.hpp" @@ -148,6 +149,13 @@ void SendJob::process(Ctl &ctl) } } + LifecycleEventContext start_ctx; + start_ctx.name = m_project_name; + start_ctx.device_id = m_dev_id; + start_ctx.source = "send_job"; + fire_lifecycle_event(LifecycleEvent::SendJobStarted, start_ctx); + m_lifecycle_started = true; + int total_plate_num = m_plater->get_partplate_list().get_plate_count(); PartPlate* plate = m_plater->get_partplate_list().get_plate(job_data.plate_idx); @@ -424,6 +432,19 @@ void SendJob::finalize(bool canceled, std::exception_ptr &eptr) eptr = std::current_exception(); } + if (m_lifecycle_started && !m_lifecycle_finished) { + LifecycleEventContext finish_ctx; + finish_ctx.name = m_project_name; + finish_ctx.device_id = m_dev_id; + finish_ctx.source = "send_job"; + finish_ctx.code = canceled ? LifecycleEvtCode::Warn : + (eptr ? LifecycleEvtCode::Error : (m_job_finished ? LifecycleEvtCode::Ok : LifecycleEvtCode::Error)); + finish_ctx.msg = canceled ? "cancelled" : (eptr ? "exception" : + (m_job_finished ? "" : "failed")); + fire_lifecycle_event(LifecycleEvent::SendJobFinished, finish_ctx); + m_lifecycle_finished = true; + } + if (canceled || eptr) return; } diff --git a/src/slic3r/GUI/Jobs/SendJob.hpp b/src/slic3r/GUI/Jobs/SendJob.hpp index 1d4e025d6e..86d180ac8c 100644 --- a/src/slic3r/GUI/Jobs/SendJob.hpp +++ b/src/slic3r/GUI/Jobs/SendJob.hpp @@ -22,6 +22,8 @@ class SendJob : public Job PrintPrepareData job_data; std::string m_dev_id; bool m_job_finished{ false }; + bool m_lifecycle_started{ false }; + bool m_lifecycle_finished{ false }; int m_print_job_completed_id = 0; bool m_is_check_mode{false}; bool m_check_and_continue{false}; diff --git a/src/slic3r/GUI/KBShortcutsDialog.cpp b/src/slic3r/GUI/KBShortcutsDialog.cpp index be1f53ef97..c03d331627 100644 --- a/src/slic3r/GUI/KBShortcutsDialog.cpp +++ b/src/slic3r/GUI/KBShortcutsDialog.cpp @@ -6,359 +6,319 @@ #include "Notebook.hpp" #include #include +#include +#include #include "GUI_App.hpp" #include "wxExtensions.hpp" #include "MainFrame.hpp" +#include "MsgDialog.hpp" +#include "Preferences.hpp" +#include "Widgets/Button.hpp" +#include "Widgets/DialogButtons.hpp" +#include "Widgets/Label.hpp" +#include "Widgets/StaticBox.hpp" +#include "Widgets/StaticLine.hpp" +#include "Widgets/TabCtrl.hpp" #include namespace Slic3r { namespace GUI { -wxDEFINE_EVENT(EVT_PREFERENCES_SELECT_TAB, wxCommandEvent); +namespace { -KBShortcutsDialog::KBShortcutsDialog() - : DPIDialog(static_cast(wxGetApp().mainframe), wxID_ANY,_L("Keyboard Shortcuts"), - wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE) +wxString shortcut_names(const std::vector& shortcuts) { - // fonts - const wxFont& font = wxGetApp().normal_font(); - const wxFont& bold_font = wxGetApp().bold_font(); - SetFont(font); - - this->SetSizeHints(wxDefaultSize, wxDefaultSize); - this->SetBackgroundColour(wxColour(255, 255, 255)); - - wxBoxSizer *m_sizer_top = new wxBoxSizer(wxVERTICAL); - - auto m_top_line = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 1), wxTAB_TRAVERSAL); - m_top_line->SetBackgroundColour(wxColour(166, 169, 170)); - - m_sizer_top->Add(m_top_line, 0, wxEXPAND, 0); - m_sizer_body = new wxBoxSizer(wxHORIZONTAL); - - m_panel_selects = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); - m_panel_selects->SetBackgroundColour(wxColour(248, 248, 248)); - wxBoxSizer *m_sizer_left = new wxBoxSizer(wxVERTICAL); - - m_sizer_left->Add(0, 0, 0, wxEXPAND | wxTOP, FromDIP(20)); - - m_sizer_left->Add(create_button(0, _L("Global")), 0, wxEXPAND, 0); - m_sizer_left->Add(create_button(1, _L("Prepare")), 0, wxEXPAND, 0); - m_sizer_left->Add(create_button(2, _L("Toolbar")), 0, wxEXPAND, 0); - m_sizer_left->Add(create_button(3, _L("Objects list")), 0, wxEXPAND, 0); - m_sizer_left->Add(create_button(4, _L("Preview")), 0, wxEXPAND, 0); - - m_panel_selects->SetSizer(m_sizer_left); - m_panel_selects->Layout(); - m_sizer_left->Fit(m_panel_selects); - m_sizer_body->Add(m_panel_selects, 0, wxEXPAND, 0); - - m_sizer_right = new wxBoxSizer(wxHORIZONTAL); - - m_sizer_right->Add(0, 0, 0, wxEXPAND | wxLEFT, FromDIP(12)); - - m_simplebook = new wxSimplebook(this, wxID_ANY, wxDefaultPosition, wxSize(FromDIP(870), FromDIP(500)), 0); - - m_sizer_right->Add(m_simplebook, 1, wxEXPAND, 0); - m_sizer_body->Add(m_sizer_right, 1, wxEXPAND, 0); - m_sizer_top->Add(m_sizer_body, 1, wxEXPAND, 0); - - fill_shortcuts(); - for (size_t i = 0; i < m_full_shortcuts.size(); ++i) { - wxPanel *page = create_page(m_simplebook, m_full_shortcuts[i], font, bold_font); - m_pages.push_back(page); - m_simplebook->AddPage(page, m_full_shortcuts[i].first.first, i == 0); + wxString names; + for (Shortcut shortcut : shortcuts) { + if (!names.empty()) + names += ", "; + names += _(shortcut_info(shortcut).name); } + return names; +} - Bind(EVT_PREFERENCES_SELECT_TAB, &KBShortcutsDialog::OnSelectTabel, this); +const wxColour ERROR_COLOUR("#D01B1B"); - SetSizer(m_sizer_top); - Layout(); - Fit(); +// The camera action a mouse button drags, as set in Preferences > Control. +const char* mouse_action(const char* preference) +{ + const std::string action = wxGetApp().app_config->get(preference); + return action == "1" ? L("Pan View") : action == "2" ? L("Rotate View") : L("None"); +} + +// Page layout in DIPs; titles and rows are indented as in the Preferences dialog. +constexpr int PAGE_WIDTH = 640; +constexpr int TITLE_MARGIN = DESIGN_LEFT_MARGIN - 10; +constexpr int ROW_MARGIN = DESIGN_LEFT_MARGIN; +constexpr int ROW_GAP = 16; + +template struct overloaded : Ts... { using Ts::operator()...; }; +template overloaded(Ts...) -> overloaded; + +std::vector to_wx(const std::vector& parts) +{ + std::vector out; + for (const std::string& part : parts) + out.push_back(from_u8(part)); + return out; +} + +// The keys a Global shortcut can use, the second line of its hint and of a rejection. +wxString global_key_advice() +{ + return wxString::Format(_L("Use %s or %s, or a key that does not type a character."), + from_u8(KeyChord::modifier_name(wxMOD_CONTROL)), from_u8(KeyChord::modifier_name(wxMOD_ALT))); +} + +// The pieces of a chord, spaced out for the dialog: "Ctrl + Shift + A". +wxString join_keys(const std::vector& parts) +{ + wxString out; + for (const wxString& part : parts) + out += (out.empty() ? "" : " + ") + part; + return out; +} + +} // namespace + +KBShortcutsDialog::KBShortcutsDialog(wxWindow* parent, ShortcutContext page) + : DPIDialog(parent, wxID_ANY, _L("Keyboard Shortcuts"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE) +{ + SetFont(wxGetApp().normal_font()); + SetBackgroundColour(*wxWHITE); + + fill_pages(); + + ScalableButton* probe = new ScalableButton(this, wxID_ANY, "edit"); + m_edit_size = probe->GetBestSize(); + probe->Destroy(); + m_buttons_width = 2 * m_edit_size.x + FromDIP(6); + m_row_text_width = FromDIP(PAGE_WIDTH) - FromDIP(ROW_MARGIN) - FromDIP(TITLE_MARGIN) - 2 * FromDIP(ROW_GAP) - m_buttons_width; + GetTextExtent("W", &m_key_slot, nullptr, nullptr, nullptr, &Label::Head_14); + + // The page tabs follow the Preferences dialog. + m_tabs = new TabCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_NO_BUTTONS | wxTR_HIDE_ROOT | wxTR_SINGLE | wxTR_NO_LINES | wxBORDER_NONE | wxWANTS_CHARS | wxTR_FULL_ROW_HIGHLIGHT); + m_tabs->Bind(wxEVT_RIGHT_DOWN, [](auto&) {}); + m_tabs->SetFont(Label::Body_14); + m_simplebook = new wxSimplebook(this, wxID_ANY, wxDefaultPosition, wxSize(FromDIP(660), FromDIP(500))); + for (const Page& page : m_pages) { + m_tabs->AppendItem(page.title); + m_simplebook->AddPage(create_page(m_simplebook, page), page.title); + } + const StateColor tab_colour(std::make_pair(wxColour("#6B6B6C"), (int) StateColor::NotChecked), std::make_pair(wxColour("#363636"), (int) StateColor::Normal)); + for (size_t i = 0; i < m_tabs->GetCount(); ++i) + m_tabs->SetItemTextColour(i, tab_colour); + m_tabs->Bind(wxEVT_TAB_SEL_CHANGED, [this](wxCommandEvent& e) { + for (size_t i = 0; i < m_tabs->GetCount(); ++i) + m_tabs->SetItemBold(i, int(i) == e.GetSelection()); + m_simplebook->SetSelection(e.GetSelection()); + }); + const auto shown = std::find_if(m_pages.begin(), m_pages.end(), [page](const Page& entry) { return entry.context == page; }); + m_tabs->SelectItem(shown == m_pages.end() ? 0 : int(shown - m_pages.begin())); + + wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL); + sizer->Add(m_tabs, 0, wxEXPAND | wxTOP | wxBOTTOM, FromDIP(5)); + sizer->Add(m_simplebook, 1, wxEXPAND); + SetSizerAndFit(sizer); CenterOnParent(); - - // select first - auto event = wxCommandEvent(EVT_PREFERENCES_SELECT_TAB); - event.SetInt(0); - event.SetEventObject(this); - wxPostEvent(this, event); wxGetApp().UpdateDlgDarkUI(this); } -void KBShortcutsDialog::OnSelectTabel(wxCommandEvent &event) -{ - auto id = event.GetInt(); - SelectHash::iterator i = m_hash_selector.begin(); - while (i != m_hash_selector.end()) { - Select *sel = i->second; - if (id == sel->m_index) { - sel->m_tab_button->SetBackgroundColour(StateColor::darkModeColorFor(wxColour("#BFE1DE"))); // ORCA color for selected tab background - sel->m_tab_text->SetBackgroundColour(StateColor::darkModeColorFor(wxColour("#BFE1DE"))); // ORCA color for selected tab background - sel->m_tab_text->SetFont(::Label::Head_13); - sel->m_tab_button->Refresh(); - sel->m_tab_text->Refresh(); - - m_simplebook->SetSelection(id); - } else { - sel->m_tab_button->SetBackgroundColour(StateColor::darkModeColorFor(wxColour("#F8F8F8"))); - sel->m_tab_text->SetBackgroundColour(StateColor::darkModeColorFor(wxColour("#F8F8F8"))); - sel->m_tab_text->SetFont(::Label::Body_13); - sel->m_tab_button->Refresh(); - sel->m_tab_text->Refresh(); - } - i++; - } - wxGetApp().UpdateDlgDarkUI(this); -} - -wxWindow *KBShortcutsDialog::create_button(int id, wxString text) -{ - auto tab_button = new wxWindow(m_panel_selects, wxID_ANY, wxDefaultPosition, wxSize( FromDIP(150), FromDIP(28)), wxTAB_TRAVERSAL); - - wxBoxSizer *sizer = new wxBoxSizer(wxHORIZONTAL); - - sizer->Add(0, 0, 0, wxEXPAND | wxLEFT, FromDIP(22)); - - auto stext = new wxStaticText(tab_button, wxID_ANY, text, wxDefaultPosition, wxDefaultSize, 0); - stext->SetFont(::Label::Body_13); - stext->SetForegroundColour(wxColour(38, 46, 48)); - stext->Wrap(-1); - sizer->Add(stext, 1, wxALIGN_CENTER, 0); - - tab_button->Bind(wxEVT_LEFT_DOWN, [this, id](auto &e) { - auto event = wxCommandEvent(EVT_PREFERENCES_SELECT_TAB); - event.SetInt(id); - event.SetEventObject(this); - wxPostEvent(this, event); - }); - - stext->Bind(wxEVT_LEFT_DOWN, [this, id](wxMouseEvent &e) { - auto event = wxCommandEvent(EVT_PREFERENCES_SELECT_TAB); - event.SetInt(id); - event.SetEventObject(this); - wxPostEvent(this, event); - }); - - Select *sel = new Select; - sel->m_index = id; - sel->m_tab_button = tab_button; - sel->m_tab_text = stext; - m_hash_selector[sel->m_index] = sel; - - tab_button->SetSizer(sizer); - tab_button->Layout(); - return tab_button; -} - void KBShortcutsDialog::on_dpi_changed(const wxRect& suggested_rect) { - m_logo_bmp.msw_rescale(); - m_header_bitmap->SetBitmap(m_logo_bmp.bmp()); - msw_buttons_rescale(this, em_unit(), { wxID_OK }); - + m_tabs->Rescale(); Layout(); Fit(); Refresh(); } -void KBShortcutsDialog::fill_shortcuts() +void KBShortcutsDialog::fill_pages() { - const std::string ctrl = GUI::shortkey_ctrl_prefix(); - const std::string alt = GUI::shortkey_alt_prefix(); - const std::string shift = L("Shift+"); + // A fixed row is listed in the section of the shortcuts it belongs with. + auto fixed = [](ShortcutSection section, std::vector keys, const char* description) { return Row{ FixedKey{ std::move(keys), description }, section }; }; + auto mouse = [](ShortcutSection section, const wxString& button, const char* preference) { return Row{ MouseAction{ button, preference }, section }; }; + auto key = [](const std::string& key) { return _L_CONTEXT(key, "Keyboard Shortcut"); }; + auto page = [this](const wxString& title, const wxString& caption, ShortcutContext context, std::vector fixed_rows) { + Page entry{ title, caption, context, {} }; + for (Shortcut shortcut : shortcuts_in(context)) + entry.rows.push_back({ shortcut, shortcut_section(shortcut) }); + entry.rows.insert(entry.rows.end(), fixed_rows.begin(), fixed_rows.end()); + std::stable_sort(entry.rows.begin(), entry.rows.end(), [](const Row& a, const Row& b) { return a.section < b.section; }); + m_pages.push_back(std::move(entry)); + }; + + const wxString ctrl = from_u8(KeyChord::modifier_name(wxMOD_CONTROL)); + const wxString alt = from_u8(KeyChord::modifier_name(wxMOD_ALT)); + const wxString shift = from_u8(KeyChord::modifier_name(wxMOD_SHIFT)); + const wxString shift_ctrl = shift + "/" + ctrl; // either one + const wxString any_key = key(L_CONTEXT("Key", "Keyboard Shortcut")); // the key the row's shortcut is bound to + const wxString esc = key(L_CONTEXT("Esc", "Keyboard Shortcut")); + const wxString left_button = _L("Left mouse"); + const wxString wheel = _L("Mouse wheel"); + using Section = ShortcutSection; if (wxGetApp().is_editor()) { - Shortcuts global_shortcuts = { - // File - { ctrl + "N", L("New Project") }, - { ctrl + "O", L("Open Project") }, - { ctrl + "S", L("Save Project") }, - { ctrl + shift + "S", L("Save Project as")}, - { ctrl + shift + "E", L("Publish 3MF") }, - // File>Import - { ctrl + "I", L("Import geometry data from STL/STEP/3MF/OBJ/AMF files") }, - // File>Export - { ctrl + "G", L("Export plate sliced file")}, - // Slice plate - { ctrl + "R", L("Slice plate")}, - // Send to Print - { ctrl + shift + "G", L("Print plate")}, - // Edit - { ctrl + "X", L("Cut") }, - { ctrl + "C", L("Copy to clipboard") }, - { ctrl + "V", L("Paste from clipboard") }, - // Configuration - { ctrl + "P", L("Preferences") }, - //3D control -#ifdef __APPLE__ - { ctrl + shift + "M", L("Show/Hide 3Dconnexion devices settings dialog") }, -#else - { ctrl + "M", L("Show/Hide 3Dconnexion devices settings dialog") }, -#endif // __APPLE + page(_L("Global"), _L("Available anywhere in the window, even while typing in a text field."), ShortcutContext::Global, { + fixed(Section::Application, { alt, "1-9, 0" }, L("Run a speed dial favorite while the dial is open")), + fixed(Section::Application, { ctrl, key(L_CONTEXT("Tab", "Keyboard Shortcut")) }, L("Switch to the next main tab")), + }); - // Switch table page - { ctrl + L("Tab"), L("Switch table page")}, - // Open speed dial - { L_CONTEXT("Space", "Keyboard Shortcut"), L("Open speed dial") }, - { alt + "1..9,0", L("Run a Speed Dial favourite (while the Speed Dial is open)") }, - //DEL - #ifdef __APPLE__ - {"fn+⌫", L("Delete Selected")}, - #else - {L_CONTEXT("Del", "Keyboard Shortcut"), L("Delete Selected")}, - #endif - // Help - { "?", L("Show keyboard shortcuts list") } - }; - m_full_shortcuts.push_back({{_L("Global shortcuts"), ""}, global_shortcuts}); + page(_L("Prepare"), _L("Available while the 3D view on the Prepare tab has focus."), ShortcutContext::Plater, { + fixed(Section::Selection, { alt, left_button }, L("Select a part")), + fixed(Section::Selection, { ctrl, left_button }, L("Select multiple objects")), + fixed(Section::Selection, { shift, left_button }, L("Select objects by rectangle")), + fixed(Section::Selection, { esc }, L("Deselect All")), + fixed(Section::Objects, { "1-9" }, L("Keyboard 1-9: set filament for object/part")), + fixed(Section::Placement, { shift, any_key }, L("Movement step set to 1mm")), + fixed(Section::Placement, { ctrl, any_key }, L("Movement in camera space")), + mouse(Section::Camera, left_button, "left_mouse_drag_action"), + mouse(Section::Camera, _L("Middle mouse"), "middle_mouse_drag_action"), + mouse(Section::Camera, _L("Right mouse"), "right_mouse_drag_action"), + fixed(Section::Camera, { wheel }, L("Zoom View")), + }); - - // Retrieve mouse actions from config and map to MouseAction - std::map mouse_actions; - mouse_actions["0"] = L("None"); - mouse_actions["1"] = L("Pan View"); - mouse_actions["2"] = L("Rotate View"); + page(_L("Painting"), _L("Available while a painting gizmo is open: supports, seam, fuzzy skin or color painting."), ShortcutContext::Painting, { + fixed(Section::Gizmos, { esc }, L("Deselect All")), + fixed(Section::Gizmos, { shift, left_button }, L("Move: press to snap by 1mm")), + fixed(Section::PaintingTools, { ctrl, wheel }, L("Support/Color Painting: adjust pen radius")), + fixed(Section::PaintingTools, { alt, wheel }, L("Support/Color Painting: adjust section position")), + }); - Shortcuts plater_shortcuts = { - { L("Left mouse button"), mouse_actions[wxGetApp().app_config->get("left_mouse_drag_action").c_str()]}, - { L("Middle mouse button"), mouse_actions[wxGetApp().app_config->get("middle_mouse_drag_action").c_str()]}, - { L("Right mouse button"), mouse_actions[wxGetApp().app_config->get("right_mouse_drag_action").c_str()]}, - { L("Mouse wheel"), L("Zoom View") }, - { "A", L("Arrange all objects") }, - { shift + "A", L("Arrange objects on selected plates") }, - - { "Q", L("Auto orients selected objects or all objects. If there are selected objects, it just orients the selected ones. Otherwise, it will orient all objects in the current project.") }, - { shift + "Q", L("Auto orients all objects on the active plate.") }, - - {shift + L("Tab"), L("Collapse/Expand the sidebar")}, - {ctrl + L("Any arrow"), L("Movement in camera space")}, - {alt + L("Left mouse button"), L("Select a part")}, - {ctrl + L("Left mouse button"), L("Select multiple objects")}, - {shift + L("Left mouse button"), L("Select objects by rectangle")}, - {L_CONTEXT("Arrow Up", "Keyboard Shortcut"), L("Move selection 10mm in positive Y direction")}, - {L_CONTEXT("Arrow Down", "Keyboard Shortcut"), L("Move selection 10mm in negative Y direction")}, - {L_CONTEXT("Arrow Left", "Keyboard Shortcut"), L("Move selection 10mm in negative X direction")}, - {L_CONTEXT("Arrow Right", "Keyboard Shortcut"), L("Move selection 10mm in positive X direction")}, - {shift + L("Any arrow"), L("Movement step set to 1mm")}, - {L_CONTEXT("Esc", "Keyboard Shortcut"), L("Deselect All")}, - {"1-9", L("Keyboard 1-9: set filament for object/part")}, - {ctrl + "0", L("Camera view - Default")}, - {ctrl + "1", L("Camera view - Top")}, - {ctrl + "2", L("Camera view - Bottom")}, - {ctrl + "3", L("Camera view - Front")}, - {ctrl + "4", L("Camera view - Behind")}, - {ctrl + "5", L("Camera Angle - Left side")}, - {ctrl + "6", L("Camera Angle - Right side")}, - - {ctrl + "A", L("Select all objects")}, - {ctrl + "D", L("Delete All")}, - {ctrl + "Z", L("Undo")}, - {ctrl + "Y", L("Redo")}, - { "M", L("Gizmo move") }, - { "R", L("Gizmo rotate") }, - { "S", L("Gizmo scale") }, - { "F", L("Gizmo place face on bed") }, - { "C", L("Gizmo cut") }, - { "B", L("Gizmo mesh boolean") }, - { "H", L("Gizmo FDM paint-on fuzzy skin") }, - { "L", L("Gizmo SLA support points") }, - { "P", L("Gizmo FDM paint-on seam") }, - { "T", L("Gizmo text emboss/engrave") }, - { "U", L("Gizmo measure") }, - { "Y", L("Gizmo assemble") }, - { "E", L("Gizmo brim ears") }, - { "I", L("Zoom in") }, - { "O", L("Zoom out") }, - { "V", L("Toggle printable for object/part") }, - { L_CONTEXT("Tab", "Keyboard Shortcut"), L("Switch between Prepare/Preview") }, - }; - m_full_shortcuts.push_back({ { _L("Plater"), "" }, plater_shortcuts }); - - Shortcuts gizmos_shortcuts = { - {L_CONTEXT("Esc", "Keyboard Shortcut"), L("Deselect All")}, - {shift, L("Move: press to snap by 1mm")}, - {ctrl + L("Mouse wheel"), L("Support/Color Painting: adjust pen radius")}, - {alt + L("Mouse wheel"), L("Support/Color Painting: adjust section position")}, - }; - m_full_shortcuts.push_back({{_L("Gizmo"), ""}, gizmos_shortcuts}); - - Shortcuts object_list_shortcuts = { - {"1-9", L("Set extruder number for the objects and parts") }, - {L_CONTEXT("Del", "Keyboard Shortcut"), L("Delete objects, parts, modifiers")}, - {L_CONTEXT("Esc", "Keyboard Shortcut"), L("Deselect All")}, - {ctrl + "C", L("Copy to clipboard")}, - {ctrl + "V", L("Paste from clipboard")}, - {ctrl + "X", L("Cut")}, - {ctrl + "A", L("Select all objects")}, - {ctrl + "K", L("Clone Selected")}, - {ctrl + "Z", L("Undo")}, - {ctrl + "Y", L("Redo")}, - {L_CONTEXT("Space", "Keyboard Shortcut"), L("Select the object/part and press space to change the name")}, - {L("Mouse click"), L("Select the object/part and mouse click to change the name")}, - }; - m_full_shortcuts.push_back({ { _L("Objects List"), "" }, object_list_shortcuts }); + page(_L("Objects list"), _L("Available while the object list has focus."), ShortcutContext::ObjectList, { + fixed(Section::Selection, { esc }, L("Deselect All")), + fixed(Section::Objects, { "1-9" }, L("Set extruder number for the objects and parts")), + fixed(Section::Objects, { key(L_CONTEXT("Space", "Keyboard Shortcut")) }, L("Select the object/part and press space to change the name")), + fixed(Section::Objects, { _L("Mouse click") }, L("Select the object/part and mouse click to change the name")), + }); } - Shortcuts preview_shortcuts = { - { L_CONTEXT("Arrow Up", "Keyboard Shortcut"), L("Vertical slider - Move active thumb Up")}, - { L_CONTEXT("Arrow Down", "Keyboard Shortcut"), L("Vertical slider - Move active thumb Down")}, - { L_CONTEXT("Arrow Left", "Keyboard Shortcut"), L("Horizontal slider - Move active thumb Left")}, - { L_CONTEXT("Arrow Right", "Keyboard Shortcut"), L("Horizontal slider - Move active thumb Right")}, - { "L", L("On/Off one layer mode of the vertical slider")}, - { "C", L("On/Off G-code window")}, - { L_CONTEXT("Tab", "Keyboard Shortcut"), L("Switch between Prepare/Preview")}, - {shift + L("Any arrow"), L("Move slider 5x faster")}, - {shift + L("Mouse wheel"), L("Move slider 5x faster")}, - {ctrl + L("Any arrow"), L("Move slider 5x faster")}, - {ctrl + L("Mouse wheel"), L("Move slider 5x faster")}, - { L_CONTEXT("Home", "Keyboard Shortcut"), L("Horizontal slider - Move to start position")}, - { L_CONTEXT("End", "Keyboard Shortcut"), L("Horizontal slider - Move to last position")}, - }; - m_full_shortcuts.push_back({ { _L("Preview"), "" }, preview_shortcuts }); + page(_L("Preview"), _L("Available while the 3D view on the Preview tab has focus."), ShortcutContext::Preview, { + fixed(Section::Sliders, { shift_ctrl, any_key }, L("Move slider 5x faster")), + fixed(Section::Sliders, { shift_ctrl, wheel }, L("Scroll slider 5x faster")), + }); } -wxPanel* KBShortcutsDialog::create_page(wxWindow* parent, const ShortcutsItem& shortcuts, const wxFont& font, const wxFont& bold_font) +wxPanel* KBShortcutsDialog::create_page(wxWindow* parent, const Page& page) { wxPanel* main_page = new wxPanel(parent); wxBoxSizer* main_sizer = new wxBoxSizer(wxVERTICAL); - if (!shortcuts.first.second.empty()) { - main_sizer->AddSpacer(FromDIP(10)); - wxBoxSizer* info_sizer = new wxBoxSizer(wxHORIZONTAL); - info_sizer->AddStretchSpacer(); - info_sizer->Add(new wxStaticText(main_page, wxID_ANY, shortcuts.first.second), 0); - info_sizer->AddStretchSpacer(); - main_sizer->Add(info_sizer, 0, wxEXPAND); - main_sizer->AddSpacer(FromDIP(10)); - } - - int items_count = (int) shortcuts.second.size(); wxScrolledWindow *scrollable_panel = new wxScrolledWindow(main_page); wxGetApp().UpdateDarkUI(scrollable_panel); - scrollable_panel->SetScrollbars(20, 20, 50, 50); - scrollable_panel->SetInitialSize(wxSize(FromDIP(850), FromDIP(450))); + const wxColour page_colour = StateColor::darkModeColorFor(*wxWHITE); + scrollable_panel->SetBackgroundColour(page_colour); + scrollable_panel->SetScrollRate(0, 20); + const int page_width = FromDIP(PAGE_WIDTH); + scrollable_panel->SetInitialSize(wxSize(page_width, FromDIP(450))); - wxBoxSizer * scrollable_panel_sizer = new wxBoxSizer(wxVERTICAL); - wxFlexGridSizer *grid_sizer = new wxFlexGridSizer(items_count, 2, FromDIP(10), FromDIP(20)); + const int title_margin = FromDIP(TITLE_MARGIN); + const int row_margin = FromDIP(ROW_MARGIN); + const int gap = FromDIP(ROW_GAP); - for (int i = 0; i < items_count; ++i) { - const auto &[shortcut, description] = shortcuts.second[i]; - // Keyboard keys carry a "Keyboard Shortcut" context so translators keep them in English; - // mouse-input labels are ordinary phrases and use the plain lookup. - const bool is_mouse = shortcut.find("Mouse") != std::string::npos || shortcut.find("mouse") != std::string::npos; - auto key = new wxStaticText(scrollable_panel, wxID_ANY, is_mouse ? _(shortcut) : _L_CONTEXT(shortcut, "Keyboard Shortcut")); - key->SetForegroundColour(wxColour(50, 58, 61)); - key->SetFont(bold_font); - grid_sizer->Add(key, 0, wxALIGN_CENTRE_VERTICAL); + wxBoxSizer* scrollable_panel_sizer = new wxBoxSizer(wxVERTICAL); - auto desc = new wxStaticText(scrollable_panel, wxID_ANY, _(description)); - desc->SetFont(font); - desc->SetForegroundColour(wxColour(50, 58, 61)); - desc->Wrap(FromDIP(600)); - grid_sizer->Add(desc, 0, wxALIGN_CENTRE_VERTICAL); + const wxColour note_colour = StateColor::darkModeColorFor(wxColour("#F8F8F8")); + const wxColour note_text = StateColor::darkModeColorFor(wxColour("#6B6B6A")); + StaticBox* note = new StaticBox(scrollable_panel); + note->SetCornerRadius(FromDIP(4)); + note->SetBorderWidth(0); + note->SetBackgroundColor(note_colour); + note->SetBackgroundColour(note_colour); + auto note_icon = new wxStaticBitmap(note, wxID_ANY, ScalableBitmap(note, "help", 16).bmp()); + auto note_text_ctrl = new wxStaticText(note, wxID_ANY, page.caption); + note_text_ctrl->SetFont(Label::Body_13); + note_text_ctrl->SetForegroundColour(note_text); + note_text_ctrl->SetBackgroundColour(note_colour); + note_text_ctrl->Wrap(page_width - 2 * title_margin - FromDIP(10 + 16 + 8 + 10)); + wxBoxSizer* note_sizer = new wxBoxSizer(wxHORIZONTAL); + note_sizer->Add(note_icon, 0, wxALIGN_CENTRE_VERTICAL | wxLEFT, FromDIP(10)); + note_sizer->Add(note_text_ctrl, 1, wxALIGN_CENTRE_VERTICAL | wxALL, FromDIP(8)); + note->SetSizer(note_sizer); + scrollable_panel_sizer->Add(note, 0, wxEXPAND | wxLEFT | wxRIGHT | wxTOP, title_margin); + + auto key_parts = [](const Row& row) { + return std::visit(overloaded{ + [](Shortcut shortcut) { return to_wx(wxGetApp().shortcuts().binding(shortcut).display_parts()); }, + [](const FixedKey& fixed) { return fixed.keys; }, + [](const MouseAction& mouse) { return std::vector{ mouse.button }; }, + }, row.content); + }; + auto description = [](const Row& row) { + return std::visit(overloaded{ + [](Shortcut shortcut) { return _(shortcut_info(shortcut).name); }, + [](const FixedKey& fixed) { return _(fixed.description); }, + [](const MouseAction& mouse) { return _(mouse_action(mouse.preference)); }, + }, row.content); + }; + auto icon_button = [&](const char* icon, const wxString& tooltip) { + auto button = new ScalableButton(scrollable_panel, wxID_ANY, icon); + button->SetBackgroundColour(page_colour); + button->SetToolTip(tooltip); + return button; + }; + + std::optional section; + for (const Row& row : page.rows) { + if (section != row.section) { + auto heading = new StaticLine(scrollable_panel, false, _(section_name(row.section))); + heading->SetFont(Label::Head_14); + heading->SetForegroundColour(DESIGN_GRAY900_COLOR); + wxBoxSizer* heading_sizer = new wxBoxSizer(wxHORIZONTAL); + heading_sizer->AddSpacer(title_margin); + heading_sizer->Add(heading, 1, wxEXPAND | wxTOP | wxBOTTOM, FromDIP(6)); + heading_sizer->AddSpacer(title_margin); + scrollable_panel_sizer->Add(heading_sizer, 0, wxEXPAND | wxTOP, FromDIP(section.has_value() ? 10 : 6)); + section = row.section; + } + auto desc = new wxStaticText(scrollable_panel, wxID_ANY, description(row)); + desc->SetFont(Label::Body_14); + desc->SetForegroundColour(DESIGN_GRAY900_COLOR); + auto chord_label = [&](long style) { + auto label = new wxStaticText(scrollable_panel, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, style); + label->SetFont(Label::Head_14); + label->SetForegroundColour(DESIGN_GRAY900_COLOR); + return label; + }; + wxStaticText* modifiers = chord_label(0); + wxStaticText* key = chord_label(wxALIGN_CENTRE_HORIZONTAL); // a single key is centred in its column + desc->Wrap(m_row_text_width - set_chord_labels(modifiers, key, key_parts(row))); + + wxBoxSizer* buttons = new wxBoxSizer(wxHORIZONTAL); + if (const MouseAction* mouse = std::get_if(&row.content)) { + auto settings = icon_button("settings", _L("Preferences")); + settings->Bind(wxEVT_BUTTON, [this, preference = mouse->preference](wxCommandEvent&) { open_mouse_preferences(preference); }); + buttons->Add(settings, 0, wxALIGN_CENTRE_VERTICAL); + m_preference_rows.push_back({ mouse->preference, desc }); + } else if (const Shortcut* editable = std::get_if(&row.content)) { + const Shortcut shortcut = *editable; + auto change = icon_button("edit", _L("Edit")); + change->Bind(wxEVT_BUTTON, [this, shortcut](wxCommandEvent&) { edit_shortcut(shortcut); }); + auto reset = icon_button("undo", _L("Reset")); + reset->Bind(wxEVT_BUTTON, [this, shortcut](wxCommandEvent&) { reset_shortcut(shortcut); }); + reset->Show(wxGetApp().shortcuts().is_customized(shortcut)); + buttons->Add(change, 0, wxALIGN_CENTRE_VERTICAL | wxRIGHT, FromDIP(6)); + buttons->Add(reset, 0, wxALIGN_CENTRE_VERTICAL | wxRESERVE_SPACE_EVEN_IF_HIDDEN); + m_editable_rows.push_back({ shortcut, desc, modifiers, key, reset }); + } else { + auto lock = new wxStaticBitmap(scrollable_panel, wxID_ANY, ScalableBitmap(scrollable_panel, "printer_status_lock", 16).bmp()); + lock->SetToolTip(_L("Not customizable")); + buttons->Add((m_edit_size.x - lock->GetBestSize().x) / 2, m_edit_size.y); // centred under the edit icons, at their height + buttons->Add(lock, 0, wxALIGN_CENTRE_VERTICAL); + } + if (const int used = buttons->GetMinSize().x; used < m_buttons_width) // a box sizer recomputes its own min size, so pad it + buttons->AddSpacer(m_buttons_width - used); + + wxBoxSizer* row_sizer = new wxBoxSizer(wxHORIZONTAL); + row_sizer->AddSpacer(row_margin); + row_sizer->Add(desc, 1, wxALIGN_CENTRE_VERTICAL); + row_sizer->AddSpacer(gap); + row_sizer->Add(modifiers, 0, wxALIGN_CENTRE_VERTICAL); + row_sizer->Add(key, 0, wxALIGN_CENTRE_VERTICAL); + row_sizer->Add(buttons, 0, wxALIGN_CENTRE_VERTICAL | wxLEFT, gap); + row_sizer->AddSpacer(title_margin); + scrollable_panel_sizer->Add(row_sizer, 0, wxEXPAND | wxTOP, FromDIP(4)); } - - scrollable_panel_sizer->Add(grid_sizer, 1, wxEXPAND | wxALL, FromDIP(20)); + scrollable_panel_sizer->AddSpacer(title_margin); scrollable_panel->SetSizer(scrollable_panel_sizer); main_sizer->Add(scrollable_panel, 1, wxEXPAND); @@ -367,5 +327,227 @@ wxPanel* KBShortcutsDialog::create_page(wxWindow* parent, const ShortcutsItem& s return main_page; } +void KBShortcutsDialog::edit_shortcut(Shortcut shortcut) +{ + ShortcutCaptureDialog dlg(this, shortcut); + if (dlg.ShowModal() != wxID_OK) + return; + const wxString question = wxString::Format(_L("%s is assigned to %s. Reassign it to %s?"), + join_keys(to_wx(dlg.chord().display_parts())), shortcut_names(dlg.conflicts()), _(shortcut_info(shortcut).name)); + if (!take_chord_from(shortcut, dlg.conflicts(), question)) + return; + wxGetApp().shortcuts().bind(shortcut, dlg.chord()); + apply_bindings(); +} + +void KBShortcutsDialog::reset_shortcut(Shortcut shortcut) +{ + const std::vector conflicts = wxGetApp().shortcuts().conflicts(shortcut, shortcut_info(shortcut).default_chord); + const wxString question = wxString::Format(_L("The default %s is assigned to %s. Reassign it to %s?"), + join_keys(to_wx(shortcut_info(shortcut).default_chord.display_parts())), shortcut_names(conflicts), _(shortcut_info(shortcut).name)); + if (!take_chord_from(shortcut, conflicts, question)) + return; + wxGetApp().shortcuts().reset(shortcut); + apply_bindings(); +} + +bool KBShortcutsDialog::take_chord_from(Shortcut shortcut, const std::vector& conflicts, const wxString& question) +{ + if (conflicts.empty()) + return true; + MessageDialog confirm(this, question, _(shortcut_info(shortcut).name), wxICON_QUESTION | wxOK | wxCANCEL); + if (confirm.ShowModal() != wxID_OK) + return false; + for (Shortcut other : conflicts) + wxGetApp().shortcuts().bind(other, KeyChord{}); + return true; +} + +void KBShortcutsDialog::apply_bindings() +{ + const ShortcutRegistry& shortcuts = wxGetApp().shortcuts(); + std::set pages; + for (const EditableRow& row : m_editable_rows) { + const int chord_width = set_chord_labels(row.modifiers, row.key, to_wx(shortcuts.binding(row.shortcut).display_parts())); + row.description->SetLabel(_(shortcut_info(row.shortcut).name)); + row.description->Wrap(m_row_text_width - chord_width); + row.reset->Show(shortcuts.is_customized(row.shortcut)); + pages.insert(row.key->GetParent()); + } + for (wxWindow* page : pages) + page->Layout(); + wxGetApp().on_shortcuts_changed(); +} + +int KBShortcutsDialog::set_chord_labels(wxStaticText* modifiers, wxStaticText* key, std::vector parts) +{ + const wxString last = parts.empty() ? wxString() : parts.back(); + if (!parts.empty()) + parts.pop_back(); + modifiers->SetLabel(parts.empty() ? wxString() : join_keys(parts) + " + "); + modifiers->Show(!parts.empty()); + key->SetLabel(last); + const int key_width = last.length() == 1 ? m_key_slot : key->GetBestSize().x; + key->SetMinSize(wxSize(key_width, -1)); + return (parts.empty() ? 0 : modifiers->GetBestSize().x) + key_width; +} + +void KBShortcutsDialog::open_mouse_preferences(const char* preference) +{ + // Opened from Preferences > Control, the settings are right behind this dialog. + if (auto preferences = dynamic_cast(GetParent()); preferences != nullptr) { + // Runs once this dialog has closed and the focus is back in Preferences. + preferences->CallAfter([preferences, preference] { preferences->select_tab(PreferencesTab::Control, preference); }); + EndModal(wxID_OK); + return; + } + wxGetApp().open_preferences(PreferencesTab::Control, preference); + // A language change rebuilds the main frame, taking this dialog with it. + if (GetParent() != wxGetApp().mainframe) { + EndModal(wxID_CANCEL); + return; + } + for (const PreferenceRow& row : m_preference_rows) + row.description->SetLabel(_(mouse_action(row.preference))); +} + +ShortcutCaptureDialog::ShortcutCaptureDialog(wxWindow* parent, Shortcut shortcut) + : DPIDialog(parent, wxID_ANY, _(shortcut_info(shortcut).name), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE) + , m_shortcut(shortcut) +{ + SetBackgroundColour(*wxWHITE); + wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL); + + // A Global shortcut also runs while a text field has the focus, so its hint names the keys it can use. + const bool global = (shortcut_info(shortcut).contexts & context_bit(ShortcutContext::Global)) != 0; + const wxString advice = global_key_advice(); + const wxString typing = _L("Global shortcuts also apply while typing."); + const wxString rule = _L("A key that types a character cannot be a global shortcut."); + m_hint = global ? typing + "\n" + advice : _L("Esc cancels, Enter confirms."); + m_rejection = rule + "\n" + advice; + + // Wide enough for each sentence on a line of its own where the translation allows, within limits. + int width = FromDIP(450); + for (const wxString& sentence : { typing, rule, advice }) { + int extent = 0; + GetTextExtent(sentence, &extent, nullptr, nullptr, nullptr, &wxGetApp().normal_font()); + width = std::max(width, extent); + } + width = std::min(width, FromDIP(550)); + + auto prompt = new Label(this, wxGetApp().normal_font(), wxString::Format(_L("Press the new shortcut for\n\"%s\""), _(shortcut_info(shortcut).name)), LB_AUTO_WRAP); + prompt->SetMinSize(wxSize(width, -1)); + sizer->Add(prompt, 0, wxALL, FromDIP(20)); + + // Keyboard focus stays on this box so the buttons never receive the key presses. + const wxColour box_colour = StateColor::darkModeColorFor(*wxWHITE); + StaticBox* capture = new StaticBox(this, wxID_ANY, wxDefaultPosition, wxSize(width, FromDIP(60)), wxWANTS_CHARS); + capture->SetCornerRadius(FromDIP(4)); + capture->SetBorderColorNormal(StateColor::darkModeColorFor(wxColour("#009688"))); // the focused-input colour, since the box always has the focus + capture->SetBackgroundColorNormal(box_colour); + capture->SetBackgroundColour(box_colour); + wxBoxSizer* capture_sizer = new wxBoxSizer(wxVERTICAL); + m_chord_label = new wxStaticText(capture, wxID_ANY, join_keys(to_wx(wxGetApp().shortcuts().binding(shortcut).display_parts()))); + m_chord_label->SetFont(::Label::Head_14); + m_chord_label->SetBackgroundColour(box_colour); + capture_sizer->AddStretchSpacer(); + capture_sizer->Add(m_chord_label, 0, wxALIGN_CENTER); + capture_sizer->AddStretchSpacer(); + capture->SetSizer(capture_sizer); + capture->Bind(wxEVT_KEY_DOWN, &ShortcutCaptureDialog::on_key, this); + capture->Bind(wxEVT_CHAR, &ShortcutCaptureDialog::on_char, this); + capture->Bind(wxEVT_LEFT_DOWN, [capture](wxMouseEvent&) { capture->SetFocus(); }); + sizer->Add(capture, 0, wxLEFT | wxRIGHT | wxEXPAND, FromDIP(20)); + + m_status = new Label(this, wxGetApp().normal_font(), m_hint, LB_AUTO_WRAP); + m_status->SetMinSize(wxSize(width, 3 * m_status->GetCharHeight())); // room for three lines, so the dialog keeps its size while keys are tried + m_status_colour = m_status->GetForegroundColour(); + sizer->Add(m_status, 0, wxLEFT | wxRIGHT | wxTOP, FromDIP(20)); + + auto dlg_btns = new DialogButtons(this, {"Unbind", "OK", "Cancel"}, "", 1 /*left_aligned*/); + dlg_btns->GetFIRST()->Bind(wxEVT_BUTTON, [this](wxCommandEvent&) { + m_chord = KeyChord{}; + m_conflicts.clear(); + EndModal(wxID_OK); + }); + dlg_btns->GetCANCEL()->Bind(wxEVT_BUTTON, [this](wxCommandEvent&) { EndModal(wxID_CANCEL); }); + m_ok = dlg_btns->GetOK(); + m_ok->Bind(wxEVT_BUTTON, [this](wxCommandEvent&) { EndModal(wxID_OK); }); + m_ok->Enable(false); + sizer->Add(dlg_btns, 0, wxEXPAND | wxTOP, FromDIP(10)); + + SetSizerAndFit(sizer); + CenterOnParent(); + wxGetApp().UpdateDlgDarkUI(this); + capture->CallAfter([capture]() { capture->SetFocus(); }); +} + +void ShortcutCaptureDialog::on_dpi_changed(const wxRect& suggested_rect) +{ + Layout(); + Fit(); +} + +void ShortcutCaptureDialog::on_key(wxKeyEvent& evt) +{ + if (!evt.HasAnyModifiers()) { + if (evt.GetKeyCode() == WXK_ESCAPE) { + EndModal(wxID_CANCEL); + return; + } + if (evt.GetKeyCode() == WXK_RETURN || evt.GetKeyCode() == WXK_NUMPAD_ENTER) { + if (m_ok->IsEnabled()) + EndModal(wxID_OK); + return; + } + } + const KeyChord chord = KeyChord::from_event(evt); + if (!chord.valid()) + return; + if (chord.needs_char_event()) { + evt.Skip(); + return; + } + record(chord); +} + +void ShortcutCaptureDialog::on_char(wxKeyEvent& evt) +{ + const KeyChord chord = KeyChord::from_event(evt); + if (chord.is_punctuation()) + record(chord); +} + +void ShortcutCaptureDialog::record(const KeyChord& chord) +{ + m_chord = chord; + m_chord_label->SetLabel(join_keys(to_wx(chord.display_parts()))); + m_chord_label->GetParent()->Layout(); + + auto reject = [this](const wxString& reason) { + m_status->SetForegroundColour(ERROR_COLOUR); + m_status->SetLabel(reason); + m_conflicts.clear(); + m_ok->Enable(false); + }; + const bool global = (shortcut_info(m_shortcut).contexts & context_bit(ShortcutContext::Global)) != 0; + if (global && !chord.is_menu_accelerator()) { + reject(m_rejection); + } else if (const std::optional owner = wxGetApp().shortcuts().step_owner(m_shortcut, chord); owner.has_value()) { + reject(wxString::Format(_L("Already used as a step of %s."), _(shortcut_info(*owner).name))); + } else { + m_conflicts = wxGetApp().shortcuts().conflicts(m_shortcut, chord); + m_status->SetForegroundColour(m_status_colour); + if (m_conflicts.empty()) + m_status->SetLabel(m_hint); + else + m_status->SetLabel(wxString::Format(_L("Already assigned to %s. Press OK to reassign it."), shortcut_names(m_conflicts))); + m_ok->Enable(true); + } + m_status->Refresh(); // a colour change alone does not repaint + Layout(); + Fit(); +} + } // namespace GUI } // namespace Slic3r diff --git a/src/slic3r/GUI/KBShortcutsDialog.hpp b/src/slic3r/GUI/KBShortcutsDialog.hpp index 9d49cd35c5..3091726147 100644 --- a/src/slic3r/GUI/KBShortcutsDialog.hpp +++ b/src/slic3r/GUI/KBShortcutsDialog.hpp @@ -3,53 +3,120 @@ #include #include +#include #include #include "GUI_Utils.hpp" +#include "Shortcuts.hpp" #include "wxExtensions.hpp" #include +class Button; +class Label; +class TabCtrl; + namespace Slic3r { namespace GUI { -class Select -{ -public: - int m_index; - wxWindow *m_tab_button; - wxWindow *m_tab_text; -}; -WX_DECLARE_HASH_MAP(int, Select *, wxIntegerHash, wxIntegerEqual, SelectHash); - +// Lists every shortcut per context and lets the user rebind the assignable ones. class KBShortcutsDialog : public DPIDialog { - typedef std::pair Shortcut; - typedef std::vector Shortcuts; - typedef std::pair, Shortcuts> ShortcutsItem; - typedef std::vector ShortcutsVec; + // A key the user cannot rebind. + struct FixedKey + { + std::vector keys; // modifier names and the key, shown joined with "+" + const char* description; // untranslated + }; + // A mouse button whose camera action is chosen in Preferences. + struct MouseAction + { + wxString button; + const char* preference; // AppConfig key of the action + }; + struct Row + { + std::variant content; + ShortcutSection section; + }; + struct Page + { + wxString title; + wxString caption; // when the page's keys apply + ShortcutContext context; + std::vector rows; + }; + struct EditableRow + { + Shortcut shortcut; + wxStaticText* description; + wxStaticText* modifiers; + wxStaticText* key; + ScalableButton* reset; + }; + struct PreferenceRow + { + const char* preference; + wxStaticText* description; + }; - ShortcutsVec m_full_shortcuts; - ScalableBitmap m_logo_bmp; - wxStaticBitmap* m_header_bitmap; - std::vector m_pages; + std::vector m_pages; + std::vector m_editable_rows; + std::vector m_preference_rows; + // Row geometry, measured once and shared by every page. + wxSize m_edit_size; // an edit or reset icon + int m_buttons_width = 0; // every row's buttons column, so the right-aligned keys share an edge + int m_row_text_width = 0; // what a description and its chord share; the description wraps at the rest + int m_key_slot = 0; // width of the widest single key, the column single keys line up in + + TabCtrl* m_tabs; + wxSimplebook* m_simplebook; public: - KBShortcutsDialog(); - wxWindow* create_button(int id, wxString text); - void OnSelectTabel(wxCommandEvent &event); - wxPanel *m_panel_selects; - wxBoxSizer *m_sizer_right; - wxSimplebook *m_simplebook; - wxBoxSizer * m_sizer_body; - SelectHash m_hash_selector; + KBShortcutsDialog(wxWindow* parent, ShortcutContext page); // opens on the page of that context protected: void on_dpi_changed(const wxRect &suggested_rect) override; private: - void fill_shortcuts(); - wxPanel* create_header(wxWindow* parent, const wxFont& bold_font); - wxPanel* create_page(wxWindow* parent, const ShortcutsItem& shortcuts, const wxFont& font, const wxFont& bold_font); + void fill_pages(); + wxPanel* create_page(wxWindow* parent, const Page& page); + void edit_shortcut(Shortcut shortcut); + void reset_shortcut(Shortcut shortcut); + // Asks question before unbinding conflicts; false when the user declined. + bool take_chord_from(Shortcut shortcut, const std::vector& conflicts, const wxString& question); + void apply_bindings(); // refreshes the rows and pushes the change to the rest of the app + // Puts a chord on a row's two labels, a single key in the shared column, and returns the width the chord takes. + int set_chord_labels(wxStaticText* modifiers, wxStaticText* key, std::vector parts); + void open_mouse_preferences(const char* preference); +}; + +// Records one key chord for a shortcut, warning about the shortcuts it would take the chord from. +class ShortcutCaptureDialog : public DPIDialog +{ +public: + ShortcutCaptureDialog(wxWindow* parent, Shortcut shortcut); + + // Valid after ShowModal() returned wxID_OK; an invalid chord means "unbind". + const KeyChord& chord() const { return m_chord; } + const std::vector& conflicts() const { return m_conflicts; } + +protected: + void on_dpi_changed(const wxRect& suggested_rect) override; + +private: + void on_key(wxKeyEvent& evt); + void on_char(wxKeyEvent& evt); + void record(const KeyChord& chord); + + Shortcut m_shortcut; + KeyChord m_chord; + std::vector m_conflicts; + wxStaticText* m_chord_label; + wxString m_hint; // what m_status shows while there is nothing to warn about + wxString m_rejection; // what it shows for a key a Global shortcut cannot use + Label* m_status; + wxColour m_status_colour; + Button* m_ok; }; } // namespace GUI diff --git a/src/slic3r/GUI/KeyChord.cpp b/src/slic3r/GUI/KeyChord.cpp new file mode 100644 index 0000000000..cd746d2f92 --- /dev/null +++ b/src/slic3r/GUI/KeyChord.cpp @@ -0,0 +1,314 @@ +#include "KeyChord.hpp" + +#include "GUI.hpp" +#include "I18N.hpp" + +#include + +#include +#include +#include + +namespace Slic3r { namespace GUI { + +namespace { + +constexpr int BINDABLE_MODIFIERS = wxMOD_CONTROL | wxMOD_SHIFT | wxMOD_ALT | wxMOD_RAW_CONTROL; + +struct KeyName +{ + int key; + const char* name; // canonical name, as wx parses it + const char* alias; // accepted when parsing; nullptr when there is none + const char* label; // translation key for KeyChord::display(); nullptr when name is it +}; + +constexpr std::array special_keys{{ + { WXK_BACK, L_CONTEXT("Backspace", "Keyboard Shortcut"), "Back", nullptr }, + { WXK_TAB, L_CONTEXT("Tab", "Keyboard Shortcut"), nullptr, nullptr }, + { WXK_RETURN, L_CONTEXT("Enter", "Keyboard Shortcut"), "Return", nullptr }, + { WXK_ESCAPE, L_CONTEXT("Esc", "Keyboard Shortcut"), "Escape", nullptr }, + { WXK_SPACE, L_CONTEXT("Space", "Keyboard Shortcut"), nullptr, nullptr }, + { WXK_DELETE, L_CONTEXT("Del", "Keyboard Shortcut"), "Delete", nullptr }, + { WXK_INSERT, L_CONTEXT("Ins", "Keyboard Shortcut"), "Insert", nullptr }, + { WXK_HOME, L_CONTEXT("Home", "Keyboard Shortcut"), nullptr, nullptr }, + { WXK_END, L_CONTEXT("End", "Keyboard Shortcut"), nullptr, nullptr }, + { WXK_PAGEUP, L_CONTEXT("PgUp", "Keyboard Shortcut"), "PageUp", nullptr }, + { WXK_PAGEDOWN, L_CONTEXT("PgDn", "Keyboard Shortcut"), "PageDown", nullptr }, + // Displayed as "Arrow Left" and so on, which is what the catalogs translate. + { WXK_LEFT, "Left", nullptr, L_CONTEXT("Arrow Left", "Keyboard Shortcut") }, + { WXK_RIGHT, "Right", nullptr, L_CONTEXT("Arrow Right", "Keyboard Shortcut") }, + { WXK_UP, "Up", nullptr, L_CONTEXT("Arrow Up", "Keyboard Shortcut") }, + { WXK_DOWN, "Down", nullptr, L_CONTEXT("Arrow Down", "Keyboard Shortcut") }, +}}; + +bool equals_ignoring_case(const std::string& a, const char* b) +{ + if (b == nullptr) + return false; + size_t i = 0; + for (; i < a.size() && b[i] != '\0'; ++i) + if (std::tolower(static_cast(a[i])) != std::tolower(static_cast(b[i]))) + return false; + return i == a.size() && b[i] == '\0'; +} + +bool is_letter(int key) { return key >= 'A' && key <= 'Z'; } +bool is_digit(int key) { return key >= '0' && key <= '9'; } +bool is_printable(int key) { return key > ' ' && key < 127; } +bool is_symbol(int key) { return is_printable(key) && !std::isalnum(key); } +bool is_function_key(int key) { return key >= WXK_F1 && key <= WXK_F24; } + +bool is_special(int key) +{ + if (is_function_key(key)) + return true; + return std::any_of(special_keys.begin(), special_keys.end(), [key](const KeyName& k) { return k.key == key; }); +} + +std::string special_key_name(int key) +{ + if (is_function_key(key)) + return "F" + std::to_string(key - WXK_F1 + 1); + for (const KeyName& k : special_keys) + if (k.key == key) + return k.name; + return {}; +} + +std::string special_key_label(int key) +{ + for (const KeyName& k : special_keys) + if (k.key == key) + return _u8L_CONTEXT(k.label != nullptr ? k.label : k.name, "Keyboard Shortcut"); + return special_key_name(key); +} + +int parse_key(const std::string& text) +{ + if (text.size() == 1) { + const int key = static_cast(text[0]); + return is_printable(key) ? std::toupper(key) : WXK_NONE; + } + for (const KeyName& k : special_keys) + if (equals_ignoring_case(text, k.name) || equals_ignoring_case(text, k.alias)) + return k.key; + if ((text[0] == 'F' || text[0] == 'f') && text.size() <= 3 && std::all_of(text.begin() + 1, text.end(), [](char c) { return std::isdigit(static_cast(c)); })) { + const int n = std::stoi(text.substr(1)); + if (n >= 1 && n <= 24) + return WXK_F1 + n - 1; + } + return WXK_NONE; +} + +int parse_modifier(const std::string& text) +{ + if (equals_ignoring_case(text, "Ctrl") || equals_ignoring_case(text, "Control") || equals_ignoring_case(text, "Cmd") || equals_ignoring_case(text, "Command")) + return wxMOD_CONTROL; + if (equals_ignoring_case(text, "Shift")) + return wxMOD_SHIFT; + if (equals_ignoring_case(text, "Alt") || equals_ignoring_case(text, "Option")) + return wxMOD_ALT; + if (equals_ignoring_case(text, "RawCtrl")) + return wxMOD_RAW_CONTROL; + return wxMOD_NONE; +} + +// Numpad keys act as their main-keyboard counterparts, so one binding covers both. +int fold_numpad(int key) +{ + if (key >= WXK_NUMPAD0 && key <= WXK_NUMPAD9) + return '0' + (key - WXK_NUMPAD0); + switch (key) { + case WXK_NUMPAD_ENTER: return WXK_RETURN; + case WXK_NUMPAD_SPACE: return WXK_SPACE; + case WXK_NUMPAD_TAB: return WXK_TAB; + case WXK_NUMPAD_HOME: return WXK_HOME; + case WXK_NUMPAD_END: return WXK_END; + case WXK_NUMPAD_PAGEUP: return WXK_PAGEUP; + case WXK_NUMPAD_PAGEDOWN: return WXK_PAGEDOWN; + case WXK_NUMPAD_LEFT: return WXK_LEFT; + case WXK_NUMPAD_RIGHT: return WXK_RIGHT; + case WXK_NUMPAD_UP: return WXK_UP; + case WXK_NUMPAD_DOWN: return WXK_DOWN; + case WXK_NUMPAD_INSERT: return WXK_INSERT; + case WXK_NUMPAD_DELETE: return WXK_DELETE; + case WXK_NUMPAD_ADD: return '+'; + case WXK_NUMPAD_SUBTRACT: return '-'; + case WXK_NUMPAD_MULTIPLY: return '*'; + case WXK_NUMPAD_DIVIDE: return '/'; + case WXK_NUMPAD_DECIMAL: return '.'; + case WXK_NUMPAD_EQUAL: return '='; + default: return key; + } +} + +// Modifiers in the order the text forms list them; wxMOD_RAW_CONTROL is wxMOD_CONTROL off macOS. +#ifdef __APPLE__ +constexpr std::array MODIFIER_ORDER{ wxMOD_CONTROL, wxMOD_SHIFT, wxMOD_ALT, wxMOD_RAW_CONTROL }; +#else +constexpr std::array MODIFIER_ORDER{ wxMOD_CONTROL, wxMOD_SHIFT, wxMOD_ALT }; +#endif + +const char* canonical_modifier_prefix(int modifier) +{ + if (modifier == wxMOD_CONTROL) + return "Ctrl+"; + if (modifier == wxMOD_SHIFT) + return "Shift+"; + if (modifier == wxMOD_ALT) + return "Alt+"; + return "RawCtrl+"; +} + +template +std::string join_modifiers(int modifiers, Prefix prefix) +{ + std::string out; + for (int modifier : MODIFIER_ORDER) + if (modifiers & modifier) + out += prefix(modifier); + return out; +} + +} // namespace + +bool KeyChord::is_punctuation() const { return is_symbol(key) && modifiers == wxMOD_NONE; } + +bool KeyChord::needs_char_event() const { return is_symbol(key) && (modifiers & ~wxMOD_SHIFT) == 0; } + +bool KeyChord::is_menu_accelerator() const +{ + return valid() && ((modifiers & (wxMOD_CONTROL | wxMOD_ALT | wxMOD_RAW_CONTROL)) != 0 || (!is_printable(key) && key != WXK_SPACE)); +} + +std::string KeyChord::to_string() const +{ + if (!valid()) + return {}; + std::string out = join_modifiers(modifiers, canonical_modifier_prefix); + if (is_printable(key)) + out += char(key); + else + out += special_key_name(key); + return out; +} + +std::optional KeyChord::parse(const std::string& text) +{ + if (text.empty()) + return std::nullopt; + + // The key is whatever follows the last separator; a trailing '+' is the '+' key itself. + size_t key_start = text.size() - 1; + if (text.back() != '+') { + const size_t sep = text.rfind('+'); + key_start = sep == std::string::npos ? 0 : sep + 1; + } + KeyChord chord; + chord.key = parse_key(text.substr(key_start)); + if (chord.key == WXK_NONE) + return std::nullopt; + + const std::string prefix = key_start == 0 ? std::string() : text.substr(0, key_start - 1); + size_t begin = 0; + while (begin < prefix.size()) { + size_t end = prefix.find('+', begin); + if (end == std::string::npos) + end = prefix.size(); + const int modifier = parse_modifier(prefix.substr(begin, end - begin)); + if (modifier == wxMOD_NONE) + return std::nullopt; + chord.modifiers |= modifier; + begin = end + 1; + } + if (is_letter(chord.key) || is_digit(chord.key) || !is_printable(chord.key) || chord.modifiers == wxMOD_NONE) + return chord; + // Shift is folded into the character for punctuation, so "Shift+/" is not accepted. + return (chord.modifiers & wxMOD_SHIFT) ? std::nullopt : std::optional(chord); +} + +std::string KeyChord::display() const +{ + std::string out; + for (const std::string& part : display_parts()) + out += (out.empty() ? "" : "+") + part; + return out; +} + +std::vector KeyChord::display_parts() const +{ + std::vector parts; + if (!valid()) + return parts; + for (int modifier : MODIFIER_ORDER) + if (modifiers & modifier) + parts.push_back(modifier_name(modifier)); + parts.push_back(is_printable(key) ? std::string(1, char(key)) : special_key_label(key)); + return parts; +} + +std::string KeyChord::modifier_prefix(int modifier) +{ + if (modifier == wxMOD_CONTROL) + return shortkey_ctrl_prefix(); + if (modifier == wxMOD_SHIFT) + return _u8L("Shift+"); + if (modifier == wxMOD_ALT) + return shortkey_alt_prefix(); +#ifdef __APPLE__ + if (modifier == wxMOD_RAW_CONTROL) + return u8"⌃+"; +#endif + return {}; +} + +// The catalogue holds the "Ctrl+" prefixes, so the bare name is the prefix without its "+" +// and any space before it ("Strg +" in German). +std::string KeyChord::modifier_name(int modifier) +{ + std::string name = modifier_prefix(modifier); + if (!name.empty() && name.back() == '+') + name.pop_back(); + while (!name.empty() && name.back() == ' ') + name.pop_back(); + return name; +} + +wxAcceleratorEntry KeyChord::to_accelerator_entry(int command) const +{ + int flags = wxACCEL_NORMAL; + if (modifiers & wxMOD_CONTROL) + flags |= wxACCEL_CTRL; + if (modifiers & wxMOD_SHIFT) + flags |= wxACCEL_SHIFT; + if (modifiers & wxMOD_ALT) + flags |= wxACCEL_ALT; +#ifdef __APPLE__ + if (modifiers & wxMOD_RAW_CONTROL) + flags |= wxACCEL_RAW_CTRL; +#endif + return wxAcceleratorEntry(flags, key, command); +} + +KeyChord KeyChord::from_event(const wxKeyEvent& evt) +{ + KeyChord chord; + chord.modifiers = evt.GetModifiers() & BINDABLE_MODIFIERS; + int key = fold_numpad(evt.GetKeyCode()); + + if (evt.GetEventType() == wxEVT_CHAR) { + if (key >= 1 && key <= 26 && evt.ControlDown()) + key = 'A' + key - 1; // Ctrl+letter arrives as the control character + else if (is_symbol(key)) + chord.modifiers &= ~wxMOD_SHIFT; // the character already reflects Shift + } + if (key >= 'a' && key <= 'z') + key -= 'a' - 'A'; + + if (is_printable(key) || is_special(key)) + chord.key = key; + return chord; +} + +}} // namespace Slic3r::GUI diff --git a/src/slic3r/GUI/KeyChord.hpp b/src/slic3r/GUI/KeyChord.hpp new file mode 100644 index 0000000000..c7884409eb --- /dev/null +++ b/src/slic3r/GUI/KeyChord.hpp @@ -0,0 +1,64 @@ +#pragma once + +#include +#include + +#include +#include +#include +#include + +class wxKeyEvent; + +namespace Slic3r { namespace GUI { + +// One key press: a key code as wxEVT_KEY_DOWN reports it (letters upper-case, numpad keys +// folded onto their main-keyboard equivalents) plus the wxMOD_* modifiers held with it. +// Printable punctuation is stored as the character it produces, so "+" means the key that +// types "+" on the user's layout. +struct KeyChord +{ + int key = WXK_NONE; + int modifiers = wxMOD_NONE; + + bool valid() const { return key != WXK_NONE; } + bool operator==(const KeyChord& other) const { return key == other.key && modifiers == other.modifiers; } + bool operator!=(const KeyChord& other) const { return !(*this == other); } + + // Bare printable keys other than letters and digits are matched on wxEVT_CHAR, because + // only the char event knows which character a key produces under the active layout. + bool is_punctuation() const; + // True for a printable non-alphanumeric key pressed with nothing but Shift, which only the + // char event that follows can resolve. + bool needs_char_event() const; + // True when Ctrl or Alt is held or the key is non-printable, the chords a menu can own without + // swallowing typing in text fields. + bool is_menu_accelerator() const; + + // Platform-neutral text ("Ctrl+Shift+S") for persistence and wx accelerator strings. + std::string to_string() const; + static std::optional parse(const std::string& text); + + // Text for menus, tooltips and the shortcuts dialog, with translated modifier names and the + // command and option glyphs on macOS. + std::string display() const; + // The pieces display() joins with "+": the modifier names, then the key name. + std::vector display_parts() const; + // Translated text of one wxMOD_* modifier, as a "Ctrl+" prefix or the bare "Ctrl" name. + static std::string modifier_prefix(int modifier); + static std::string modifier_name(int modifier); + + wxAcceleratorEntry to_accelerator_entry(int command) const; + + // Builds the chord a key event describes, or an invalid chord for pure modifier presses and + // keys outside the bindable set. wxEVT_CHAR events are normalized to the key codes + // wxEVT_KEY_DOWN reports for letters, digits and special keys. + static KeyChord from_event(const wxKeyEvent& evt); +}; + +struct KeyChordHash +{ + size_t operator()(const KeyChord& chord) const { return std::hash()((static_cast(chord.modifiers) << 32) | unsigned(chord.key)); } +}; + +}} // namespace Slic3r::GUI diff --git a/src/slic3r/GUI/Lazy.cpp b/src/slic3r/GUI/Lazy.cpp new file mode 100644 index 0000000000..2a1a74510a --- /dev/null +++ b/src/slic3r/GUI/Lazy.cpp @@ -0,0 +1,27 @@ +#include "Lazy.hpp" + +#include +#include +#include + +namespace Slic3r { namespace GUI { + +LazyBase::OnDemandBuild::OnDemandBuild(const LazyBase& lazy) : m_lazy(lazy), m_started(std::chrono::steady_clock::now()) +{ + // The unit tests have no app. + if (wxTheApp != nullptr) + m_busy = std::make_unique(); +} + +LazyBase::OnDemandBuild::~OnDemandBuild() +{ + BOOST_LOG_TRIVIAL(info) << "Lazy::ensure: built " << m_lazy.name() << " on demand, " << m_units << " unit(s) in " + << std::chrono::duration_cast(std::chrono::steady_clock::now() - m_started).count() << " ms"; +} + +void LazyBase::log_null_factory(const std::string& name) +{ + BOOST_LOG_TRIVIAL(error) << "Lazy::build_step: the factory for " << name << " returned null"; +} + +}} // namespace Slic3r::GUI diff --git a/src/slic3r/GUI/Lazy.hpp b/src/slic3r/GUI/Lazy.hpp new file mode 100644 index 0000000000..33e092d887 --- /dev/null +++ b/src/slic3r/GUI/Lazy.hpp @@ -0,0 +1,198 @@ +#pragma once + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "StagedBuild.hpp" + +class wxBusyCursor; + +// Deferred construction of one object. Lazy holds the factory and builds the object on +// demand or, unit by unit, from an IdleScheduler; LazyBase is what the scheduler sees of +// it; LazyInstance gives a type with one such object app-wide static access to it. +// docs/HLSD/deferred-page-construction.md covers the design. + +namespace Slic3r { namespace GUI { + +template class LazyInstance; + +// A prebuild task: what PrebuildQueue sees of a Lazy. A type with its own unit sequence +// implements it directly. +class LazyBase +{ +public: + virtual ~LazyBase() = default; + + // Labels the object in logs. + virtual const std::string& name() const = 0; + virtual bool built() const = 0; + // Whether the idle prebuild has work here. + virtual bool pending() const { return !built(); } + // Runs one unit and returns true while more remain. + virtual bool build_step() = 0; + // Position in the idle queue: lower builds first, negative is never prebuilt. + virtual int prebuild_order() const = 0; + +protected: + // Busy cursor around a build the user is waiting on, and a log line after it. + class OnDemandBuild + { + public: + explicit OnDemandBuild(const LazyBase& lazy); + ~OnDemandBuild(); + void unit() { ++m_units; } + + private: + const LazyBase& m_lazy; + std::unique_ptr m_busy; + std::chrono::steady_clock::time_point m_started; + int m_units{ 0 }; + }; + + static void log_null_factory(const std::string& name); +}; + +// Holds an object a factory makes on the first build_step() or ensure(), followed by one +// StagedBuild step per unit if the type has them, and keeps callbacks until the object is +// complete. The object's parent owns it, not the holder. A LazyInstance type is registered +// for its statics; any other type is reached only through the holder. +template +class Lazy : public LazyBase +{ +public: + using Factory = std::function; + + Lazy(std::string name, int order, Factory make) : m_name(std::move(name)), m_order(order), m_make(std::move(make)) + { + if constexpr (registered()) + LazyInstance::s_lazy = this; + } + ~Lazy() override + { + if constexpr (registered()) + if (LazyInstance::s_lazy == this) + LazyInstance::s_lazy = nullptr; + } + Lazy(const Lazy&) = delete; + Lazy& operator=(const Lazy&) = delete; + + // Null until completely built. + T* get() const { return built() ? m_object : nullptr; } + + // Builds whatever is left now and returns the object, null if the factory returned null + // or a nested call finds the object mid-build. + T* ensure() + { + if (!built() && !m_building) { + OnDemandBuild build(*this); + do + build.unit(); + while (build_step()); + } + return get(); + } + + // Runs fn on the object now if it is built, otherwise once it is. + void when_built(std::function fn) + { + if (built()) + fn(*m_object); + else + m_deferred.push_back(std::move(fn)); + } + + const std::string& name() const override { return m_name; } + // Read by a worker thread through the statics; the last write in build_step() releases it. + bool built() const override { return m_complete.load(std::memory_order_acquire); } + bool pending() const override { return !built() && !m_failed; } + int prebuild_order() const override { return m_order; } + + // The factory is the first unit, then one StagedBuild step each. A unit that pumps the + // event loop cannot re-enter; a nested call does nothing. + bool build_step() override + { + if (built() || m_building || m_failed) + return false; + m_building = true; + try { + if (m_object == nullptr) + m_object = m_make(); + else + step(); + } catch (...) { + m_building = false; + throw; + } + m_building = false; + if (m_object == nullptr) { + m_failed = true; + log_null_factory(m_name); + return false; + } + if (steps_remain()) + return true; + m_complete.store(true, std::memory_order_release); + for (auto& fn : m_deferred) + fn(*m_object); + m_deferred.clear(); + return false; + } + +private: + static constexpr bool registered() { return std::is_base_of_v, T>; } + static constexpr bool staged() { return std::is_base_of_v; } + + bool steps_remain() const + { + if constexpr (staged()) + return !m_object->built(); + else + return false; + } + void step() + { + if constexpr (staged()) + m_object->build_step(); + } + + std::string m_name; + int m_order; + Factory m_make; + T* m_object{ nullptr }; + std::atomic m_complete{ false }; + bool m_building{ false }; + bool m_failed{ false }; + std::vector> m_deferred; +}; + +// Mixin for a type with one lazily built instance in the app. The statics reach that +// instance through its Lazy holder (a recreated MainFrame's holder replaces the old +// frame's). +template +class LazyInstance +{ +public: + // Null until completely built. + static Self* if_built() { return s_lazy ? s_lazy->get() : nullptr; } + // Builds the object if needed; null while no holder exists or the holder has no + // object. + static Self* ensure() { return s_lazy ? s_lazy->ensure() : nullptr; } + // Runs fn on the object now if it is built, otherwise once it is. + static void when_built(std::function fn) + { + if (s_lazy) + s_lazy->when_built(std::move(fn)); + } + +private: + friend class Lazy; + inline static Lazy* s_lazy{ nullptr }; +}; + +}} // namespace Slic3r::GUI diff --git a/src/slic3r/GUI/LazyPage.cpp b/src/slic3r/GUI/LazyPage.cpp new file mode 100644 index 0000000000..d14947bd80 --- /dev/null +++ b/src/slic3r/GUI/LazyPage.cpp @@ -0,0 +1,14 @@ +#include "LazyPage.hpp" + +#include "GUI_App.hpp" + +namespace Slic3r { namespace GUI { + +void apply_dark_ui_to_lazy_panel(wxWindow* panel) +{ +#ifdef _MSW_DARK_MODE + wxGetApp().UpdateDarkUIWin(panel); +#endif +} + +}} // namespace Slic3r::GUI diff --git a/src/slic3r/GUI/LazyPage.hpp b/src/slic3r/GUI/LazyPage.hpp new file mode 100644 index 0000000000..fc85f69285 --- /dev/null +++ b/src/slic3r/GUI/LazyPage.hpp @@ -0,0 +1,77 @@ +#pragma once + +#include +#include +#include + +#include +#include +#include + +#include "Lazy.hpp" + +namespace Slic3r { namespace GUI { + +// Applies the app's dark-mode pass to a panel built after the frame's own pass ran. +void apply_dark_ui_to_lazy_panel(wxWindow* panel); + +// A page whose panel is built the first time the page is shown, or earlier by an +// IdleScheduler; nothing builds while the frame is still hidden. The Lazy side holds the +// panel and, for a LazyInstance panel type, registers it for the type's statics. +template +class LazyPage : public wxPanel, public Lazy +{ +public: + using Factory = std::function; + + LazyPage(wxWindow* parent, std::string name, int order, Factory make = [](wxWindow* parent) { return new Panel(parent); }) + : wxPanel(parent), Lazy(std::move(name), order, [this, make = std::move(make)] { + Panel* panel = make(this); + GetSizer()->Add(panel, 1, wxEXPAND); + // Hidden while its page is, as an inserted page would be. + if (!IsShown()) + panel->Hide(); + return panel; + }) + { + SetSizer(new wxBoxSizer(wxVERTICAL)); + // Shown by the book when its tab is selected. + Hide(); + this->when_built([this](Panel& panel) { + apply_dark_ui_to_lazy_panel(&panel); + Layout(); + }); + } + + // The parent book currently lists this page. + bool in_book() const + { + auto* book = dynamic_cast(GetParent()); + return book != nullptr && book->FindPage(this) != wxNOT_FOUND; + } + + // Pending only while the tab is in the book. + bool pending() const override { return in_book() && Lazy::pending(); } + + // Forwarded so the panel's own Show() override stays its activation hook; wx calls this + // virtual from the book's ShowWithEffect() only for wxSHOW_EFFECT_NONE, the default. + bool Show(bool show = true) override + { + const bool changed = wxPanel::Show(show); + if (show) { + // The book shows its first page as it is inserted, before startup has chosen the + // start page, so a hidden frame builds nothing; MainFrame::Show() completes it. + if (this->built() || wxGetTopLevelParent(this)->IsShown()) { + if (Panel* panel = this->ensure()) + panel->Show(true); + // The sizer skipped the panel while the book kept it hidden. + Layout(); + } + } else if (Panel* panel = this->get()) { + panel->Show(false); + } + return changed; + } +}; + +}} // namespace Slic3r::GUI diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index df30ccd1ec..f42b6d398a 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -56,6 +56,7 @@ #include "../Utils/PrintHost.hpp" #include "GUI_App.hpp" +#include "Shortcuts.hpp" #include "UnsavedChangesDialog.hpp" #include "PublishSettingsDialog.hpp" #include "MsgDialog.hpp" @@ -310,24 +311,14 @@ static wxIcon main_frame_icon(GUI_App::EAppMode app_mode) wxDEFINE_EVENT(EVT_SYNC_CLOUD_PRESET, SimpleEvent); -#ifdef __APPLE__ -static const wxString ctrl = ("Ctrl+"); -// FIXME: maybe should be using GUI::shortkey_ctrl_prefix() or equivalent? -static const std::string ctrl_t = u8"\u2318+"; // "⌘" (Mac Command) -#else -static const wxString ctrl = _L("Ctrl+"); -// FIXME: maybe should be using GUI::shortkey_ctrl_prefix() or equivalent? -static const wxString ctrl_t = ctrl; -#endif -static const wxString shift = _L("Shift+"); - MainFrame::MainFrame() : DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, BORDERLESS_FRAME_STYLE, "mainframe") , m_printhost_queue_dlg(new PrintHostQueueDialog(this)) // BBS , m_recent_projects(18) , m_settings_dialog(this) - , diff_dialog(this) + , m_idle([] { return wxGetApp().input_idle_ms(); }) + , m_diff_dialog("compare_presets", 100, [this] { return make_diff_dialog(); }) { #ifdef __WXOSX__ set_miniaturizable(GetHandle()); @@ -730,69 +721,8 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, BORDERLESS_FRAME_ } return;} #endif - // Orca: open the speed dial from any page with a bare Space. Only when no modifier is held (so - // editing shortcuts like Ctrl+Shift+Space in the canvas still reach it) and the focused window - // doesn't use Space to activate itself (buttons, checkboxes, list/choice controls, text fields), - // so a bare Space there still clicks/toggles instead of being hijacked. Gated by a preference - // (default on) so users can hand Space back to the focused control entirely. - if (wxGetApp().app_config->get_bool("enable_speed_dial") && !evt.CmdDown() && !evt.ShiftDown() && - !evt.AltDown() && evt.GetKeyCode() == WXK_SPACE) { - if (focus_keeps_space(wxWindow::FindFocus())) { - evt.Skip(); // let the focused control keep Space - return; - } - // Defer out of the native key-event stack: open_speed_dial() may create a WebView and - // run script, the same window work the codebase avoids doing on native callbacks. - this->CallAfter([] { wxGetApp().open_speed_dial(); }); - return; - } - if (evt.CmdDown() && evt.GetKeyCode() == 'R') { if (m_slice_enable) { wxGetApp().plater()->update(true, true); wxPostEvent(m_plater, SimpleEvent(EVT_GLTOOLBAR_SLICE_PLATE)); this->m_tabpanel->SelectPageByName(TAB_ID_PREVIEW); } return; } - if (evt.CmdDown() && evt.ShiftDown() && evt.GetKeyCode() == 'G') { - m_plater->apply_background_progress(); - m_print_enable = get_enable_print_status(); - m_print_btn->Enable(m_print_enable); - if (m_print_enable) { - if (wxGetApp().preset_bundle->use_bbl_network() || wxGetApp().app_config->get_bool("use_printer_agents")) - wxPostEvent(m_plater, SimpleEvent(EVT_GLTOOLBAR_PRINT_PLATE)); - else - wxPostEvent(m_plater, SimpleEvent(EVT_GLTOOLBAR_SEND_GCODE)); - } + if (!handle_global_shortcut(KeyChord::from_event(evt))) evt.Skip(); - return; - } - else if (evt.CmdDown() && evt.GetKeyCode() == 'G') { if (can_export_gcode()) { wxPostEvent(m_plater, SimpleEvent(EVT_GLTOOLBAR_EXPORT_SLICED_FILE)); } evt.Skip(); return; } - if (evt.CmdDown() && evt.GetKeyCode() == 'J') { m_printhost_queue_dlg->Show(); return; } - if (evt.CmdDown() && evt.GetKeyCode() == 'N') { m_plater->new_project(); return;} - if (evt.CmdDown() && evt.GetKeyCode() == 'O') { m_plater->load_project(); return;} - if (evt.CmdDown() && evt.ShiftDown() && evt.GetKeyCode() == 'S') { if (can_save_as()) m_plater->save_project(true); return;} - else if (evt.CmdDown() && evt.GetKeyCode() == 'S') { if (can_save()) m_plater->save_project(); return;} - if (evt.CmdDown() && evt.GetKeyCode() == 'F') { - if (m_plater && is_prepare_or_preview_tab()) { - m_plater->sidebar().can_search(); - } - } -#ifdef __APPLE__ - if (evt.CmdDown() && evt.GetKeyCode() == ',') -#else - if (evt.CmdDown() && evt.GetKeyCode() == 'P') -#endif - { - // Orca: Use GUI_App::open_preferences instead of direct call so windows associations are updated on exit - wxGetApp().open_preferences(); - plater()->get_current_canvas3D()->force_set_focus(); - return; - } - - if (evt.CmdDown() && evt.GetKeyCode() == 'I' && !evt.ShiftDown()) { - if (!can_add_models()) return; - if (m_plater) { m_plater->add_file(); } - return; - } - if (evt.CmdDown() && evt.ShiftDown() && evt.GetKeyCode() == 'E') { - if (can_export_model()) publish_project(); - return; - } - evt.Skip(); }); Bind(wxEVT_SHOW, [](wxShowEvent &evt) { @@ -808,13 +738,102 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, BORDERLESS_FRAME_ wxGetApp().persist_window_geometry(this, true); wxGetApp().persist_window_geometry(&m_settings_dialog, true); - // bind events from DiffDlg - - bind_diff_dialog(); } -void MainFrame::bind_diff_dialog() +bool MainFrame::handle_global_shortcut(const KeyChord& chord) { + const std::optional shortcut = wxGetApp().shortcuts().lookup(ShortcutContext::Global, chord); + if (!shortcut.has_value()) + return false; + + switch (*shortcut) { + case Shortcut::SlicePlate: + if (m_slice_enable) { + wxGetApp().plater()->update(true, true); + wxPostEvent(m_plater, SimpleEvent(EVT_GLTOOLBAR_SLICE_PLATE)); + m_tabpanel->SelectPageByName(TAB_ID_PREVIEW); + } + break; + case Shortcut::PrintPlate: + m_plater->apply_background_progress(); + m_print_enable = get_enable_print_status(); + m_print_btn->Enable(m_print_enable); + if (m_print_enable) { + if (wxGetApp().preset_bundle->use_bbl_network() || wxGetApp().app_config->get_bool("use_printer_agents")) + wxPostEvent(m_plater, SimpleEvent(EVT_GLTOOLBAR_PRINT_PLATE)); + else + wxPostEvent(m_plater, SimpleEvent(EVT_GLTOOLBAR_SEND_GCODE)); + } + return false; + case Shortcut::ExportSlicedFile: + if (can_export_gcode()) + wxPostEvent(m_plater, SimpleEvent(EVT_GLTOOLBAR_EXPORT_SLICED_FILE)); + return false; + case Shortcut::PrintHostQueue: m_printhost_queue_dlg->Show(); break; + case Shortcut::SpeedDial: + if (!wxGetApp().app_config->get_bool("enable_speed_dial") || (chord == KeyChord{ WXK_SPACE } && focus_keeps_space(wxWindow::FindFocus()))) + return false; + // Deferred out of the native key-event stack: open_speed_dial() may create a WebView and run script. + CallAfter([] { wxGetApp().open_speed_dial(); }); + break; + case Shortcut::NewProject: m_plater->new_project(); break; + case Shortcut::OpenProject: m_plater->load_project(); break; + case Shortcut::SaveProjectAs: + if (can_save_as()) + m_plater->save_project(true); + break; + case Shortcut::SaveProject: + if (can_save()) + m_plater->save_project(); + break; + case Shortcut::Search: + if (m_plater && is_prepare_or_preview_tab()) + m_plater->sidebar().can_search(); + return false; + case Shortcut::Preferences: + // Orca: Use GUI_App::open_preferences instead of direct call so windows associations are updated on exit + wxGetApp().open_preferences(); + plater()->get_current_canvas3D()->force_set_focus(); + break; + case Shortcut::ImportModel: + if (can_add_models() && m_plater) + m_plater->add_file(); + break; + case Shortcut::Publish3mf: + if (can_export_model()) + publish_project(); + break; + case Shortcut::ShowLabels: + if (m_plater && m_plater->is_view3D_shown()) { + m_plater->show_view3D_labels(!m_plater->are_view3D_labels_shown()); + m_plater->get_current_canvas3D()->post_event(SimpleEvent(wxEVT_PAINT)); + } + break; + case Shortcut::ViewDefault: + if (m_plater) { + select_view("plate"); + m_plater->get_current_canvas3D()->zoom_to_bed(); + } + break; + case Shortcut::ViewTop: select_view("top"); break; + case Shortcut::ViewBottom: select_view("bottom"); break; + case Shortcut::ViewFront: select_view("front"); break; + case Shortcut::ViewRear: select_view("rear"); break; + case Shortcut::ViewLeft: select_view("left"); break; + case Shortcut::ViewRight: select_view("right"); break; + case Shortcut::ViewPlate: + if (m_plater) + m_plater->get_current_canvas3D()->select_plate(); + break; + default: return false; + } + return true; +} + +DiffPresetDialog* MainFrame::make_diff_dialog() +{ + auto* dialog = new DiffPresetDialog(this); + auto get_tab = [](Preset::Type type) { Tab* null_tab = nullptr; for (Tab* tab : wxGetApp().tabs_list) @@ -823,23 +842,24 @@ void MainFrame::bind_diff_dialog() return null_tab; }; - auto transfer = [this, get_tab](Preset::Type type) { - get_tab(type)->transfer_options(diff_dialog.get_left_preset_name(type), - diff_dialog.get_right_preset_name(type), - diff_dialog.get_selected_options(type)); + auto transfer = [dialog, get_tab](Preset::Type type) { + get_tab(type)->transfer_options(dialog->get_left_preset_name(type), + dialog->get_right_preset_name(type), + dialog->get_selected_options(type)); }; - auto process_options = [this](std::function process) { - const Preset::Type diff_dlg_type = diff_dialog.view_type(); + auto process_options = [dialog](std::function process) { + const Preset::Type diff_dlg_type = dialog->view_type(); if (diff_dlg_type == Preset::TYPE_INVALID) { - for (const Preset::Type& type : diff_dialog.types_list() ) + for (const Preset::Type& type : dialog->types_list() ) process(type); } else process(diff_dlg_type); }; - diff_dialog.Bind(EVT_DIFF_DIALOG_TRANSFER, [process_options, transfer](SimpleEvent&) { process_options(transfer); }); + dialog->Bind(EVT_DIFF_DIALOG_TRANSFER, [process_options, transfer](SimpleEvent&) { process_options(transfer); }); + return dialog; } @@ -1167,9 +1187,12 @@ void MainFrame::update_edge_panels() void MainFrame::shutdown() { BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << "MainFrame::shutdown enter"; - if (m_project != nullptr) - m_project->shutdown(); + m_idle.stop(); + if (ProjectPanel* project = ProjectPanel::if_built()) + project->shutdown(); m_plugin_pages.shutdown(); + if (m_plater != nullptr) + m_plater->remove_dock_panes(); #ifdef __WXGTK__ // Edge panels are child windows — wxWidgets destroys them automatically. m_edge_bottom = nullptr; @@ -1293,19 +1316,6 @@ void MainFrame::show_option(bool show) } } -#ifdef SLIC3R_CAD -DesignPanel* MainFrame::ensure_design_panel() -{ - if (m_design_panel == nullptr && m_design_page != nullptr) { - wxBusyCursor busy; - m_design_panel = new DesignPanel(m_design_page); - m_design_page->GetSizer()->Add(m_design_panel, 1, wxEXPAND); - m_design_page->Layout(); - } - return m_design_panel; -} -#endif - void MainFrame::init_tabpanel() { // wxNB_NOPAGETHEME: Disable Windows Vista theme for the Notebook background. The theme performance is terrible on // Windows 10 with multiple high resolution displays connected. @@ -1348,23 +1358,20 @@ void MainFrame::init_tabpanel() { // m_param_panel->OnActivate(); #ifdef SLIC3R_CAD else if (m_design_page != nullptr && panel == m_design_page) { - // Built on first activation, never at startup: the panel creates several hundred - // controls and its own GL canvas, which a user who does not open the tab should - // not pay for. - ensure_design_panel(); // Re-sync the Design bed to the active printer: the panel is built before the // printer profile is fully applied, so its bed must refresh on activation or the // grid (true bed) spills past the stale default bed quad. - m_design_panel->on_tab_shown(); + DesignPanel::ensure()->on_tab_shown(); } #endif - else if (panel == m_monitor) { + else if (panel == m_monitor_page) { //monitor } #ifdef SLIC3R_CAD // Any page that is not Design takes the Design status line down with it — see // DesignPanel::on_tab_hidden for why the popup does not follow the page on its own. - if (m_design_panel != nullptr && panel != m_design_page) m_design_panel->on_tab_hidden(); + if (DesignPanel* design = DesignPanel::if_built(); design != nullptr && panel != m_design_page) + design->on_tab_hidden(); #endif #ifndef __APPLE__ if (m_last_selected_tab == TAB_ID_PREPARE) { @@ -1380,13 +1387,14 @@ void MainFrame::init_tabpanel() { }); if (wxGetApp().is_editor()) { - m_webview = new WebViewPanel(m_tabpanel); + m_home_page = new LazyPage(m_tabpanel, TAB_ID_HOME, 10); + m_lazy_pages.push_back(m_home_page); Bind(EVT_LOAD_URL, [this](wxCommandEvent &evt) { wxString url = evt.GetString(); select_tab(TAB_ID_HOME); - m_webview->load_url(url); + WebViewPanel::ensure()->load_url(url); }); - m_tabpanel->AddPage(TAB_ID_HOME, m_webview, "", "tab_home_active"); + m_tabpanel->AddPage(TAB_ID_HOME, m_home_page, "", "tab_home_active"); m_param_panel = new ParamsPanel(m_tabpanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBK_LEFT | wxTAB_TRAVERSAL); } @@ -1397,15 +1405,13 @@ void MainFrame::init_tabpanel() { wxGetApp().plater_ = m_plater; #ifdef SLIC3R_CAD - // Stand-in page for the Design tab. The real DesignPanel is built into it the first time - // the tab is selected (see the page-changed handler above), so nothing it constructs sits - // on the startup path. The experimental feature is off by default, and when it is off the - // page is never created, so the tab does not appear at all (the preference takes effect on - // the next start, like the other feature toggles). + // The experimental feature is off by default, and when it is off the page is never + // created, so the tab does not appear at all (the preference takes effect on the next + // start, like the other feature toggles). if (wxGetApp().is_enable_cad_feature()) { - m_design_page = new wxPanel(this); - m_design_page->SetSizer(new wxBoxSizer(wxVERTICAL)); - m_design_page->Hide(); + // Experimental and heavy enough that building it unasked would cost more than it saves. + m_design_page = new LazyPage(this, TAB_ID_DESIGN, -1); + m_lazy_pages.push_back(m_design_page); start_mcp_control_if_enabled(); // opens the MCP socket iff ORCA_CAD_MCP is set } #endif @@ -1413,33 +1419,41 @@ void MainFrame::init_tabpanel() { create_preset_tabs(); //BBS add pages - m_monitor = new MonitorPanel(m_tabpanel, wxID_ANY, wxDefaultPosition, wxDefaultSize); - m_monitor->SetBackgroundColour(*wxWHITE); - m_tabpanel->AddPage(TAB_ID_MONITOR, m_monitor, _L("Device"), "tab_monitor_active"); + m_monitor_page = new LazyPage(m_tabpanel, TAB_ID_MONITOR, 20); + m_lazy_pages.push_back(m_monitor_page); + m_tabpanel->AddPage(TAB_ID_MONITOR, m_monitor_page, _L("Device"), "tab_monitor_active"); - m_printer_view = new PrinterWebView(m_tabpanel); + m_printer_view_page = new LazyPage(m_tabpanel, TAB_ID_MONITOR_WEB, 50, [this](wxWindow* parent) { + auto* view = new PrinterWebView(parent); + if (!m_printer_url.empty()) + view->load_url(m_printer_url, m_printer_api_key); + return view; + }); + m_lazy_pages.push_back(m_printer_view_page); Bind(EVT_LOAD_PRINTER_URL, [this](LoadPrinterViewEvent &evt) { - wxString url = evt.GetString(); - wxString key = evt.GetAPIkey(); //select_tab(MainFrame::tpMonitor); - m_printer_view->load_url(url, key); + m_printer_url = evt.GetString(); + m_printer_api_key = evt.GetAPIkey(); + if (PrinterWebView* view = PrinterWebView::if_built()) + view->load_url(m_printer_url, m_printer_api_key); }); - m_printer_view->Hide(); + m_multi_machine_page = new LazyPage(m_tabpanel, TAB_ID_MULTI_DEVICE, 40); + m_lazy_pages.push_back(m_multi_machine_page); if (wxGetApp().is_enable_multi_machine()) { - m_multi_machine = new MultiMachinePage(m_tabpanel, wxID_ANY, wxDefaultPosition, wxDefaultSize); - m_multi_machine->SetBackgroundColour(*wxWHITE); // TODO: change the bitmap - m_tabpanel->AddPage(TAB_ID_MULTI_DEVICE, m_multi_machine, _L("Multi-device"), "tab_multi_active"); + m_tabpanel->AddPage(TAB_ID_MULTI_DEVICE, m_multi_machine_page, _L("Multi-device"), "tab_multi_active"); } - m_project = new ProjectPanel(m_tabpanel, wxID_ANY, wxDefaultPosition, wxDefaultSize); - m_project->SetBackgroundColour(*wxWHITE); - m_tabpanel->AddPage(TAB_ID_PROJECT, m_project, _L("Project"), "tab_auxiliary_active"); + m_project_page = new LazyPage(m_tabpanel, TAB_ID_PROJECT, 60); + m_lazy_pages.push_back(m_project_page); + m_tabpanel->AddPage(TAB_ID_PROJECT, m_project_page, _L("Project"), "tab_auxiliary_active"); - m_calibration = new CalibrationPanel(m_tabpanel, wxID_ANY, wxDefaultPosition, wxDefaultSize); - m_calibration->SetBackgroundColour(*wxWHITE); - m_tabpanel->AddPage(TAB_ID_CALIBRATION, m_calibration, _L("Calibration"), "tab_calibration_active"); + // show_device() removes this tab for printers without the Bambu device tab, and the page + // then never builds its panel. + m_calibration_page = new LazyPage(m_tabpanel, TAB_ID_CALIBRATION, 30); + m_lazy_pages.push_back(m_calibration_page); + m_tabpanel->AddPage(TAB_ID_CALIBRATION, m_calibration_page, _L("Calibration"), "tab_calibration_active"); // Plugin pages are appended after the built-in tabs; their ids are namespaced // (plugin..) so they can't collide with the built-in TAB_ID_* constants. @@ -1474,67 +1488,44 @@ void MainFrame::show_device(bool should_use_native) { // Remove the extra page before switching to any layout that shouldn't have it. if (!want_web_device_tab) { if ((idx = m_tabpanel->FindPageByName(TAB_ID_MONITOR_WEB)) != wxNOT_FOUND) { - m_printer_view->Show(false); + m_printer_view_page->Show(false); m_tabpanel->RemovePage(idx); } } if (use_printer_agents) { - if (!m_monitor) { - m_monitor = new MonitorPanel(m_tabpanel, wxID_ANY, wxDefaultPosition, wxDefaultSize); - m_monitor->SetBackgroundColour(*wxWHITE); - } - - if (m_tabpanel->FindPage(m_monitor) == wxNOT_FOUND) { - if ((idx = m_tabpanel->FindPage(m_printer_view)) != wxNOT_FOUND) { - m_printer_view->Show(false); + if (!m_monitor_page->in_book()) { + if ((idx = m_tabpanel->FindPage(m_printer_view_page)) != wxNOT_FOUND) { + m_printer_view_page->Show(false); m_tabpanel->RemovePage(idx); } - m_monitor->Show(false); - m_tabpanel->InsertPage(m_tabpanel->PositionAfter({TAB_ID_PREVIEW}), TAB_ID_MONITOR, m_monitor, + m_monitor_page->Show(false); + m_tabpanel->InsertPage(m_tabpanel->PositionAfter({TAB_ID_PREVIEW}), TAB_ID_MONITOR, m_monitor_page, _L("Device"), "tab_monitor_active"); } - if (m_printer_view == nullptr) { - m_printer_view = new PrinterWebView(m_tabpanel); - Bind(EVT_LOAD_PRINTER_URL, [this](LoadPrinterViewEvent& evt) { - wxString url = evt.GetString(); - wxString key = evt.GetAPIkey(); - // select_tab(MainFrame::tpMonitor); - m_printer_view->load_url(url, key); - }); - } - if (wxGetApp().is_enable_multi_machine()) { - if (!m_multi_machine) { - m_multi_machine = new MultiMachinePage(m_tabpanel, wxID_ANY, wxDefaultPosition, wxDefaultSize); - m_multi_machine->SetBackgroundColour(*wxWHITE); - } // TODO: change the bitmap - if (m_tabpanel->FindPage(m_multi_machine) == wxNOT_FOUND) { - m_multi_machine->Show(false); + if (!m_multi_machine_page->in_book()) { + m_multi_machine_page->Show(false); // Past the web Device tab when it is already there, so enabling multi-machine // later can't wedge this page between the two Device tabs. m_tabpanel->InsertPage(m_tabpanel->PositionAfter({TAB_ID_MONITOR_WEB, TAB_ID_MONITOR}), - TAB_ID_MULTI_DEVICE, m_multi_machine, _L("Multi-device"), "tab_multi_active"); + TAB_ID_MULTI_DEVICE, m_multi_machine_page, _L("Multi-device"), "tab_multi_active"); } } - if (!m_calibration) { - m_calibration = new CalibrationPanel(m_tabpanel, wxID_ANY, wxDefaultPosition, wxDefaultSize); - m_calibration->SetBackgroundColour(*wxWHITE); - } - if (m_tabpanel->FindPage(m_calibration) == wxNOT_FOUND) { - m_calibration->Show(false); - m_tabpanel->InsertPage(m_tabpanel->PositionAfter({TAB_ID_PROJECT}), TAB_ID_CALIBRATION, m_calibration, + if (!m_calibration_page->in_book()) { + m_calibration_page->Show(false); + m_tabpanel->InsertPage(m_tabpanel->PositionAfter({TAB_ID_PROJECT}), TAB_ID_CALIBRATION, m_calibration_page, _L("Calibration"), "tab_calibration_active"); } if (want_web_device_tab) { - if ((idx = m_tabpanel->FindPage(m_printer_view)) == wxNOT_FOUND) { - m_printer_view->Show(false); + if ((idx = m_tabpanel->FindPage(m_printer_view_page)) == wxNOT_FOUND) { + m_printer_view_page->Show(false); // Immediately right of the native Device tab, not at the end of the tab bar. m_tabpanel->InsertPage(m_tabpanel->PositionAfter({TAB_ID_MONITOR}), TAB_ID_MONITOR_WEB, - m_printer_view, _L("Device (Web)"), "tab_monitor_active"); + m_printer_view_page, _L("Device (Web)"), "tab_monitor_active"); } else { m_tabpanel->SetPageText(idx, _L("Device (Web)")); } @@ -1546,48 +1537,37 @@ void MainFrame::show_device(bool should_use_native) { fit_tab_labels(); // ORCA on printer change m_plugin_pages.relayout(); // re-sync plugin tabs against the native tabs just mutated above - + if (m_prebuild_started) + m_idle.start(); return; } if (should_use_native) { - if (m_tabpanel->FindPage(m_monitor) != wxNOT_FOUND) { + if (m_monitor_page->in_book()) { fit_tab_labels(); // ORCA on printer change - same button layout return; } // Remove printer view - if ((idx = m_tabpanel->FindPage(m_printer_view)) != wxNOT_FOUND) { - m_printer_view->Show(false); + if ((idx = m_tabpanel->FindPage(m_printer_view_page)) != wxNOT_FOUND) { + m_printer_view_page->Show(false); m_tabpanel->RemovePage(idx); } - // Create/insert monitor page - if (!m_monitor) { - m_monitor = new MonitorPanel(m_tabpanel, wxID_ANY, wxDefaultPosition, wxDefaultSize); - m_monitor->SetBackgroundColour(*wxWHITE); - } - m_monitor->Show(false); - m_tabpanel->InsertPage(m_tabpanel->PositionAfter({TAB_ID_PREVIEW}), TAB_ID_MONITOR, m_monitor, + // Insert monitor page + m_monitor_page->Show(false); + m_tabpanel->InsertPage(m_tabpanel->PositionAfter({TAB_ID_PREVIEW}), TAB_ID_MONITOR, m_monitor_page, _L("Device"), "tab_monitor_active"); if (wxGetApp().is_enable_multi_machine()) { - if (!m_multi_machine) { - m_multi_machine = new MultiMachinePage(m_tabpanel, wxID_ANY, wxDefaultPosition, wxDefaultSize); - m_multi_machine->SetBackgroundColour(*wxWHITE); - } // TODO: change the bitmap - m_multi_machine->Show(false); - m_tabpanel->InsertPage(m_tabpanel->PositionAfter({TAB_ID_MONITOR}), TAB_ID_MULTI_DEVICE, m_multi_machine, + m_multi_machine_page->Show(false); + m_tabpanel->InsertPage(m_tabpanel->PositionAfter({TAB_ID_MONITOR}), TAB_ID_MULTI_DEVICE, m_multi_machine_page, _L("Multi-device"), "tab_multi_active"); } - if (!m_calibration) { - m_calibration = new CalibrationPanel(m_tabpanel, wxID_ANY, wxDefaultPosition, wxDefaultSize); - m_calibration->SetBackgroundColour(*wxWHITE); - } - m_calibration->Show(false); + m_calibration_page->Show(false); // Last of the built-in tabs, but plugin tabs already sit past it — anchor rather than // append, so its position doesn't depend on the relayout() below running afterwards. - m_tabpanel->InsertPage(m_tabpanel->PositionAfter({TAB_ID_PROJECT}), TAB_ID_CALIBRATION, m_calibration, + m_tabpanel->InsertPage(m_tabpanel->PositionAfter({TAB_ID_PROJECT}), TAB_ID_CALIBRATION, m_calibration_page, _L("Calibration"), "tab_calibration_active"); #ifdef _MSW_DARK_MODE @@ -1595,37 +1575,30 @@ void MainFrame::show_device(bool should_use_native) { #endif // _MSW_DARK_MODE } else { - if (m_tabpanel->FindPage(m_printer_view) != wxNOT_FOUND) { + if (m_printer_view_page->in_book()) { fit_tab_labels(); // ORCA on printer change - same button layout return; } - if ((idx = m_tabpanel->FindPage(m_calibration)) != wxNOT_FOUND) { - m_calibration->Show(false); + if ((idx = m_tabpanel->FindPage(m_calibration_page)) != wxNOT_FOUND) { + m_calibration_page->Show(false); m_tabpanel->RemovePage(idx); } - if ((idx = m_tabpanel->FindPage(m_multi_machine)) != wxNOT_FOUND) { - m_multi_machine->Show(false); + if ((idx = m_tabpanel->FindPage(m_multi_machine_page)) != wxNOT_FOUND) { + m_multi_machine_page->Show(false); m_tabpanel->RemovePage(idx); } - if ((idx = m_tabpanel->FindPage(m_monitor)) != wxNOT_FOUND) { - m_monitor->Show(false); + if ((idx = m_tabpanel->FindPage(m_monitor_page)) != wxNOT_FOUND) { + m_monitor_page->Show(false); m_tabpanel->RemovePage(idx); } - if (m_printer_view == nullptr) { - m_printer_view = new PrinterWebView(m_tabpanel); - Bind(EVT_LOAD_PRINTER_URL, [this](LoadPrinterViewEvent& evt) { - wxString url = evt.GetString(); - wxString key = evt.GetAPIkey(); - // select_tab(MainFrame::tpMonitor); - m_printer_view->load_url(url, key); - }); - } - m_printer_view->Show(false); - m_tabpanel->InsertPage(m_tabpanel->PositionAfter({TAB_ID_PREVIEW}), TAB_ID_MONITOR, m_printer_view, + m_printer_view_page->Show(false); + m_tabpanel->InsertPage(m_tabpanel->PositionAfter({TAB_ID_PREVIEW}), TAB_ID_MONITOR, m_printer_view_page, _L("Device"), "tab_monitor_active"); } fit_tab_labels(); // ORCA on printer change m_plugin_pages.relayout(); // re-sync plugin tabs against the native tabs just mutated above + if (m_prebuild_started) + m_idle.start(); } bool MainFrame::is_prepare_or_preview_tab() const @@ -2671,13 +2644,11 @@ void MainFrame::on_dpi_changed(const wxRect& suggested_rect) //BBS GUI refactor: remove unused layout new/dlg //if (m_layout != ESettingsLayout::Dlg) // Do not update tabs if the Settings are in the separated dialog m_param_panel->msw_rescale(); - m_project->msw_rescale(); - if(m_monitor) - m_monitor->msw_rescale(); - if(m_multi_machine) - m_multi_machine->msw_rescale(); - if(m_calibration) - m_calibration->msw_rescale(); + // A panel mid-build gets the pass once it is complete. + ProjectPanel::when_built([](ProjectPanel& project) { project.msw_rescale(); }); + MonitorPanel::when_built([](MonitorPanel& monitor) { monitor.msw_rescale(); }); + MultiMachinePage::when_built([](MultiMachinePage& multi_machine) { multi_machine.msw_rescale(); }); + CalibrationPanel::when_built([](CalibrationPanel& calibration) { calibration.msw_rescale(); }); // BBS #if 0 @@ -2731,7 +2702,8 @@ void MainFrame::on_sys_color_changed() #endif #endif - diff_dialog.on_sys_color_changed(); + if (DiffPresetDialog* dialog = DiffPresetDialog::if_built()) + dialog->on_sys_color_changed(); // BBS m_tabpanel->Rescale(); @@ -2739,10 +2711,8 @@ void MainFrame::on_sys_color_changed() // update Plater wxGetApp().plater()->sys_color_changed(); - if(m_monitor) - m_monitor->on_sys_color_changed(); - if(m_calibration) - m_calibration->on_sys_color_changed(); + MonitorPanel::when_built([](MonitorPanel& monitor) { monitor.on_sys_color_changed(); }); + CalibrationPanel::when_built([](CalibrationPanel& calibration) { calibration.on_sys_color_changed(); }); // update Tabs for (auto tab : wxGetApp().tabs_list) tab->sys_color_changed(); @@ -2766,13 +2736,31 @@ static const wxString sep = " - "; static const wxString sep = "\t"; #endif -static wxMenu* generate_help_menu() +wxString MainFrame::shortcut_label(const wxString& label, Shortcut shortcut, bool accelerator) +{ + const ShortcutRegistry& shortcuts = wxGetApp().shortcuts(); + if (accelerator) { + const std::string accel = shortcuts.accelerator(shortcut); + if (!accel.empty()) + return label + " " + from_u8(accel); + } + const std::string text = shortcuts.display(shortcut); + return text.empty() ? label : label + sep + from_u8(text); +} + +void MainFrame::update_shortcut_labels() +{ + for (const ShortcutMenuItem& entry : m_shortcut_menu_items) + entry.item->SetItemLabel(shortcut_label(entry.label, entry.shortcut, entry.accelerator)); +} + +wxMenu* MainFrame::generate_help_menu() { wxMenu* helpMenu = new wxMenu(); // shortcut key - append_menu_item(helpMenu, wxID_ANY, _L("Keyboard Shortcuts") + sep + "&?", _L("Show the list of keyboard shortcuts"), - [](wxCommandEvent&) { wxGetApp().keyboard_shortcuts(); }); + append_shortcut_item(helpMenu, Shortcut::KeyboardShortcuts, false, _L("Keyboard Shortcuts"), _L("Show the list of keyboard shortcuts"), + [](wxCommandEvent&) { wxGetApp().keyboard_shortcuts(ShortcutContext::Global); }); // Show Beginner's Tutorial append_menu_item(helpMenu, wxID_ANY, _L("Setup Wizard"), _L("Setup Wizard"), [](wxCommandEvent &) {wxGetApp().ShowUserGuide();}); @@ -2854,29 +2842,28 @@ static void add_common_publish_menu_items(wxMenu* publish_menu, MainFrame* mainF #endif } -static void add_common_view_menu_items(wxMenu* view_menu, MainFrame* mainFrame, std::function can_change_view) +void MainFrame::add_common_view_menu_items(wxMenu* view_menu, std::function can_change_view) { - // The camera control accelerators are captured by GLCanvas3D::on_char(). - append_menu_item(view_menu, wxID_ANY, _L("Default View") + "\t" + ctrl + "0", _L("Default View"), [mainFrame](wxCommandEvent&) { - mainFrame->select_view("plate"); - mainFrame->plater()->get_current_canvas3D()->zoom_to_bed(); + append_shortcut_item(view_menu, Shortcut::ViewDefault, true, _L("Default View"), _L("Default View"), [this](wxCommandEvent&) { + select_view("plate"); + plater()->get_current_canvas3D()->zoom_to_bed(); }, - "", nullptr, [can_change_view]() { return can_change_view(); }, mainFrame); + "", nullptr, [can_change_view]() { return can_change_view(); }, this); //view_menu->AppendSeparator(); //TRN To be shown in the main menu View->Top - append_menu_item(view_menu, wxID_ANY, _L_CONTEXT("Top", "Camera View") + "\t" + ctrl + "1", _L("Top View"), [mainFrame](wxCommandEvent&) { mainFrame->select_view("top"); }, - "", nullptr, [can_change_view]() { return can_change_view(); }, mainFrame); + append_shortcut_item(view_menu, Shortcut::ViewTop, true, _L_CONTEXT("Top", "Camera View"), _L("Top View"), [this](wxCommandEvent&) { select_view("top"); }, + "", nullptr, [can_change_view]() { return can_change_view(); }, this); //TRN To be shown in the main menu View->Bottom - append_menu_item(view_menu, wxID_ANY, _L_CONTEXT("Bottom", "Camera View") + "\t" + ctrl + "2", _L("Bottom View"), [mainFrame](wxCommandEvent&) { mainFrame->select_view("bottom"); }, - "", nullptr, [can_change_view]() { return can_change_view(); }, mainFrame); - append_menu_item(view_menu, wxID_ANY, _L_CONTEXT("Front", "Camera View") + "\t" + ctrl + "3", _L("Front View"), [mainFrame](wxCommandEvent&) { mainFrame->select_view("front"); }, - "", nullptr, [can_change_view]() { return can_change_view(); }, mainFrame); - append_menu_item(view_menu, wxID_ANY, _L_CONTEXT("Rear", "Camera View") + "\t" + ctrl + "4", _L("Rear View"), [mainFrame](wxCommandEvent&) { mainFrame->select_view("rear"); }, - "", nullptr, [can_change_view]() { return can_change_view(); }, mainFrame); - append_menu_item(view_menu, wxID_ANY, _L_CONTEXT("Left", "Camera View") + "\t" + ctrl + "5", _L("Left View"),[mainFrame](wxCommandEvent &) {mainFrame->select_view("left"); }, - "", nullptr, [can_change_view]() { return can_change_view(); }, mainFrame); - append_menu_item(view_menu, wxID_ANY, _L_CONTEXT("Right", "Camera View") + "\t" + ctrl + "6", _L("Right View"),[mainFrame](wxCommandEvent &) { mainFrame->select_view("right"); }, - "", nullptr, [can_change_view]() { return can_change_view(); }, mainFrame); + append_shortcut_item(view_menu, Shortcut::ViewBottom, true, _L_CONTEXT("Bottom", "Camera View"), _L("Bottom View"), [this](wxCommandEvent&) { select_view("bottom"); }, + "", nullptr, [can_change_view]() { return can_change_view(); }, this); + append_shortcut_item(view_menu, Shortcut::ViewFront, true, _L_CONTEXT("Front", "Camera View"), _L("Front View"), [this](wxCommandEvent&) { select_view("front"); }, + "", nullptr, [can_change_view]() { return can_change_view(); }, this); + append_shortcut_item(view_menu, Shortcut::ViewRear, true, _L_CONTEXT("Rear", "Camera View"), _L("Rear View"), [this](wxCommandEvent&) { select_view("rear"); }, + "", nullptr, [can_change_view]() { return can_change_view(); }, this); + append_shortcut_item(view_menu, Shortcut::ViewLeft, true, _L_CONTEXT("Left", "Camera View"), _L("Left View"), [this](wxCommandEvent &) { select_view("left"); }, + "", nullptr, [can_change_view]() { return can_change_view(); }, this); + append_shortcut_item(view_menu, Shortcut::ViewRight, true, _L_CONTEXT("Right", "Camera View"), _L("Right View"), [this](wxCommandEvent &) { select_view("right"); }, + "", nullptr, [can_change_view]() { return can_change_view(); }, this); } void MainFrame::init_menubar_as_editor() @@ -2895,17 +2882,17 @@ void MainFrame::init_menubar_as_editor() [this] { return m_plater != nullptr && wxGetApp().app_config->get("app", "single_instance") == "false"; }, this); #endif // New Project - append_menu_item(fileMenu, wxID_ANY, _L("New Project") + "\t" + ctrl + "N", _L("Start a new project"), + append_shortcut_item(fileMenu, Shortcut::NewProject, true, _L("New Project"), _L("Start a new project"), [this](wxCommandEvent&) { if (m_plater) m_plater->new_project(); }, "", nullptr, [this](){return can_start_new_project(); }, this); // Open Project #ifndef __APPLE__ - append_menu_item(fileMenu, wxID_ANY, _L("Open Project") + dots + "\t" + ctrl + "O", _L("Open a project file"), + append_shortcut_item(fileMenu, Shortcut::OpenProject, true, _L("Open Project") + dots, _L("Open a project file"), [this](wxCommandEvent&) { if (m_plater) m_plater->load_project(); }, "menu_open", nullptr, [this](){return can_open_project(); }, this); #else - append_menu_item(fileMenu, wxID_ANY, _L("Open Project") + dots + "\t" + ctrl + "O", _L("Open a project file"), + append_shortcut_item(fileMenu, Shortcut::OpenProject, true, _L("Open Project") + dots, _L("Open a project file"), [this](wxCommandEvent&) { if (m_plater) m_plater->load_project(); }, "", nullptr, [this](){return can_open_project(); }, this); #endif @@ -2932,21 +2919,21 @@ void MainFrame::init_menubar_as_editor() // BBS: close save project #ifndef __APPLE__ - append_menu_item(fileMenu, wxID_ANY, _L("Save Project") + "\t" + ctrl + "S", _L("Save current project to file"), + append_shortcut_item(fileMenu, Shortcut::SaveProject, true, _L("Save Project"), _L("Save current project to file"), [this](wxCommandEvent&) { if (m_plater) m_plater->save_project(); }, "menu_save", nullptr, [this](){return m_plater != nullptr && can_save(); }, this); #else - append_menu_item(fileMenu, wxID_ANY, _L("Save Project") + "\t" + ctrl + "S", _L("Save current project to file"), + append_shortcut_item(fileMenu, Shortcut::SaveProject, true, _L("Save Project"), _L("Save current project to file"), [this](wxCommandEvent&) { if (m_plater) m_plater->save_project(); }, "", nullptr, [this](){return m_plater != nullptr && can_save(); }, this); #endif #ifndef __APPLE__ - append_menu_item(fileMenu, wxID_ANY, _L("Save Project as") + dots + "\t" + ctrl + shift + "S", _L("Save current project as"), + append_shortcut_item(fileMenu, Shortcut::SaveProjectAs, true, _L("Save Project as") + dots, _L("Save current project as"), [this](wxCommandEvent&) { if (m_plater) m_plater->save_project(true); }, "menu_save", nullptr, [this](){return m_plater != nullptr && can_save_as(); }, this); #else - append_menu_item(fileMenu, wxID_ANY, _L("Save Project as") + dots + "\t" + ctrl + shift + "S", _L("Save current project as"), + append_shortcut_item(fileMenu, Shortcut::SaveProjectAs, true, _L("Save Project as") + dots, _L("Save current project as"), [this](wxCommandEvent&) { if (m_plater) m_plater->save_project(true); }, "", nullptr, [this](){return m_plater != nullptr && can_save_as(); }, this); #endif @@ -2956,11 +2943,11 @@ void MainFrame::init_menubar_as_editor() auto publish_handler = [this](wxCommandEvent&) { publish_project(); }; #ifndef __APPLE__ - append_menu_item(fileMenu, wxID_ANY, _L("Publish 3MF") + dots + "\t" + ctrl + shift + "E", _L("Export a 3MF file with the selected settings embedded"), + append_shortcut_item(fileMenu, Shortcut::Publish3mf, true, _L("Publish 3MF") + dots, _L("Export a 3MF file with the selected settings embedded"), publish_handler, "menu_publish", nullptr, [this](){return can_export_model(); }, this); #else - append_menu_item(fileMenu, wxID_ANY, _L("Publish 3MF") + dots + "\t" + ctrl + shift + "E", _L("Export a 3MF file with the selected settings embedded"), + append_shortcut_item(fileMenu, Shortcut::Publish3mf, true, _L("Publish 3MF") + dots, _L("Export a 3MF file with the selected settings embedded"), publish_handler, "", nullptr, [this](){return can_export_model(); }, this); #endif @@ -2971,13 +2958,13 @@ void MainFrame::init_menubar_as_editor() // BBS wxMenu *import_menu = new wxMenu(); #ifndef __APPLE__ - append_menu_item(import_menu, wxID_ANY, _L("Import 3MF/STL/STEP/SVG/OBJ/AMF") + dots + "\t" + ctrl + "I", _L("Load a model"), + append_shortcut_item(import_menu, Shortcut::ImportModel, true, _L("Import 3MF/STL/STEP/SVG/OBJ/AMF") + dots, _L("Load a model"), [this](wxCommandEvent&) { if (m_plater) { m_plater->add_file(); } }, "menu_import", nullptr, [this](){return can_add_models(); }, this); #else - append_menu_item(import_menu, wxID_ANY, _L("Import 3MF/STL/STEP/SVG/OBJ/AMF") + dots + "\t" + ctrl + "I", _L("Load a model"), + append_shortcut_item(import_menu, Shortcut::ImportModel, true, _L("Import 3MF/STL/STEP/SVG/OBJ/AMF") + dots, _L("Load a model"), [this](wxCommandEvent&) { if (m_plater) { m_plater->add_model(); } }, "", nullptr, [this](){return can_add_models(); }, this); #endif @@ -3009,7 +2996,7 @@ void MainFrame::init_menubar_as_editor() [this](wxCommandEvent&) { if (m_plater) m_plater->export_core_3mf(); }, "menu_export_sliced_file", nullptr, [this](){return can_export_model(); }, this); // BBS export .gcode.3mf - append_menu_item(export_menu, wxID_ANY, _L("Export plate sliced file") + dots + "\t" + ctrl + "G", _L("Export current sliced file"), + append_shortcut_item(export_menu, Shortcut::ExportSlicedFile, true, _L("Export plate sliced file") + dots, _L("Export current sliced file"), [this](wxCommandEvent&) { if (m_plater) wxPostEvent(m_plater, SimpleEvent(EVT_GLTOOLBAR_EXPORT_SLICED_FILE)); }, "menu_export_sliced_file", nullptr, [this](){return can_export_gcode(); }, this); @@ -3059,37 +3046,37 @@ void MainFrame::init_menubar_as_editor() }; #ifndef __APPLE__ // BBS undo - append_menu_item(editMenu, wxID_ANY, _L("Undo") + "\t" + ctrl + "Z", + append_shortcut_item(editMenu, Shortcut::Undo, true, _L("Undo"), _L("Undo"), [this](wxCommandEvent&) { m_plater->undo(); }, "menu_undo", nullptr, [this](){return m_plater->can_undo(); }, this); // BBS redo - append_menu_item(editMenu, wxID_ANY, _L("Redo") + "\t" + ctrl + "Y", + append_shortcut_item(editMenu, Shortcut::Redo, true, _L("Redo"), _L("Redo"), [this](wxCommandEvent&) { m_plater->redo(); }, "menu_redo", nullptr, [this](){return m_plater->can_redo(); }, this); editMenu->AppendSeparator(); // BBS Cut TODO - append_menu_item(editMenu, wxID_ANY, _L("Cut") + "\t" + ctrl + "X", + append_shortcut_item(editMenu, Shortcut::Cut, true, _L("Cut"), _L("Cut selection to clipboard"), [this](wxCommandEvent&) {m_plater->cut_selection_to_clipboard(); }, "menu_cut", nullptr, [this]() {return m_plater->can_copy_to_clipboard(); }, this); // BBS Copy - append_menu_item(editMenu, wxID_ANY, _L("Copy") + "\t" + ctrl + "C", + append_shortcut_item(editMenu, Shortcut::Copy, true, _L("Copy"), _L("Copy selection to clipboard"), [this](wxCommandEvent&) { m_plater->copy_selection_to_clipboard(); }, "menu_copy", nullptr, [this](){return m_plater->can_copy_to_clipboard(); }, this); // BBS Paste - append_menu_item(editMenu, wxID_ANY, _L("Paste") + "\t" + ctrl + "V", + append_shortcut_item(editMenu, Shortcut::Paste, true, _L("Paste"), _L("Paste clipboard"), [this](wxCommandEvent&) { m_plater->paste_from_clipboard(); }, "menu_paste", nullptr, [this](){return m_plater->can_paste_from_clipboard(); }, this); // BBS Delete selected - append_menu_item(editMenu, wxID_ANY, _L("Delete Selected") + "\t" + _L_CONTEXT("Del", "Keyboard Shortcut"), + append_shortcut_item(editMenu, Shortcut::DeleteSelected, true, _L("Delete Selected"), _L("Deletes the current selection"),[this](wxCommandEvent&) { m_plater->remove_selected(); }, "menu_remove", nullptr, [this](){return can_delete(); }, this); //BBS: delete all - append_menu_item(editMenu, wxID_ANY, _L("Delete All") + "\t" + ctrl + "D", + append_shortcut_item(editMenu, Shortcut::DeleteAll, true, _L("Delete All"), _L("Deletes all objects"),[this](wxCommandEvent&) { m_plater->delete_all_objects_from_model(); }, "menu_remove", nullptr, [this](){return can_delete_all(); }, this); editMenu->AppendSeparator(); // BBS Clone Selected - append_menu_item(editMenu, wxID_ANY, _L("Clone Selected") /*+ "\t" + ctrl + "M"*/, + append_shortcut_item(editMenu, Shortcut::CloneSelected, true, _L("Clone Selected"), _L("Clone copies of selections"),[this](wxCommandEvent&) { m_plater->clone_selection(); }, @@ -3103,7 +3090,7 @@ void MainFrame::init_menubar_as_editor() editMenu->AppendSeparator(); #else // BBS undo - append_menu_item(editMenu, wxID_ANY, _L("Undo") + sep + ctrl_t + "Z", + append_shortcut_item(editMenu, Shortcut::Undo, false, _L("Undo"), _L("Undo"), [this, handle_key_event](wxCommandEvent&) { wxKeyEvent e; e.SetEventType(wxEVT_KEY_DOWN); @@ -3115,7 +3102,7 @@ void MainFrame::init_menubar_as_editor() m_plater->undo(); }, "", nullptr, [this](){return m_plater->can_undo(); }, this); // BBS redo - append_menu_item(editMenu, wxID_ANY, _L("Redo") + sep + ctrl_t + "Y", + append_shortcut_item(editMenu, Shortcut::Redo, false, _L("Redo"), _L("Redo"), [this, handle_key_event](wxCommandEvent&) { wxKeyEvent e; e.SetEventType(wxEVT_KEY_DOWN); @@ -3128,7 +3115,7 @@ void MainFrame::init_menubar_as_editor() "", nullptr, [this](){return m_plater->can_redo(); }, this); editMenu->AppendSeparator(); // BBS Cut TODO - append_menu_item(editMenu, wxID_ANY, _L("Cut") + sep + ctrl_t + "X", + append_shortcut_item(editMenu, Shortcut::Cut, false, _L("Cut"), _L("Cut selection to clipboard"), [this, handle_key_event](wxCommandEvent&) { wxKeyEvent e; e.SetEventType(wxEVT_KEY_DOWN); @@ -3140,7 +3127,7 @@ void MainFrame::init_menubar_as_editor() m_plater->cut_selection_to_clipboard(); }, "", nullptr, [this]() {return m_plater->can_copy_to_clipboard(); }, this); // BBS Copy - append_menu_item(editMenu, wxID_ANY, _L("Copy") + sep + ctrl_t + "C", + append_shortcut_item(editMenu, Shortcut::Copy, false, _L("Copy"), _L("Copy selection to clipboard"), [this, handle_key_event](wxCommandEvent&) { wxKeyEvent e; e.SetEventType(wxEVT_KEY_DOWN); @@ -3152,7 +3139,7 @@ void MainFrame::init_menubar_as_editor() m_plater->copy_selection_to_clipboard(); }, "", nullptr, [this](){return m_plater->can_copy_to_clipboard(); }, this); // BBS Paste - append_menu_item(editMenu, wxID_ANY, _L("Paste") + sep + ctrl_t + "V", + append_shortcut_item(editMenu, Shortcut::Paste, false, _L("Paste"), _L("Paste clipboard"), [this, handle_key_event](wxCommandEvent&) { wxKeyEvent e; e.SetEventType(wxEVT_KEY_DOWN); @@ -3165,14 +3152,14 @@ void MainFrame::init_menubar_as_editor() "", nullptr, [this](){return m_plater->can_paste_from_clipboard(); }, this); #if 0 // BBS Delete selected - append_menu_item(editMenu, wxID_ANY, _L("Delete Selected") + "\t" + _L_CONTEXT("Backspace", "Keyboard Shortcut"), + append_shortcut_item(editMenu, Shortcut::DeleteSelected, true, _L("Delete Selected"), _L("Deletes the current selection"),[this](wxCommandEvent&) { m_plater->remove_selected(); }, "", nullptr, [this](){return can_delete(); }, this); #endif //BBS: delete all - append_menu_item(editMenu, wxID_ANY, _L("Delete All") + "\t" + ctrl + "D", + append_shortcut_item(editMenu, Shortcut::DeleteAll, true, _L("Delete All"), _L("Deletes all objects"),[this, handle_key_event](wxCommandEvent&) { wxKeyEvent e; e.SetEventType(wxEVT_KEY_DOWN); @@ -3185,7 +3172,7 @@ void MainFrame::init_menubar_as_editor() "", nullptr, [this](){return can_delete_all(); }, this); editMenu->AppendSeparator(); // BBS Clone Selected - append_menu_item(editMenu, wxID_ANY, _L("Clone Selected") + "\t" + ctrl + "K", + append_shortcut_item(editMenu, Shortcut::CloneSelected, true, _L("Clone Selected"), _L("Clone copies of selections"),[this, handle_key_event](wxCommandEvent&) { wxKeyEvent e; e.SetEventType(wxEVT_KEY_DOWN); @@ -3208,7 +3195,7 @@ void MainFrame::init_menubar_as_editor() #endif // BBS Select All - append_menu_item(editMenu, wxID_ANY, _L("Select All") + sep + ctrl_t + "A", + append_shortcut_item(editMenu, Shortcut::SelectAll, false, _L("Select All"), _L("Selects all objects"), [this, handle_key_event](wxCommandEvent&) { wxKeyEvent e; e.SetEventType(wxEVT_KEY_DOWN); @@ -3260,7 +3247,7 @@ void MainFrame::init_menubar_as_editor() wxMenu* viewMenu = nullptr; if (m_plater) { viewMenu = new wxMenu(); - add_common_view_menu_items(viewMenu, this, std::bind(&MainFrame::can_change_view, this)); + add_common_view_menu_items(viewMenu, std::bind(&MainFrame::can_change_view, this)); viewMenu->AppendSeparator(); //BBS perspective view @@ -3291,13 +3278,14 @@ void MainFrame::init_menubar_as_editor() []() { return wxGetApp().app_config->get_bool("auto_perspective"); }, this); viewMenu->AppendSeparator(); - append_menu_check_item(viewMenu, wxID_ANY, _L("Show &G-code Window") + sep + "C", _L("Show G-code window in Preview scene."), + wxMenuItem* gcode_window = append_menu_check_item(viewMenu, wxID_ANY, shortcut_label(_L("Show &G-code Window"), Shortcut::ToggleGcodeWindow, true), _L("Show G-code window in Preview scene."), [this](wxCommandEvent &) { wxGetApp().toggle_show_gcode_window(); m_plater->get_current_canvas3D()->post_event(SimpleEvent(wxEVT_PAINT)); }, this, [this]() { return m_tabpanel->GetSelectedPageName() == TAB_ID_PREVIEW; }, []() { return wxGetApp().show_gcode_window(); }, this); + m_shortcut_menu_items.push_back({ gcode_window, Shortcut::ToggleGcodeWindow, _L("Show &G-code Window"), true }); append_menu_check_item( viewMenu, wxID_ANY, _L("Show 3D Navigator"), _L("Show 3D navigator in Prepare and Preview scene."), @@ -3349,9 +3337,10 @@ void MainFrame::init_menubar_as_editor() this); viewMenu->AppendSeparator(); - append_menu_check_item(viewMenu, wxID_ANY, _L("Show &Labels") + "\t" + ctrl + "E", _L("Show object labels in 3D scene."), + wxMenuItem* show_labels = append_menu_check_item(viewMenu, wxID_ANY, shortcut_label(_L("Show &Labels"), Shortcut::ShowLabels, true), _L("Show object labels in 3D scene."), [this](wxCommandEvent&) { m_plater->show_view3D_labels(!m_plater->are_view3D_labels_shown()); m_plater->get_current_canvas3D()->post_event(SimpleEvent(wxEVT_PAINT)); }, this, [this]() { return m_plater->is_view3D_shown(); }, [this]() { return m_plater->are_view3D_labels_shown(); }, this); + m_shortcut_menu_items.push_back({ show_labels, Shortcut::ShowLabels, _L("Show &Labels"), true }); append_menu_check_item(viewMenu, wxID_ANY, _L("Show &Overhang"), _L("Show object overhang highlight in 3D scene."), [this](wxCommandEvent &) { @@ -3396,8 +3385,6 @@ void MainFrame::init_menubar_as_editor() //auto preference_item = new wxMenuItem(parent_menu, OrcaSlicerMenuPreferences + bambu_studio_id_base, _L("Preferences") + "\t" + ctrl + ",", ""); #else wxMenu* parent_menu = m_topbar->GetTopMenu(); - auto preference_item = new wxMenuItem(parent_menu, ConfigMenuPreferences + config_id_base, _L("Preferences") + "\t" + ctrl + "P", ""); - #endif #ifdef __APPLE__ @@ -3406,17 +3393,12 @@ void MainFrame::init_menubar_as_editor() parent_menu, wxID_ANY, _L(about_title), "", [](wxCommandEvent &) { Slic3r::GUI::about();}, "", nullptr, []() { return true; }, this, 0); - append_menu_item( - parent_menu, wxID_ANY, _L("Preferences") + "\t" + ctrl + ",", "", + append_shortcut_item( + parent_menu, Shortcut::Preferences, true, _L("Preferences"), "", [](wxCommandEvent &) { wxGetApp().open_preferences(); }, "", nullptr, []() { return true; }, this, 1); - parent_menu->AppendSeparator(); - append_menu_item( - parent_menu, wxID_ANY, _L("Open speed dial...") + sep + "Space", "", - [](wxCommandEvent &) { wxGetApp().open_speed_dial(); }, - "", nullptr, []() { return true; }, this); //parent_menu->Insert(1, preference_item); #endif // Help menu @@ -3430,8 +3412,8 @@ void MainFrame::init_menubar_as_editor() m_topbar->AddDropDownSubMenu(viewMenu, _L("View")); //BBS add Preference - append_menu_item( - m_topbar->GetTopMenu(), wxID_ANY, _L("Preferences") + "\t" + ctrl + "P", "", + append_shortcut_item( + m_topbar->GetTopMenu(), Shortcut::Preferences, true, _L("Preferences"), "", [](wxCommandEvent &) { // Orca: Use GUI_App::open_preferences instead of direct call so windows associations are updated on exit wxGetApp().open_preferences(); @@ -3441,8 +3423,8 @@ void MainFrame::init_menubar_as_editor() auto top_menu = m_topbar->GetTopMenu(); top_menu->AppendSeparator(); - append_menu_item( - top_menu, wxID_ANY, _L("Open speed dial...") + "\t" + "Space", "", + append_shortcut_item( + top_menu, Shortcut::SpeedDial, false, _L("Open Speed Dial"), "", [](wxCommandEvent &) { wxGetApp().open_speed_dial(); }, "", nullptr, []() { return true; }, this); top_menu->AppendSeparator(); @@ -3548,8 +3530,8 @@ void MainFrame::init_menubar_as_editor() #else // On Mac, the Apple menu ignores non-standard custom items, so add Preset Bundle to the File menu fileMenu->AppendSeparator(); - append_menu_item( - fileMenu, wxID_ANY, _L("Open speed dial...") + sep + "Space", "", + append_shortcut_item( + fileMenu, Shortcut::SpeedDial, false, _L("Open Speed Dial"), "", [](wxCommandEvent&) { wxGetApp().open_speed_dial(); }, "", nullptr, []() { return true; }, this); append_menu_item( @@ -3687,7 +3669,8 @@ void MainFrame::set_max_recent_count(int max) } wxGetApp().app_config->set_recent_projects(recent_projects); wxGetApp().app_config->save(); - m_webview->SendRecentList(-1); + if (WebViewPanel* home = WebViewPanel::if_built()) + home->SendRecentList(-1); } } @@ -3752,7 +3735,7 @@ void MainFrame::init_menubar_as_gcodeviewer() wxMenu* viewMenu = nullptr; if (m_plater != nullptr) { viewMenu = new wxMenu(); - add_common_view_menu_items(viewMenu, this, std::bind(&MainFrame::can_change_view, this)); + add_common_view_menu_items(viewMenu, std::bind(&MainFrame::can_change_view, this)); } // helpmenu @@ -4031,23 +4014,56 @@ void MainFrame::select_tab(wxPanel* panel) select_tab(page_name); } +// Selects the Prepare page without the page-changed event, so the GL canvas is on screen +// and nothing else is built for the pass. +void MainFrame::select_prepare_for_gl_init() +{ + m_tabpanel->ChangeSelection(m_tabpanel->FindPageByName(TAB_ID_PREPARE)); +} + +// The book shows its first page as it is inserted, while the frame is hidden and nothing +// may build; the first show completes that page. +bool MainFrame::Show(bool show) +{ + const bool changed = DPIFrame::Show(show); + if (show && changed && m_tabpanel != nullptr) + if (wxWindow* page = m_tabpanel->GetCurrentPage()) + page->Show(true); + return changed; +} + +// A page out of the book stays registered and is passed over; a negative order is never +// registered. +void MainFrame::prebuild_pages_when_idle() +{ + m_idle.clear(); + if (m_param_panel) + m_idle.add(m_param_panel->settings_page_prebuild()); + for (LazyBase* page : m_lazy_pages) + if (page->prebuild_order() >= 0) + m_idle.add(*page); + m_idle.add(m_diff_dialog); + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": prebuild queue: " << m_idle.names(); + m_idle.start(); + m_prebuild_started = true; +} + //BBS void MainFrame::jump_to_monitor(std::string dev_id) { - if(!m_monitor) - return; m_tabpanel->SelectPageByName(TAB_ID_MONITOR); if (!dev_id.empty()) { - ((MonitorPanel*)m_monitor)->select_machine(dev_id); + MonitorPanel::ensure()->select_machine(dev_id); } } void MainFrame::jump_to_multipage() { - if(!m_multi_machine) + if (!m_multi_machine_page->in_book()) return; m_tabpanel->SelectPageByName(TAB_ID_MULTI_DEVICE); - ((MultiMachinePage*)m_multi_machine)->jump_to_send_page(); + if (MultiMachinePage* page = m_multi_machine_page->ensure()) + page->jump_to_send_page(); } @@ -4096,8 +4112,8 @@ void MainFrame::request_select_tab(const wxString& id) } int MainFrame::get_calibration_curr_tab() { - if (m_calibration) - return m_calibration->get_tabpanel()->GetSelection(); + if (CalibrationPanel* calibration = CalibrationPanel::if_built()) + return calibration->get_tabpanel()->GetSelection(); return -1; } @@ -4206,7 +4222,8 @@ void MainFrame::add_to_recent_projects(const wxString& filename) recent_projects.push_back(into_u8(m_recent_projects.GetHistoryFile(i))); } wxGetApp().app_config->set_recent_projects(recent_projects); - m_webview->SendRecentList(0); + if (WebViewPanel* home = WebViewPanel::if_built()) + home->SendRecentList(0); } } @@ -4322,7 +4339,8 @@ void MainFrame::open_recent_project(size_t file_id, wxString const & filename) recent_projects.push_back(into_u8(m_recent_projects.GetHistoryFile(i))); } wxGetApp().app_config->set_recent_projects(recent_projects); - m_webview->SendRecentList(-1); + if (WebViewPanel* home = WebViewPanel::if_built()) + home->SendRecentList(-1); } } } @@ -4345,7 +4363,8 @@ void MainFrame::remove_recent_project(size_t file_id, wxString const &filename) recent_projects.push_back(into_u8(m_recent_projects.GetHistoryFile(i))); } wxGetApp().app_config->set_recent_projects(recent_projects); - m_webview->SendRecentList(-1); + if (WebViewPanel* home = WebViewPanel::if_built()) + home->SendRecentList(-1); } void MainFrame::load_url(wxString url) @@ -4399,14 +4418,14 @@ bool MainFrame::is_printer_view() const { return m_tabpanel->GetSelectedPageName void MainFrame::refresh_plugin_tips() { - if (m_webview != nullptr) - m_webview->ShowNetpluginTip(); + if (WebViewPanel* home = WebViewPanel::if_built()) + home->ShowNetpluginTip(); } void MainFrame::RunScript(wxString js) { - if (m_webview != nullptr) - m_webview->RunScript(js); + if (WebViewPanel* home = WebViewPanel::if_built()) + home->RunScript(js); } void MainFrame::technology_changed() @@ -4515,7 +4534,8 @@ void MainFrame::update_side_preset_ui() //take off multi machine - if(m_multi_machine){m_multi_machine->clear_page();} + if (MultiMachinePage* multi_machine = MultiMachinePage::if_built()) + multi_machine->clear_page(); } void MainFrame::on_select_default_preset(SimpleEvent& evt) diff --git a/src/slic3r/GUI/MainFrame.hpp b/src/slic3r/GUI/MainFrame.hpp index 6851935059..f580de57e0 100644 --- a/src/slic3r/GUI/MainFrame.hpp +++ b/src/slic3r/GUI/MainFrame.hpp @@ -26,6 +26,8 @@ #include "Widgets/SideButton.hpp" #include "Widgets/SideMenuPopup.hpp" #include "FilamentGroupPopup.hpp" +#include "LazyPage.hpp" +#include "IdleScheduler.hpp" #include @@ -74,6 +76,8 @@ class DesignPanel; class MainFrame; class WebViewPanel; class ParamsDialog; +enum class Shortcut : uint8_t; +struct KeyChord; #ifdef __WXGTK__ class ResizeEdgePanel; #endif @@ -134,6 +138,13 @@ class MainFrame : public DPIFrame #endif bool m_loaded {false}; wxTimer* m_reset_title_text_colour_timer{ nullptr }; + IdleScheduler m_idle; + bool m_prebuild_started{ false }; + // Every LazyPage, in and out of the book; prebuild_pages_when_idle() registers them. + std::vector m_lazy_pages; + // The latest EVT_LOAD_PRINTER_URL, applied when the web Device view is built. + wxString m_printer_url; + wxString m_printer_api_key; wxString m_qs_last_input_file = wxEmptyString; wxString m_qs_last_output_file = wxEmptyString; @@ -178,7 +189,7 @@ class MainFrame : public DPIFrame bool can_delete() const; bool can_delete_all() const; bool can_reslice() const; - void bind_diff_dialog(); + DiffPresetDialog* make_diff_dialog(); // BBS wxBoxSizer* create_side_tools(); @@ -195,6 +206,29 @@ class MainFrame : public DPIFrame // vector of a MenuBar items changeable in respect to printer technology std::vector m_changeable_menu_items; + // Menu items whose label shows a key binding; update_shortcut_labels() rewrites them. + struct ShortcutMenuItem + { + wxMenuItem* item; + Shortcut shortcut; + wxString label; + bool accelerator; // false keeps the binding display-only on macOS, where the menu bar's accelerators are live + }; + std::vector m_shortcut_menu_items; + + wxString shortcut_label(const wxString& label, Shortcut shortcut, bool accelerator); + template + wxMenuItem* append_shortcut_item(wxMenu* menu, Shortcut shortcut, bool accelerator, const wxString& label, Args&&... args) + { + wxMenuItem* item = append_menu_item(menu, wxID_ANY, shortcut_label(label, shortcut, accelerator), std::forward(args)...); + m_shortcut_menu_items.push_back({ item, shortcut, label, accelerator }); + return item; + } + // Runs the Global shortcut bound to chord; false when the focused control should see the key as well. + bool handle_global_shortcut(const KeyChord& chord); + void add_common_view_menu_items(wxMenu* view_menu, std::function can_change_view); + wxMenu* generate_help_menu(); + struct FileHistory : wxFileHistory { FileHistory(int max) : wxFileHistory(max) {} @@ -352,8 +386,15 @@ public: void select_tab(wxPanel* panel); void select_tab(const wxString& id = wxString()); void request_select_tab(const wxString& id); + // post_init() needs the plater's canvas on screen to initialize OpenGL; this pass does not + // build the settings page. + void select_prepare_for_gl_init(); + // Builds the lazy tab pages while the user is idle; post_init() calls it once. + void prebuild_pages_when_idle(); + bool Show(bool show = true) override; int get_calibration_curr_tab(); void select_view(const std::string& direction); + void update_shortcut_labels(); // Propagate changed configuration from the Tab to the Plater and save changes to the AppConfig void on_config_changed(DynamicPrintConfig* cfg) const ; void set_print_button_to_default(PrintSelectType select_type); @@ -409,27 +450,21 @@ public: BBLTopbar* m_topbar{ nullptr }; PrintHostQueueDialog* printhost_queue_dlg() { return m_printhost_queue_dlg; } Plater* m_plater { nullptr }; + // Lazy pages, created once and kept for the frame's life; their panels are reached + // through LazyInstance's statics, and show_device() only moves pages in and out of the book. #ifdef SLIC3R_CAD - // The tab page is the placeholder; m_design_panel stays null until the tab is first - // selected, so everything the Design panel builds stays off the startup path. - wxPanel* m_design_page { nullptr }; - DesignPanel* m_design_panel { nullptr }; - // Builds the Design panel if it does not exist yet and returns it (null only before the - // placeholder page itself exists). Main thread only -- it creates wx controls. Both the - // tab activation and the MCP socket go through this: the socket is driven headlessly, - // with nobody to click the tab, and without this every verb would answer "not ready". - DesignPanel* ensure_design_panel(); + LazyPage* m_design_page { nullptr }; #endif //BBS: GUI refactor - MonitorPanel* m_monitor{ nullptr }; + LazyPage* m_monitor_page{ nullptr }; //AuxiliaryPanel* m_auxiliary{ nullptr }; - MultiMachinePage* m_multi_machine{ nullptr }; - ProjectPanel* m_project{ nullptr }; + LazyPage* m_multi_machine_page{ nullptr }; + LazyPage* m_project_page{ nullptr }; - CalibrationPanel* m_calibration{ nullptr }; - WebViewPanel* m_webview { nullptr }; - PrinterWebView* m_printer_view{nullptr}; + LazyPage* m_calibration_page{ nullptr }; + LazyPage* m_home_page { nullptr }; + LazyPage* m_printer_view_page{nullptr}; PluginPages m_plugin_pages; wxLogWindow* m_log_window { nullptr }; // BBS @@ -440,7 +475,8 @@ public: ParamsDialog* m_param_dialog{ nullptr }; //BBS SettingsDialog m_settings_dialog; - DiffPresetDialog diff_dialog; + // The Compare presets dialog, built on first use or at idle through its holder. + Lazy m_diff_dialog; wxWindow* m_plater_page{ nullptr }; PrintHostQueueDialog* m_printhost_queue_dlg; diff --git a/src/slic3r/GUI/Monitor.cpp b/src/slic3r/GUI/Monitor.cpp index 1a6d969988..7352ee3dd7 100644 --- a/src/slic3r/GUI/Monitor.cpp +++ b/src/slic3r/GUI/Monitor.cpp @@ -103,6 +103,7 @@ MonitorPanel::MonitorPanel(wxWindow* parent, wxWindowID id, const wxPoint& pos, : wxPanel(parent, id, pos, size, style), m_select_machine(SelectMachinePopup(this)) { + SetBackgroundColour(*wxWHITE); #ifdef __WINDOWS__ SetDoubleBuffered(true); #endif //__WINDOWS__ @@ -180,31 +181,36 @@ void MonitorPanel::init_tabpanel() auto title = m_tabpanel->GetPageText(m_tabpanel->GetSelection()); m_media_file_panel->SwitchStorage(title == _L("Storage")); } - page->SetFocus(); + // The first page is selected while the panel is built off screen. + if (page->IsShownOnScreen()) + page->SetFocus(); update_all(); }, m_tabpanel->GetId()); - //m_status_add_machine_panel = new AddMachinePanel(m_tabpanel); - m_status_info_panel = new StatusPanel(m_tabpanel); + m_status_info_panel = new StatusPanel(m_tabpanel); + // Queued before the page is added, since adding it selects it and runs the handler above, + // where built() must already be false. + add_build_steps_of(*m_status_info_panel); m_tabpanel->AddPage(m_status_info_panel, _L("Status"), true); + add_build_step([this] { + m_media_file_panel = new MediaFilePanel(m_tabpanel); + m_tabpanel->AddPage(m_media_file_panel, _L("Storage"), false); + }); + add_build_step([this] { + m_upgrade_panel = new UpgradePanel(m_tabpanel); + m_tabpanel->AddPage(m_upgrade_panel, _L_CONTEXT(L_CONTEXT("Update", "Firmware"), "Firmware"), false); + }); + add_build_step([this] { + m_hms_panel = new HMSPanel(m_tabpanel); + m_tabpanel->AddPage(m_hms_panel, _L("Assistant(HMS)"), false); - m_media_file_panel = new MediaFilePanel(m_tabpanel); - m_tabpanel->AddPage(m_media_file_panel, _L("Storage"), false); - //m_tabpanel->AddPage(m_media_file_panel, _L("Internal Storage"), false); + std::string network_ver = Slic3r::NetworkAgent::get_version(); + if (!network_ver.empty()) { + m_tabpanel->SetFooterText(wxString::Format(_L("Network plug-in v%s"), network_ver)); + } - m_upgrade_panel = new UpgradePanel(m_tabpanel); - m_tabpanel->AddPage(m_upgrade_panel, _L_CONTEXT(L_CONTEXT("Update", "Firmware"), "Firmware"), false); - - m_hms_panel = new HMSPanel(m_tabpanel); - m_tabpanel->AddPage(m_hms_panel, _L("Assistant(HMS)"), false); - - std::string network_ver = Slic3r::NetworkAgent::get_version(); - if (!network_ver.empty()) { - m_tabpanel->SetFooterText(wxString::Format(_L("Network plug-in v%s"), network_ver)); - } - - m_initialized = true; - show_status((int)MonitorStatus::MONITOR_NO_PRINTER); + show_status((int)MonitorStatus::MONITOR_NO_PRINTER); + }); } void MonitorPanel::set_default() @@ -288,19 +294,23 @@ void MonitorPanel::on_select_printer(wxCommandEvent& event) set_default(); update_all(); - MachineObject *obj_ = dev->get_selected_machine(); - if (obj_) { - obj_->last_cali_version = -1; - obj_->reset_pa_cali_history_result(); - obj_->reset_pa_cali_result(); - Sidebar &sidebar = GUI::wxGetApp().sidebar(); - sidebar.update_sync_status(obj_); - sidebar.set_need_auto_sync_after_connect_printer(sidebar.need_auto_sync_extruder_list_after_connect_priner(obj_)); - } + on_machine_selected(dev->get_selected_machine()); Layout(); } +void MonitorPanel::on_machine_selected(MachineObject* obj) +{ + if (obj == nullptr) + return; + obj->last_cali_version = -1; + obj->reset_pa_cali_history_result(); + obj->reset_pa_cali_result(); + Sidebar& sidebar = GUI::wxGetApp().sidebar(); + sidebar.update_sync_status(obj); + sidebar.set_need_auto_sync_after_connect_printer(sidebar.need_auto_sync_extruder_list_after_connect_priner(obj)); +} + void MonitorPanel::on_printer_clicked(wxMouseEvent &event) { auto mouse_pos = ClientToScreen(event.GetPosition()); @@ -331,7 +341,8 @@ void MonitorPanel::on_size(wxSizeEvent &event) void MonitorPanel::update_all() { - if (!m_initialized) + // Every page exists once the last build step has run. + if (!built()) return; NetworkAgent* m_agent = wxGetApp().getAgent(); @@ -412,16 +423,12 @@ void MonitorPanel::update_hms_tag() bool MonitorPanel::Show(bool show) { -#ifdef __APPLE__ - // Notebook::InsertPage() hides every page it appends, so this also runs while MainFrame is - // still constructing, before GUI_App::mainframe is assigned. Same guard as Plater::Show(). - if (wxGetApp().mainframe) - wxGetApp().mainframe->SetMinSize(wxGetApp().plater()->GetMinSize()); -#endif - NetworkAgent* m_agent = wxGetApp().getAgent(); DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager(); if (show) { +#ifdef __APPLE__ + wxGetApp().mainframe->SetMinSize(wxGetApp().plater()->GetMinSize()); +#endif start_update(); update_network_version_footer(); @@ -448,7 +455,7 @@ bool MonitorPanel::Show(bool show) void MonitorPanel::show_status(int status) { - if (!m_initialized) return; + if (!built()) return; if (last_status == status)return; if ((last_status & (int)MonitorStatus::MONITOR_CONNECTING) != 0) { NetworkAgent* agent = wxGetApp().getAgent(); diff --git a/src/slic3r/GUI/Monitor.hpp b/src/slic3r/GUI/Monitor.hpp index 9252b04559..94474f73b0 100644 --- a/src/slic3r/GUI/Monitor.hpp +++ b/src/slic3r/GUI/Monitor.hpp @@ -49,6 +49,7 @@ #include "slic3r/GUI/AmsWidgets.hpp" #include "Widgets/SideTools.hpp" #include "SelectMachinePop.hpp" +#include "Lazy.hpp" namespace Slic3r { namespace GUI { @@ -72,16 +73,16 @@ public: void msw_rescale(); }; -class MonitorPanel : public wxPanel +class MonitorPanel : public wxPanel, public StagedBuild, public LazyInstance { private: Tabbook* m_tabpanel{ nullptr }; wxSizer* m_main_sizer{ nullptr }; - StatusPanel* m_status_info_panel; - MediaFilePanel* m_media_file_panel; - UpgradePanel* m_upgrade_panel; - HMSPanel* m_hms_panel; + StatusPanel* m_status_info_panel{ nullptr }; + MediaFilePanel* m_media_file_panel{ nullptr }; + UpgradePanel* m_upgrade_panel{ nullptr }; + HMSPanel* m_hms_panel{ nullptr }; /* side tools */ SideTools* m_side_tools{nullptr}; @@ -96,7 +97,6 @@ private: wxBitmap m_arrow_img; int last_status; - bool m_initialized { false }; bool update_flag{false}; wxTimer* m_refresh_timer = nullptr; @@ -125,6 +125,8 @@ public: StatusPanel* get_status_panel() {return m_status_info_panel;}; void select_machine(std::string machine_sn); + // Resets the selected printer's calibration results and syncs the sidebar, without the Device tab. + static void on_machine_selected(MachineObject* obj); void on_timer(wxTimerEvent& event); void on_select_printer(wxCommandEvent& event); void on_printer_clicked(wxMouseEvent &event); diff --git a/src/slic3r/GUI/MultiMachineManagerPage.cpp b/src/slic3r/GUI/MultiMachineManagerPage.cpp index 792c23fb13..d5f9cbce8a 100644 --- a/src/slic3r/GUI/MultiMachineManagerPage.cpp +++ b/src/slic3r/GUI/MultiMachineManagerPage.cpp @@ -21,8 +21,9 @@ MultiMachineItem::MultiMachineItem(wxWindow* parent, MachineObject* obj) Bind(wxEVT_MOTION, &MultiMachineItem::OnMove, this); Bind(EVT_MULTI_DEVICE_VIEW, [obj](auto& e) { wxGetApp().mainframe->jump_to_monitor(obj->get_dev_id()); - if (wxGetApp().mainframe->m_monitor->get_status_panel()->get_media_play_ctrl()) { - wxGetApp().mainframe->m_monitor->get_status_panel()->get_media_play_ctrl()->jump_to_play(); + MonitorPanel* monitor = MonitorPanel::if_built(); + if (monitor && monitor->get_status_panel()->get_media_play_ctrl()) { + monitor->get_status_panel()->get_media_play_ctrl()->jump_to_play(); } }); wxGetApp().UpdateDarkUIWin(this); diff --git a/src/slic3r/GUI/MultiMachinePage.cpp b/src/slic3r/GUI/MultiMachinePage.cpp index dd67e099a0..e48e402405 100644 --- a/src/slic3r/GUI/MultiMachinePage.cpp +++ b/src/slic3r/GUI/MultiMachinePage.cpp @@ -11,6 +11,7 @@ namespace GUI { MultiMachinePage::MultiMachinePage(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style) : wxPanel(parent, id, pos, size, style) { + SetBackgroundColour(*wxWHITE); init_tabpanel(); m_main_sizer = new wxBoxSizer(wxHORIZONTAL); m_main_sizer->Add(m_tabpanel, 1, wxEXPAND | wxLEFT, 0); diff --git a/src/slic3r/GUI/MultiMachinePage.hpp b/src/slic3r/GUI/MultiMachinePage.hpp index 724eeed2a9..14d531e8ab 100644 --- a/src/slic3r/GUI/MultiMachinePage.hpp +++ b/src/slic3r/GUI/MultiMachinePage.hpp @@ -7,6 +7,7 @@ #include "MultiTaskManagerPage.hpp" #include "MultiMachineManagerPage.hpp" #include "Tabbook.hpp" +#include "Lazy.hpp" #include "wx/button.h" @@ -19,7 +20,7 @@ namespace GUI { #define PICK_LEFT_DEV_STATUS 250 #define PICK_DEVICE_MAX 6 -class MultiMachinePage : public wxPanel +class MultiMachinePage : public wxPanel, public LazyInstance { private: wxTimer* m_refresh_timer = nullptr; diff --git a/src/slic3r/GUI/NativeCommands.cpp b/src/slic3r/GUI/NativeCommands.cpp index 2e24f14326..1297cd4a24 100644 --- a/src/slic3r/GUI/NativeCommands.cpp +++ b/src/slic3r/GUI/NativeCommands.cpp @@ -10,6 +10,7 @@ #include "GUI_Factories.hpp" #include "GUI_ObjectList.hpp" #include "I18N.hpp" +#include "Shortcuts.hpp" #include "IMSlider.hpp" #include "MainFrame.hpp" #include "NetworkTestDialog.hpp" @@ -563,7 +564,7 @@ std::vector build_command_catalog() // ---- Help ---- (mirrors the top-bar Help menu, plus the wiki/YouTube links) add("help_keyboard_shortcuts", _u8L("Keyboard Shortcuts"), _u8L("Help"), [](const std::string&) { - wxGetApp().keyboard_shortcuts(); + wxGetApp().keyboard_shortcuts(ShortcutContext::Global); return AppActionRunResult{AppActionRunResult::Level::Success}; }); add("help_setup_wizard", _u8L("Setup Wizard"), _u8L("Help"), [](const std::string&) { diff --git a/src/slic3r/GUI/ParamsPanel.cpp b/src/slic3r/GUI/ParamsPanel.cpp index 5a49df1280..b4fd81706a 100644 --- a/src/slic3r/GUI/ParamsPanel.cpp +++ b/src/slic3r/GUI/ParamsPanel.cpp @@ -290,7 +290,7 @@ ParamsPanel::ParamsPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos, c m_compare_btn = new ScalableButton(m_top_panel, wxID_ANY, "compare", wxEmptyString, wxDefaultSize, wxDefaultPosition, wxBU_EXACTFIT | wxNO_BORDER, true); m_compare_btn->SetToolTip(_L("Compare presets")); - m_compare_btn->Bind(wxEVT_BUTTON, ([](wxCommandEvent e) { wxGetApp().mainframe->diff_dialog.show(); })); + m_compare_btn->Bind(wxEVT_BUTTON, ([](wxCommandEvent e) { DiffPresetDialog::ensure()->show(); })); m_setting_btn = new ScalableButton(m_top_panel, wxID_ANY, "table", wxEmptyString, wxDefaultSize, wxDefaultPosition, wxBU_EXACTFIT | wxNO_BORDER, true); m_setting_btn->SetToolTip(_L("View all object's settings")); @@ -550,18 +550,36 @@ void ParamsPanel::clear_page() void ParamsPanel::OnActivate() { if (m_current_tab == NULL) - { - //the first time - BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(": first time opened, set current tab to print"); - // BBS: open/close tab - //m_current_tab = m_tab_print; - set_active_tab(m_tab_print ? m_tab_print : m_tab_filament); - } + select_default_tab(); Tab* cur_tab = dynamic_cast (m_current_tab); if (cur_tab) cur_tab->OnActivate(); } +void ParamsPanel::select_default_tab() +{ + BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(": first time opened, set current tab to print"); + // BBS: open/close tab + //m_current_tab = m_tab_print; + set_active_tab(m_tab_print ? m_tab_print : m_tab_filament); +} + +bool ParamsPanel::SettingsPagePrebuild::built() const +{ + Tab* tab = dynamic_cast(m_panel.m_current_tab); + return tab != nullptr && !tab->page_build_pending(); +} + +bool ParamsPanel::SettingsPagePrebuild::build_step() +{ + if (m_panel.m_current_tab == nullptr) { + m_panel.select_default_tab(); + return !built(); + } + Tab* tab = dynamic_cast(m_panel.m_current_tab); + return tab != nullptr && tab->page_build_step(); +} + void ParamsPanel::OnToggled(wxCommandEvent& event) { if (m_mode_region && m_mode_region->GetId() == event.GetId()) { diff --git a/src/slic3r/GUI/ParamsPanel.hpp b/src/slic3r/GUI/ParamsPanel.hpp index 91bf3d2a7e..9f9264b480 100644 --- a/src/slic3r/GUI/ParamsPanel.hpp +++ b/src/slic3r/GUI/ParamsPanel.hpp @@ -30,6 +30,7 @@ #include "wxExtensions.hpp" #include "GUI_Utils.hpp" #include "Widgets/Button.hpp" +#include "Lazy.hpp" class ModeSwitchButton; class SwitchButton; @@ -121,6 +122,22 @@ class ParamsPanel : public wxPanel wxPanel* m_current_tab { nullptr }; + // Builds the selected page's option groups at idle; while no tab is selected yet, + // its first unit selects the default one. + class SettingsPagePrebuild : public LazyBase + { + public: + explicit SettingsPagePrebuild(ParamsPanel& panel) : m_panel(panel) {} + const std::string& name() const override { return m_name; } + bool built() const override; + bool build_step() override; + int prebuild_order() const override { return 0; } + + private: + ParamsPanel& m_panel; + std::string m_name{ "settings_page" }; + } m_settings_page_prebuild{ *this }; + bool m_has_object_config { false }; struct Highlighter @@ -149,6 +166,10 @@ class ParamsPanel : public wxPanel //clear the right page void clear_page(); void OnActivate(); + // The print tab, or the filament tab without one. + void select_default_tab(); + // The settings page's prebuild task. + LazyBase& settings_page_prebuild() { return m_settings_page_prebuild; } void set_active_tab(wxPanel*tab); bool is_active_and_shown_tab(wxPanel*tab); void update_mode(); diff --git a/src/slic3r/GUI/PartPlate.cpp b/src/slic3r/GUI/PartPlate.cpp index 5d002a1fd8..3c35b708e8 100644 --- a/src/slic3r/GUI/PartPlate.cpp +++ b/src/slic3r/GUI/PartPlate.cpp @@ -34,6 +34,7 @@ #include "libslic3r/IMEXZones.hpp" #include "libslic3r/Color.hpp" #include "libslic3r/Utils.hpp" +#include "libslic3r/LifecycleEvents.hpp" #include "I18N.hpp" #include "GUI_App.hpp" @@ -3564,11 +3565,20 @@ void PartPlate::set_plate_name(const std::string& name) if (boost::equals(m_name, name)) return; + const std::string previous_name = m_name; m_name = name; if (m_print != nullptr) m_print->set_plate_name(name); invalidate_plate_name_texture(); + + if (m_plater != nullptr && !m_plater->is_loading_project()) { + LifecycleEventContext ctx; + ctx.name = name; + ctx.previous_name = previous_name; + ctx.index = m_plate_index; + fire_lifecycle_event(LifecycleEvent::PlateRenamed, ctx); + } } //get the print's object, result and index @@ -4507,8 +4517,11 @@ void PartPlate::render(const Transform3d& view_matrix, const Transform3d& projec shader->stop_using(); } - if (wxGetApp().show_plate_gridlines() && show_grid) + if (wxGetApp().show_plate_gridlines() && show_grid) { + glsafe(::glDepthMask(bottom ? GL_TRUE : GL_FALSE)); render_grid(bottom); + glsafe(::glDepthMask(GL_TRUE)); + } if (!hide_chrome && !bottom && m_selected && !force_background_color) { if (m_partplate_list) @@ -5735,9 +5748,16 @@ int PartPlateList::create_plate(bool adjust_position) if (m_plater) { // In GUI mode - wxGetApp().obj_list()->on_plate_added(plate); + wxGetApp().obj_list()->on_plate_added(plate); } + if (m_plater != nullptr && m_intialized && !m_plater->is_loading_project()) { + LifecycleEventContext ctx; + ctx.name = plate->get_plate_name(); + ctx.index = new_index; + fire_lifecycle_event(LifecycleEvent::PlateCreated, ctx); + } + BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(":created a new plate %1%") % new_index; return new_index; } @@ -5836,6 +5856,7 @@ int PartPlateList::delete_plate(int index) BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << boost::format(":plate %1%, has an invalid index %2%") % index % plate->get_index(); return -1; } + const std::string plate_name = plate->get_plate_name(); if (m_plater) { // In GUI mode @@ -5918,6 +5939,13 @@ int PartPlateList::delete_plate(int index) delete plate; + if (m_plater != nullptr && m_intialized && !m_plater->is_loading_project()) { + LifecycleEventContext ctx; + ctx.name = plate_name; + ctx.index = index; + fire_lifecycle_event(LifecycleEvent::PlateDeleted, ctx); + } + // FIX: context of BackgroundSliceProcess and gcode preview need to be updated before ObjectList::reload_all_plates(). #if 0 if (m_plater != nullptr) { @@ -6026,6 +6054,7 @@ int PartPlateList::select_plate(int index) if (m_plate_list.empty() || index >= m_plate_list.size()) { return -1; } + const int previous_index = m_current_plate; // BBS: erase unnecessary snapshot if (get_curr_plate_index() != index && m_intialized) { @@ -6052,6 +6081,13 @@ int PartPlateList::select_plate(int index) //wxQueueEvent(m_plater, new SimpleEvent(EVT_GLCANVAS_PLATE_SELECT)); } + if (previous_index != index && m_intialized && m_plater != nullptr && !m_plater->is_loading_project()) { + LifecycleEventContext ctx; + ctx.name = m_plate_list[index]->get_plate_name(); + ctx.index = index; + fire_lifecycle_event(LifecycleEvent::PlateSelected, ctx); + } + return 0; } diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 3b0daa860f..0ddf6a9223 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -58,6 +58,7 @@ #include #include "libslic3r/libslic3r.h" +#include "libslic3r/LifecycleEvents.hpp" #include "libslic3r/Format/STL.hpp" #include "libslic3r/Format/DRC.hpp" #include "libslic3r/Format/STEP.hpp" @@ -84,10 +85,12 @@ #include "GUI.hpp" #include "GUI_App.hpp" +#include "Shortcuts.hpp" #include "GUI_ObjectList.hpp" #ifdef __WXGTK__ #include "LinuxDisplayBackend.hpp" #endif +#include "AuiPaneLayout.hpp" #include "GUI_Utils.hpp" #include "GUI_Factories.hpp" #include "wxExtensions.hpp" @@ -6750,6 +6753,14 @@ struct Plater::priv // GUI elements AuiMgr m_aui_mgr; + // Live dock panes. `on_close` runs when the user closes one from its close button; `shown` is + // what the owner asked for. + struct DockPane + { + std::function on_close; + bool shown{true}; + }; + std::map m_dock_panes; wxString m_default_window_layout; wxPanel* current_panel{ nullptr }; std::vector panels; @@ -6830,6 +6841,7 @@ struct Plater::priv bool show_render_statistic_dialog{ false }; bool show_wireframe{ false }; bool wireframe_enabled{ true }; + bool show_xray{ false }; static const std::regex pattern_bundle; static const std::regex pattern_3mf; @@ -6921,6 +6933,11 @@ struct Plater::priv void update_sidebar(bool force_update = false); void reset_window_layout(); Sidebar::DockingState get_sidebar_docking_state(); + void add_dock_pane(wxWindow* window, const std::string& name, const wxString& caption, const std::string& dock, + const wxSize& size, std::function on_close); + void remove_dock_pane(wxWindow* window); + void show_dock_pane(wxWindow* window, bool show); + bool dock_pane_visible(const DockPane& dock_pane, const wxAuiPaneInfo& pane) const; bool is_view3D_layers_editing_enabled() const { return (current_panel == view3D) && view3D->get_canvas3d()->is_layers_editing_enabled(); } @@ -7019,7 +7036,7 @@ struct Plater::priv void remove(size_t obj_idx); bool delete_object_from_model(size_t obj_idx, bool refresh_immediately = true); //BBS void delete_all_objects_from_model(); - void reset(bool apply_presets_change = false); + void reset(bool apply_presets_change = false, bool reload_presets = true); void center_selection(); void drop_selection(); void mirror(Axis axis); @@ -7502,6 +7519,18 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame) panel_3d->SetSizer(panel_sizer); m_aui_mgr.AddPane(panel_3d, wxAuiPaneInfo().Name("main").CenterPane().PaneBorder(false)); + q->Bind(wxEVT_AUI_PANE_CLOSE, [this](wxAuiManagerEvent& evt) { + const wxAuiPaneInfo* pane = evt.GetPane(); + auto it = pane != nullptr ? m_dock_panes.find(pane->window) : m_dock_panes.end(); + if (it != m_dock_panes.end()) { + const std::function on_close = std::move(it->second.on_close); + m_dock_panes.erase(it); + if (on_close) + on_close(); + } + evt.Skip(); + }); + m_default_window_layout = m_aui_mgr.SavePerspective(); { @@ -7598,7 +7627,9 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame) view3D_canvas->Bind(EVT_GLCANVAS_PRINTABLE, [this](SimpleEvent& evt) { this->sidebar->obj_list()->toggle_printable_state(); }); view3D_canvas->Bind(EVT_GLCANVAS_SELECT_ALL, [this](SimpleEvent&) { this->q->select_all(); }); - view3D_canvas->Bind(EVT_GLCANVAS_QUESTION_MARK, [](SimpleEvent&) { wxGetApp().keyboard_shortcuts(); }); + view3D_canvas->Bind(EVT_GLCANVAS_QUESTION_MARK, [this](SimpleEvent&) { + wxGetApp().keyboard_shortcuts(view3D->get_canvas3d()->get_gizmos_manager().is_paint_gizmo() ? ShortcutContext::Painting : ShortcutContext::Plater); + }); view3D_canvas->Bind(EVT_GLCANVAS_INCREASE_INSTANCES, [this](Event& evt) { if (evt.data == 1) this->q->increase_instances(); else if (this->can_decrease_instances()) this->q->decrease_instances(); }); view3D_canvas->Bind(EVT_GLCANVAS_INSTANCE_MOVED, [this](SimpleEvent&) { update(); }); @@ -7675,7 +7706,7 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame) view3D_canvas->Bind(EVT_GLCANVAS_UPDATE_BED_SHAPE, [q](SimpleEvent&) { q->set_bed_shape(); }); // Preview events: - preview->get_wxglcanvas()->Bind(EVT_GLCANVAS_QUESTION_MARK, [](SimpleEvent&) { wxGetApp().keyboard_shortcuts(); }); + preview->get_wxglcanvas()->Bind(EVT_GLCANVAS_QUESTION_MARK, [](SimpleEvent&) { wxGetApp().keyboard_shortcuts(ShortcutContext::Preview); }); preview->get_wxglcanvas()->Bind(EVT_GLCANVAS_UPDATE_BED_SHAPE, [q](SimpleEvent&) { q->set_bed_shape(); }); preview->get_wxglcanvas()->Bind(EVT_GLCANVAS_UPDATE, [this](SimpleEvent &) { preview->get_canvas3d()->set_as_dirty(); @@ -7864,7 +7895,8 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame) if (this->q->get_project_filename().IsEmpty() && this->q->is_empty_project()) { int skip_confirm = e.GetInt(); - this->q->new_project(skip_confirm, true); + // Skips the preset reload; trigger_restore_project()'s callers load the presets first. + this->q->new_project(skip_confirm, true, wxString(), false); } }); //wxPostEvent(this->q, wxCommandEvent{EVT_RESTORE_PROJECT}); @@ -8136,10 +8168,7 @@ void Plater::priv::collapse_sidebar(bool collapse) sidebar_layout.is_collapsed = collapse; // Now update the tooltip in the toolbar. - std::string new_tooltip = collapse - ? _u8L("Expand sidebar") - : _u8L("Collapse sidebar"); - new_tooltip += " [" + _u8L("Shift+") + _u8L("Tab") + "]"; + const std::string new_tooltip = wxGetApp().shortcuts().with_key(collapse ? _u8L("Expand sidebar") : _u8L("Collapse sidebar"), Shortcut::CollapseSidebar); int id = collapse_toolbar.get_item_id("collapse_sidebar"); collapse_toolbar.set_tooltip(id, new_tooltip); @@ -8168,6 +8197,14 @@ void Plater::priv::update_sidebar(bool force_update) { } } + for (const auto& [window, dock_pane] : m_dock_panes) { + wxAuiPaneInfo& pane = m_aui_mgr.GetPane(window); + if (pane.IsOk() && pane.IsShown() != dock_pane_visible(dock_pane, pane)) { + pane.Show(!pane.IsShown()); + needs_update = true; + } + } + if (needs_update) { notification_manager->set_sidebar_collapsed(sidebar.IsShown()); m_aui_mgr.Update(); @@ -8177,10 +8214,96 @@ void Plater::priv::update_sidebar(bool force_update) { void Plater::priv::reset_window_layout() { m_aui_mgr.LoadPerspective(m_default_window_layout, false); + // Loading a layout docks and hides every pane it does not list, and the default layout lists no + // dock panes: a floating dock pane is docked again, like the rest of the window. + for (const auto& [window, dock_pane] : m_dock_panes) + if (wxAuiPaneInfo& pane = m_aui_mgr.GetPane(window); pane.IsOk()) + pane.Show(dock_pane_visible(dock_pane, pane)); sidebar_layout.is_collapsed = false; update_sidebar(true); } +bool Plater::priv::dock_pane_visible(const DockPane& dock_pane, const wxAuiPaneInfo& pane) const +{ + // A floating pane is a top-level window, so it does not hide with the Plater on other tabs. + return dock_pane.shown && (!pane.IsFloating() || sidebar_layout.show); +} + +void Plater::priv::add_dock_pane(wxWindow* window, const std::string& name, const wxString& caption, const std::string& dock, + const wxSize& size, std::function on_close) +{ + const wxString base_name = wxString::FromUTF8(name); + wxString unique_name = base_name; + for (int i = 2; m_aui_mgr.GetPane(unique_name).IsOk(); ++i) + unique_name = base_name + wxString::Format("#%d", i); + + // A restored layout below already holds pixels. + const wxSize pixels = q->FromDIP(size); + wxAuiPaneInfo info; + info.Name(unique_name).Caption(caption).BestSize(pixels).FloatingSize(pixels).DestroyOnClose(true); + if (dock == "left") + info.Left(); + else if (dock == "bottom") + info.Bottom(); + else + info.Right(); + if (dock == "float") + info.Float(); + + // Put the pane back where it was the last time the window layout was saved with it open. + const std::string saved = aui_pane_layout_entry(wxGetApp().app_config->get("window_layout"), unique_name.utf8_string()); + if (!saved.empty()) { + m_aui_mgr.LoadPaneInfo(wxString::FromUTF8(saved), info); + info.Caption(caption).DestroyOnClose(true).Show(); + } + + // Floating is disabled on Wayland. + if ((m_aui_mgr.GetFlags() & wxAUI_MGR_ALLOW_FLOATING) == 0) { + info.Dock().Floatable(false); + if (info.dock_direction == wxAUI_DOCK_NONE) + info.Right(); + } + + const DockPane& dock_pane = m_dock_panes[window] = DockPane{std::move(on_close)}; + info.Show(dock_pane_visible(dock_pane, info)); + m_aui_mgr.AddPane(window, info); + + // wxAUI does not record a dragged sash in best_size, so track the docked size like the sidebar + // does, for the saved layout. + window->Bind(wxEVT_IDLE, [this, window](wxIdleEvent& evt) { + wxAuiPaneInfo& pane = m_aui_mgr.GetPane(window); + if (pane.IsOk() && pane.IsShown() && pane.IsDocked() && pane.rect.GetWidth() > 0 && pane.rect.GetHeight() > 0) { + const bool horizontal = pane.dock_direction == wxAUI_DOCK_TOP || pane.dock_direction == wxAUI_DOCK_BOTTOM; + pane.BestSize(horizontal ? pane.best_size.GetWidth() : pane.rect.GetWidth(), + horizontal ? pane.rect.GetHeight() : pane.best_size.GetHeight()); + } + evt.Skip(); + }); + + m_aui_mgr.Update(); +} + +void Plater::priv::remove_dock_pane(wxWindow* window) +{ + m_dock_panes.erase(window); + if (m_aui_mgr.DetachPane(window)) + m_aui_mgr.Update(); + window->Destroy(); +} + +void Plater::priv::show_dock_pane(wxWindow* window, bool show) +{ + const auto it = m_dock_panes.find(window); + wxAuiPaneInfo& pane = m_aui_mgr.GetPane(window); + if (it == m_dock_panes.end() || !pane.IsOk()) + return; + it->second.shown = show; + if (pane.IsShown() == dock_pane_visible(it->second, pane)) + return; + pane.Show(!pane.IsShown()); + m_aui_mgr.Update(); +} + Sidebar::DockingState Plater::priv::get_sidebar_docking_state() { if (!sidebar_layout.is_enabled) { return Sidebar::None; @@ -10147,7 +10270,14 @@ void Plater::priv::remove(size_t obj_idx) view3D->enable_layers_editing(false); m_worker.cancel_all(); + std::string obj_name = (obj_idx < model.objects.size()) ? model.objects[obj_idx]->name : std::to_string(obj_idx); model.delete_object(obj_idx); + { + Slic3r::LifecycleEventContext ctx; + ctx.name = obj_name; + ctx.code = Slic3r::LifecycleEvtCode::Ok; + Slic3r::fire_lifecycle_event(Slic3r::LifecycleEvent::ObjectDeleted, ctx); + } //BBS: notify partplate the instance removed partplate_list.notify_instance_removed(obj_idx, -1); update(); @@ -10180,7 +10310,14 @@ bool Plater::priv::delete_object_from_model(size_t obj_idx, bool refresh_immedia if (obj->is_cut()) sidebar->obj_list()->invalidate_cut_info_for_object(obj_idx); + std::string obj_name = obj->name; model.delete_object(obj_idx); + { + Slic3r::LifecycleEventContext ctx; + ctx.name = obj_name; + ctx.code = Slic3r::LifecycleEvtCode::Ok; + Slic3r::fire_lifecycle_event(Slic3r::LifecycleEvent::ObjectDeleted, ctx); + } //BBS: notify partplate the instance removed partplate_list.notify_instance_removed(obj_idx, -1); @@ -10224,12 +10361,24 @@ void Plater::priv::delete_all_objects_from_model() model.plates_custom_gcodes.clear(); } -void Plater::priv::reset(bool apply_presets_change) +void Plater::priv::reset(bool apply_presets_change, bool reload_presets) { + // TakeSnapshot below and load_current_presets() further down each re-evaluate the + // aggregate dirty flag against a baseline that hasn't been reset yet, so they can toggle + // is_dirty() back and forth several times before it settles; coalesce those into one event. + ProjectDirtyStateManager::NotificationSuppressor dirty_notify_suppressor(dirty_state); + Plater::TakeSnapshot snapshot(q, _u8L("Reset Project"), UndoRedo::SnapshotType::ProjectSeparator); clear_warnings(); + const std::string closed_project_name = into_u8(get_project_filename()); + if (!closed_project_name.empty() || !model.objects.empty()) { + Slic3r::LifecycleEventContext ctx; + ctx.name = closed_project_name; + ctx.code = Slic3r::LifecycleEvtCode::Ok; + Slic3r::fire_lifecycle_event(Slic3r::LifecycleEvent::ProjectClosed, ctx); + } // A new project must not inherit the previous project's published selection (Feature A/B). m_has_pending_published = false; m_pending_published_keys.clear(); @@ -10267,8 +10416,8 @@ void Plater::priv::reset(bool apply_presets_change) // Same reason, one level up: the Design tab keeps the editable document, not the Model, so // clearing the recipe alone leaves the tab showing the previous project's feature tree — // and its next edit syncs that tree straight back into the new project. - if (wxGetApp().mainframe != nullptr && wxGetApp().mainframe->m_design_panel != nullptr) - wxGetApp().mainframe->m_design_panel->clear_document(); + if (DesignPanel* design = DesignPanel::if_built()) + design->clear_document(); #endif assemble_view->get_canvas3d()->reset_explosion_ratio(); update(); @@ -10287,7 +10436,7 @@ void Plater::priv::reset(bool apply_presets_change) wxGetApp().preset_bundle->reset_project_embedded_presets(); if (apply_presets_change) wxGetApp().apply_keeped_preset_modifications(); - else + else if (reload_presets) wxGetApp().load_current_presets(false, false); //BBS @@ -12694,11 +12843,15 @@ void Plater::priv::on_process_completed(SlicingProcessCompletedEvent &evt) notification_manager->set_slicing_progress_export_possible(); // Reset the "export G-code path" name, so that the automatic background processing will be enabled again. + const std::string lifecycle_job_name = this->background_process.fff_print() ? + this->background_process.fff_print()->output_filename() : std::string(); this->background_process.reset_export(); // This bool stops showing export finished notification even when process_completed_with_error is false bool has_error = false; + std::string lifecycle_error_msg; if (evt.error()) { auto message = evt.format_error_message(); + lifecycle_error_msg = message.first; if (evt.critical_error()) { if (q->m_tracking_popup_menu) { // We don't want to pop-up a message box when tracking a pop-up menu. @@ -12736,6 +12889,14 @@ void Plater::priv::on_process_completed(SlicingProcessCompletedEvent &evt) is_finished = true; } + { + Slic3r::LifecycleEventContext ctx; + ctx.name = lifecycle_job_name; + ctx.code = evt.cancelled() ? Slic3r::LifecycleEvtCode::Warn : (has_error ? Slic3r::LifecycleEvtCode::Error : Slic3r::LifecycleEvtCode::Ok); + ctx.msg = evt.cancelled() ? "cancelled" : (has_error ? lifecycle_error_msg : std::string()); + Slic3r::fire_lifecycle_event(Slic3r::LifecycleEvent::SlicingJobComplete, ctx); + } + //BBS: set the current plater's slice result to valid if (!this->background_process.empty()) this->background_process.get_current_plate()->update_slice_result_valid_state(evt.success()); @@ -13266,17 +13427,17 @@ void Plater::priv::on_tab_selection_changing(wxBookCtrlEvent& e) // Pointer test, not a name lookup: in printer-agents mode this page is TAB_ID_MONITOR_WEB // while the native Device tab holds TAB_ID_MONITOR, and in legacy-web mode it holds // TAB_ID_MONITOR itself. - const bool selecting_web_device_tab = main_frame->m_printer_view && - main_frame->m_tabpanel->GetPage(new_sel) == main_frame->m_printer_view; + const bool selecting_web_device_tab = main_frame->m_printer_view_page && + main_frame->m_tabpanel->GetPage(new_sel) == main_frame->m_printer_view_page; if (selecting_web_device_tab) { // Use the selected discovered machine when the preset has no host. main_frame->load_printer_url(); } else if (new_name == TAB_ID_MONITOR && wxGetApp().preset_bundle != nullptr) { auto cfg = wxGetApp().preset_bundle->printers.get_edited_preset().config; wxString url = from_u8(PrintHost::get_print_host_webui(&cfg)); - if (main_frame->m_printer_view && url.empty()) { + if (PrinterWebView* view = PrinterWebView::if_built(); view != nullptr && url.empty()) { // It's missing_connection page, reload so that we can replay the gif image - main_frame->m_printer_view->reload(); + view->reload(); } } } @@ -14007,8 +14168,8 @@ void Plater::priv::unbind_canvas_event_handlers() // The Design tab's viewport is a fourth GLCanvas3D on the same shared GL context, owned by // MainFrame rather than by us — same reach as reset() uses for clear_document(). Null until // the tab has been opened once, so most sessions skip it. - if (wxGetApp().mainframe != nullptr && wxGetApp().mainframe->m_design_panel != nullptr) - wxGetApp().mainframe->m_design_panel->unbind_canvas_event_handlers(); + if (DesignPanel* design = DesignPanel::if_built()) + design->unbind_canvas_event_handlers(); #endif } @@ -14021,8 +14182,8 @@ void Plater::priv::reset_canvas_volumes() preview->get_canvas3d()->reset_volumes(); #ifdef SLIC3R_CAD - if (wxGetApp().mainframe != nullptr && wxGetApp().mainframe->m_design_panel != nullptr) - wxGetApp().mainframe->m_design_panel->reset_canvas_volumes(); + if (DesignPanel* design = DesignPanel::if_built()) + design->reset_canvas_volumes(); #endif } @@ -15434,7 +15595,7 @@ Print& Plater::fff_print() { return p->fff_print; } const SLAPrint& Plater::sla_print() const { return p->sla_print; } SLAPrint& Plater::sla_print() { return p->sla_print; } -int Plater::new_project(bool skip_confirm, bool silent, const wxString& project_name) +int Plater::new_project(bool skip_confirm, bool silent, const wxString& project_name, bool reload_presets) { model().calib_pa_pattern.reset(nullptr); model().plates_custom_gcodes.clear(); @@ -15471,21 +15632,33 @@ int Plater::new_project(bool skip_confirm, bool silent, const wxString& project_ //get_partplate_list().reinit(); //get_partplate_list().update_slice_context_to_current_plate(p->background_process); //p->preview->update_gcode_result(p->partplate_list.get_current_slice_result()); - reset(transfer_preset_changes); - reset_project_dirty_after_save(); - reset_project_dirty_initial_presets(); - wxGetApp().update_saved_preset_from_current_preset(); - update_project_dirty_from_presets(); + if (!silent) { + Slic3r::LifecycleEventContext ctx; + ctx.code = Slic3r::LifecycleEvtCode::Ok; + Slic3r::fire_lifecycle_event(Slic3r::LifecycleEvent::NewProject, ctx); + } + { + // Same rationale as in Plater::priv::reset(): the whole reset + preset-reload + + // baseline-reset sequence below settles into its final dirty state only once it + // completes, so hold notifications until then to avoid firing on transient flips. + ProjectDirtyStateManager::NotificationSuppressor dirty_notify_suppressor(p->dirty_state); - //reset project - p->project.reset(); - //set project name - if (project_name.empty()) - p->set_project_name(_L("Untitled")); - else - p->set_project_name(project_name); + reset(transfer_preset_changes, reload_presets); + reset_project_dirty_after_save(); + reset_project_dirty_initial_presets(); + wxGetApp().update_saved_preset_from_current_preset(); + update_project_dirty_from_presets(); - Plater::TakeSnapshot snapshot(this, "New Project", UndoRedo::SnapshotType::ProjectSeparator); + //reset project + p->project.reset(); + //set project name + if (project_name.empty()) + p->set_project_name(_L("Untitled")); + else + p->set_project_name(project_name); + + Plater::TakeSnapshot snapshot(this, "New Project", UndoRedo::SnapshotType::ProjectSeparator); + } Model m; model().load_from(m); // new id avoid same path name @@ -15603,6 +15776,13 @@ void Plater::load_project(wxString const& filename2, p->set_project_name(_L("Untitled")); } + { + Slic3r::LifecycleEventContext ctx; + ctx.name = into_u8(load_restore ? originfile : filename); + ctx.code = Slic3r::LifecycleEvtCode::Ok; + Slic3r::fire_lifecycle_event(Slic3r::LifecycleEvent::ProjectOpened, ctx); + } + } else { if (using_exported_file()) { BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << __LINE__ << " using ecported set project filename: " << filename; @@ -15674,11 +15854,23 @@ int Plater::save_project(bool saveAs) if (full_pathnames) { save_strategy = save_strategy | SaveStrategy::FullPathSources; } + { + Slic3r::LifecycleEventContext ctx; + ctx.name = into_u8(filename); + ctx.code = Slic3r::LifecycleEvtCode::Ok; + Slic3r::fire_lifecycle_event(Slic3r::LifecycleEvent::ProjectBeforeSave, ctx); + } if (export_3mf(into_path(filename), save_strategy) < 0) { MessageDialog(this, _L("Failed to save the project.\nPlease check whether the folder exists online or if other programs have the project file open."), _L("Save project"), wxOK | wxICON_WARNING).ShowModal(); return wxID_CANCEL; } + { + Slic3r::LifecycleEventContext ctx; + ctx.name = into_u8(filename); + ctx.code = Slic3r::LifecycleEvtCode::Ok; + Slic3r::fire_lifecycle_event(Slic3r::LifecycleEvent::ProjectAfterSave, ctx); + } Slic3r::remove_backup(model(), false); @@ -18014,6 +18206,19 @@ Sidebar::DockingState Plater::get_sidebar_docking_state() const { return p->get_ void Plater::reset_window_layout() { p->reset_window_layout(); } +void Plater::add_dock_pane(wxWindow* window, const std::string& name, const wxString& caption, const std::string& dock, + const wxSize& size, std::function on_close) +{ + p->add_dock_pane(window, name, caption, dock, size, std::move(on_close)); +} +void Plater::remove_dock_pane(wxWindow* window) { p->remove_dock_pane(window); } +void Plater::remove_dock_panes() +{ + while (!p->m_dock_panes.empty()) + p->remove_dock_pane(p->m_dock_panes.begin()->first); +} +void Plater::show_dock_pane(wxWindow* window, bool show) { p->show_dock_pane(window, show); } + //BBS void Plater::select_curr_plate_all() { p->select_curr_plate_all(); } void Plater::remove_curr_plate_all() { p->remove_curr_plate_all(); } @@ -18023,7 +18228,7 @@ void Plater::deselect_all() { p->deselect_all(); } void Plater::exit_gizmo() { p->exit_gizmo(); } void Plater::remove(size_t obj_idx) { p->remove(obj_idx); } -void Plater::reset(bool apply_presets_change) { p->reset(apply_presets_change); } +void Plater::reset(bool apply_presets_change, bool reload_presets) { p->reset(apply_presets_change, reload_presets); } void Plater::reset_with_confirm() { if (p->model.objects.empty() || MessageDialog(static_cast(this), _L("All objects will be removed, continue?"), @@ -20040,7 +20245,7 @@ int Plater::export_config_3mf(int plate_idx, Export3mfProgressFn proFn) void Plater::send_calibration_job_finished(wxCommandEvent & evt) { p->main_frame->request_select_tab(TAB_ID_CALIBRATION); - auto calibration_panel = p->main_frame->m_calibration; + CalibrationPanel* calibration_panel = CalibrationPanel::ensure(); if (calibration_panel) { auto curr_wizard = static_cast(calibration_panel->get_tabpanel()->GetPage(evt.GetInt())); wxCommandEvent event(EVT_CALIBRATION_JOB_FINISHED); @@ -20072,8 +20277,8 @@ void Plater::print_job_finished(wxCommandEvent &evt) dev->set_selected_machine(evt.GetString().ToStdString()); p->main_frame->request_select_tab(TAB_ID_MONITOR); - //jump to monitor and select device status panel - MonitorPanel* curr_monitor = p->main_frame->m_monitor; + // Selects the status page on a built Device tab; one built by the switch starts there. + MonitorPanel* curr_monitor = MonitorPanel::if_built(); if(curr_monitor) curr_monitor->get_tabpanel()->ChangeSelection(MonitorPanel::PrinterTab::PT_STATUS); } @@ -20831,8 +21036,8 @@ void Plater::update_print_error_info(int code, std::string msg, std::string extr if (p->m_send_to_sdcard_dlg) { p->m_send_to_sdcard_dlg->update_print_error_info(code, msg, extra); } - if (p->main_frame->m_calibration) - p->main_frame->m_calibration->update_print_error_info(code, msg, extra); + if (CalibrationPanel* calibration = CalibrationPanel::if_built()) + calibration->update_print_error_info(code, msg, extra); } wxString Plater::get_project_filename(const wxString& extension) const @@ -21016,6 +21221,14 @@ void Plater::changed_object(ModelObject &object){ // Check outside bed get_current_canvas3D()->requires_check_outside_state(); + + if (!is_loading_project()) { + LifecycleEventContext ctx; + ctx.name = object.name; + ctx.id = std::to_string(object.id().id); + ctx.source = "geometry"; + fire_lifecycle_event(LifecycleEvent::ObjectChanged, ctx); + } } void Plater::changed_object(int obj_idx) @@ -21052,6 +21265,20 @@ void Plater::changed_objects(const std::vector& object_idxs) // update print this->p->schedule_background_process(); + + if (!is_loading_project()) { + for (size_t obj_idx : object_idxs) { + if (obj_idx >= p->model.objects.size() || p->model.objects[obj_idx] == nullptr) + continue; + + LifecycleEventContext ctx; + ctx.name = p->model.objects[obj_idx]->name; + ctx.id = std::to_string(p->model.objects[obj_idx]->id().id); + ctx.index = static_cast(obj_idx); + ctx.source = "geometry"; + fire_lifecycle_event(LifecycleEvent::ObjectChanged, ctx); + } + } } void Plater::schedule_background_process(bool schedule/* = true*/) @@ -21103,7 +21330,8 @@ void Plater::pop_warning_and_go_to_device_page(wxString printer_name, PrinterWar { printer_name.Replace("Bambu Lab", "", false); wxString content; - bool device_page = (wxGetApp().mainframe == nullptr) && (wxGetApp().mainframe->m_monitor->IsShown()); + MainFrame* frame = wxGetApp().mainframe; + bool device_page = frame != nullptr && frame->m_monitor_page->in_book(); if (type == PrinterWarningType::NOT_CONNECTED) { if (device_page) { content = wxString::Format(_L("Printer not connected. Please go to the device page to connect %s before syncing."), @@ -22728,6 +22956,16 @@ bool Plater::is_wireframe_enabled() const return p->wireframe_enabled; } +void Plater::toggle_show_xray() +{ + p->show_xray = !p->show_xray; +} + +bool Plater::is_show_xray() const +{ + return p->show_xray; +} + /*Plater::TakeSnapshot::TakeSnapshot(Plater *plater, const std::string &snapshot_name) : TakeSnapshot(plater, from_u8(snapshot_name)) {} diff --git a/src/slic3r/GUI/Plater.hpp b/src/slic3r/GUI/Plater.hpp index d7cc978440..f95637d4bc 100644 --- a/src/slic3r/GUI/Plater.hpp +++ b/src/slic3r/GUI/Plater.hpp @@ -339,7 +339,7 @@ public: // Helper: returns config indices where filament_is_mixed == false std::vector physical_filament_config_indices() const; - int new_project(bool skip_confirm = false, bool silent = false, const wxString& project_name = wxString()); + int new_project(bool skip_confirm = false, bool silent = false, const wxString& project_name = wxString(), bool reload_presets = true); // BBS: save & backup void load_project(wxString const & filename = "", wxString const & originfile = "-"); int save_project(bool saveAs = false); @@ -476,6 +476,17 @@ public: void reset_window_layout(); + // Dock panes sit alongside the sidebar; `window` must be a child of the Plater. `dock` is + // "left", "right", "bottom" or "float", and `size` is in DIPs. A pane closed from its own close + // button is destroyed after on_close runs; remove_dock_pane() destroys it without calling on_close. + void add_dock_pane(wxWindow* window, const std::string& name, const wxString& caption, const std::string& dock, + const wxSize& size, std::function on_close); + void remove_dock_pane(wxWindow* window); + void show_dock_pane(wxWindow* window, bool show); + // Removes every dock pane without calling on_close, for MainFrame::shutdown() (app exit and a + // language switch), while the Plater and any floating frames still exist. + void remove_dock_panes(); + // Called after the Preferences dialog is closed and the program settings are saved. // Update the UI based on the current preferences. void update_ui_from_settings(); @@ -488,7 +499,7 @@ public: void deselect_all(); void exit_gizmo(); void remove(size_t obj_idx); - void reset(bool apply_presets_change = false); + void reset(bool apply_presets_change = false, bool reload_presets = true); void reset_with_confirm(); //BBS: return int for various result int close_with_confirm(std::function second_check = nullptr); // BBS close project @@ -968,6 +979,9 @@ public: void enable_wireframe(bool status); bool is_wireframe_enabled() const; + void toggle_show_xray(); + bool is_show_xray() const; + // Wrapper around wxWindow::PopupMenu to suppress error messages popping out while tracking the popup menu. bool PopupMenu(wxMenu *menu, const wxPoint& pos = wxDefaultPosition); bool PopupMenu(wxMenu *menu, int x, int y) { return this->PopupMenu(menu, wxPoint(x, y)); } diff --git a/src/slic3r/GUI/PrebuildQueue.hpp b/src/slic3r/GUI/PrebuildQueue.hpp new file mode 100644 index 0000000000..c013f53865 --- /dev/null +++ b/src/slic3r/GUI/PrebuildQueue.hpp @@ -0,0 +1,89 @@ +#pragma once + +#include +#include +#include +#include + +#include "Lazy.hpp" + +namespace Slic3r { namespace GUI { + +// Holders to build at idle, ordered by prebuild_order(), run one slice at a time. The +// holders outlive the queue. Main thread only. +class PrebuildQueue +{ +public: + struct Slice + { + std::string name; // the task that ran; empty when nothing was pending + int units{ 0 }; // units run + long long ms{ 0 }; // time spent + bool completed{ false }; // the task has no more units + bool remaining{ false }; // some task is still pending + }; + + // Lower order runs first, equal order in the order added. + void add(LazyBase& task) + { + auto after = std::find_if(m_tasks.begin(), m_tasks.end(), [&](const LazyBase* t) { return t->prebuild_order() > task.prebuild_order(); }); + m_tasks.insert(after, &task); + } + + void clear() { m_tasks.clear(); } + + bool pending() const + { + return std::any_of(m_tasks.begin(), m_tasks.end(), [](const LazyBase* t) { return t->pending(); }); + } + + // The task names in queue order, comma separated. + std::string names() const + { + std::string out; + for (const LazyBase* t : m_tasks) + out += (out.empty() ? "" : ", ") + t->name(); + return out; + } + + // Runs units of the first pending task until it completes, budget_ms of now_ms() have + // passed, or interrupt() is true after a unit; on_unit gets the task name and each + // unit's duration. A task with no work is passed over and stays in the queue, so one + // whose work returns is pending again. + Slice run_slice(int budget_ms, + const std::function& now_ms, + const std::function& interrupt, + const std::function& on_unit = {}) + { + Slice slice; + auto next = std::find_if(m_tasks.begin(), m_tasks.end(), [](const LazyBase* t) { return t->pending(); }); + if (next == m_tasks.end()) + return slice; + // The pointer is copied out, since a unit may add tasks and reallocate m_tasks. + LazyBase* const task = *next; + slice.name = task->name(); + const long long started = now_ms(); + for (;;) { + const long long unit_started = now_ms(); + const bool more = task->build_step(); + const long long now = now_ms(); + ++slice.units; + if (on_unit) + on_unit(slice.name, now - unit_started); + slice.ms = now - started; + if (!more) { + slice.completed = true; + break; + } + if (slice.ms >= budget_ms || interrupt()) + break; + } + slice.remaining = pending(); + return slice; + } + +private: + std::vector m_tasks; +}; + +}} // namespace Slic3r::GUI diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp index adda0edd74..fd5012b5ef 100644 --- a/src/slic3r/GUI/Preferences.cpp +++ b/src/slic3r/GUI/Preferences.cpp @@ -18,6 +18,7 @@ #include "NetworkTestDialog.hpp" #include "Widgets/StaticLine.hpp" #include "Widgets/RadioGroup.hpp" +#include "Shortcuts.hpp" #include "slic3r/Utils/bambu_networking.hpp" #include "slic3r/Utils/NetworkAgent.hpp" #include "NetworkPluginDialog.hpp" @@ -285,6 +286,7 @@ std::tuple PreferencesDialog::create_item_combobox_base( auto combobox = new ::ComboBox(m_parent, wxID_ANY, wxEmptyString, wxDefaultPosition, DESIGN_LARGE_COMBOBOX_SIZE, 0, nullptr, wxCB_READONLY); combobox->GetDropDown().SetUseContentWidth(true); combobox->SetToolTip(tip); + combobox->SetName(param); // select_tab() finds the row by this name std::vector::iterator iter; for (iter = vlist.begin(); iter != vlist.end(); iter++) { @@ -1042,8 +1044,8 @@ wxBoxSizer *PreferencesDialog::create_item_checkbox(wxString title, wxString too if (m_bambu_cloud_checkbox) m_bambu_cloud_checkbox->Enable(!enabled); } else if (param == "hide_login_side_panel") { - if (wxGetApp().mainframe && wxGetApp().mainframe->m_webview) { - wxGetApp().mainframe->m_webview->SendCloudProvidersInfo(); + if (WebViewPanel* home = WebViewPanel::if_built()) { + home->SendCloudProvidersInfo(); } } // ORCA: apply the preview dimming change immediately to the currently loaded preview @@ -1252,9 +1254,8 @@ wxBoxSizer *PreferencesDialog::create_item_bambu_cloud(wxString title, wxString app_config->save(); // Update homepage visibility immediately - auto *mainframe = wxGetApp().mainframe; - if (mainframe && mainframe->m_webview) - mainframe->m_webview->SendCloudProvidersInfo(); + if (WebViewPanel* home = WebViewPanel::if_built()) + home->SendCloudProvidersInfo(); }); m_sizer->Add(cb, 0, wxALIGN_CENTER); @@ -1522,6 +1523,19 @@ PreferencesDialog::~PreferencesDialog() { } +void PreferencesDialog::select_tab(PreferencesTab tab, const std::string& option) +{ + if (const auto index = m_tab_index.find(tab); index != m_tab_index.end()) + m_pref_tabs->SelectItem(index->second); + wxWindow* control = option.empty() ? nullptr : m_parent->FindWindow(wxString(option)); + if (control == nullptr) + return; + int unit = 1; + m_parent->GetScrollPixelsPerUnit(nullptr, &unit); + m_parent->Scroll(wxDefaultCoord, (m_parent->CalcUnscrolledPosition(control->GetPosition()).y - FromDIP(10)) / unit); + control->SetFocus(); // the focused tint marks the row +} + void PreferencesDialog::on_dpi_changed(const wxRect &suggested_rect) { m_pref_tabs->Rescale(); @@ -1599,7 +1613,7 @@ void PreferencesDialog::create_items() ////////////////////////// //// GENERAL TAB ///////////////////////////////////// - m_pref_tabs->AppendItem(_L("General")); + m_tab_index[PreferencesTab::General] = m_pref_tabs->AppendItem(_L("General")); f_sizers.push_back(new wxFlexGridSizer(1, 1, v_gap, 0)); g_sizer = f_sizers.back(); g_sizer->AddGrowableCol(0, 1); @@ -1730,8 +1744,8 @@ void PreferencesDialog::create_items() auto item_multi_machine = create_item_checkbox(_L("Multi device management"), _L("With this option enabled, you can send a task to multiple devices at the same time and manage multiple devices."), "enable_multi_machine", _L("(Requires restart)")); g_sizer->Add(item_multi_machine); - auto item_speed_dial = create_item_checkbox(_L("Open the Speed Dial with the Space key"), - _L("When enabled, pressing Space (with no other key held) opens the Speed Dial action search from any page."), + auto item_speed_dial = create_item_checkbox(_L("Open the Speed Dial from the keyboard"), + _L("When enabled, the Speed Dial keyboard shortcut (Space by default) opens the action search from any page."), "enable_speed_dial"); g_sizer->Add(item_speed_dial); @@ -1789,7 +1803,7 @@ void PreferencesDialog::create_items() ////////////////////////// //// CONTROL TAB ///////////////////////////////////// - m_pref_tabs->AppendItem(_L("Control")); + m_tab_index[PreferencesTab::Control] = m_pref_tabs->AppendItem(_L("Control")); f_sizers.push_back(new wxFlexGridSizer(1, 1, v_gap, 0)); g_sizer = f_sizers.back(); g_sizer->AddGrowableCol(0, 1); @@ -1859,6 +1873,14 @@ void PreferencesDialog::create_items() auto item_right_mouse_drag = create_item_combobox(_L("Right Mouse Drag"), _L("Set the action that dragging the right mouse button should perform."), "right_mouse_drag_action", ButtonDragActions); g_sizer->Add(item_right_mouse_drag); + //// CONTROL > Keyboard + g_sizer->Add(create_item_title(_L("Keyboard")), 1, wxEXPAND); + + auto item_shortcuts = create_item_button(_L("Keyboard shortcuts"), _L("Edit") + dots, "", _L("Choose the key for each action."), [this]() { + wxGetApp().keyboard_shortcuts(ShortcutContext::Global, this); + }); + g_sizer->Add(item_shortcuts); + //// CONTROL > Clear my choice on ... g_sizer->Add(create_item_title(_L("Clear my choice on...")), 1, wxEXPAND); @@ -1883,7 +1905,7 @@ void PreferencesDialog::create_items() ////////////////////////// //// GRAPHICS TAB ///////////////////////////////////// - m_pref_tabs->AppendItem(_L("Graphics")); + m_tab_index[PreferencesTab::Graphics] = m_pref_tabs->AppendItem(_L("Graphics")); f_sizers.push_back(new wxFlexGridSizer(1, 1, v_gap, 0)); g_sizer = f_sizers.back(); g_sizer->AddGrowableCol(0, 1); @@ -1909,6 +1931,15 @@ void PreferencesDialog::create_items() ); g_sizer->Add(item_realistic_phong); + auto item_realistic_preview = create_item_checkbox( + _L("Enable in Preview"), + _L("Also applies realistic view to the Preview canvas, not just Prepare.\n" + "Preview draws the full toolpath geometry, so shadows and SSAO cost considerably" + " more there than on a plain model."), + SETTING_OPENGL_REALISTIC_PREVIEW + ); + g_sizer->Add(item_realistic_preview); + auto item_realistic_ssao = create_item_checkbox( _L("SSAO ambient occlusion"), _L("Applies SSAO in realistic view."), @@ -1996,6 +2027,23 @@ void PreferencesDialog::create_items() //// GRAPHICS > G-code Preview g_sizer->Add(create_item_title(_L("G-code Preview")), 1, wxEXPAND); + // ORCA: view type the preview opens with + std::vector PreviewViewTypeLabels; + std::vector PreviewViewTypeValues; + for (const auto& [value, label] : GCodeViewer::default_view_type_choices()) { + PreviewViewTypeValues.push_back(value); + PreviewViewTypeLabels.push_back(from_u8(label)); + } + auto item_preview_view_type = create_item_combobox( + _L("Default view type"), + _L("The color scheme the sliced preview opens with.\n" + "Automatic: Filament for multi material prints, Line Type for single material ones.\n" + "Last used: the view type you selected last.\n" + "Any other value always opens that view type.\n" + "You can still switch the view type in the preview afterwards."), + "preview_default_view_type", PreviewViewTypeLabels, PreviewViewTypeValues); + g_sizer->Add(item_preview_view_type); + auto item_dim_previous_layers = create_item_checkbox( _L("Dim lower layers"), _L("When scrubbing the layer slider in the sliced preview, render the layers below the current one darkened so that only the layer being viewed is shown at full brightness."), @@ -2031,7 +2079,7 @@ void PreferencesDialog::create_items() ////////////////////////// //// ONLINE TAB ///////////////////////////////////// - m_pref_tabs->AppendItem(_L("Online")); + m_tab_index[PreferencesTab::Online] = m_pref_tabs->AppendItem(_L("Online")); f_sizers.push_back(new wxFlexGridSizer(1, 1, v_gap, 0)); g_sizer = f_sizers.back(); g_sizer->AddGrowableCol(0, 1); diff --git a/src/slic3r/GUI/Preferences.hpp b/src/slic3r/GUI/Preferences.hpp index 5ab7fb1919..e3b6ffdc7d 100644 --- a/src/slic3r/GUI/Preferences.hpp +++ b/src/slic3r/GUI/Preferences.hpp @@ -29,6 +29,9 @@ namespace Slic3r { namespace GUI { #define DESIGN_INPUT_SIZE wxSize(FromDIP(120), -1) #define DESIGN_LEFT_MARGIN 25 +// The tabs other dialogs open Preferences on. +enum class PreferencesTab { General, Control, Graphics, Online }; + class PreferencesDialog : public DPIDialog { private: @@ -38,6 +41,7 @@ protected: wxBoxSizer * m_sizer_body; wxScrolledWindow* m_parent; TabCtrl* m_pref_tabs; + std::map m_tab_index; // position of each tab in m_pref_tabs // bool m_settings_layout_changed {false}; bool m_seq_top_layer_only_changed{false}; @@ -60,6 +64,8 @@ public: ~PreferencesDialog(); + void select_tab(PreferencesTab tab, const std::string& option = {}); // and scrolls a combobox option's row into view, focused + wxString m_backup_interval_time; wxTimer m_filament_height_timer; diff --git a/src/slic3r/GUI/PrinterWebView.hpp b/src/slic3r/GUI/PrinterWebView.hpp index 8a62ce70a2..1ab1e17932 100644 --- a/src/slic3r/GUI/PrinterWebView.hpp +++ b/src/slic3r/GUI/PrinterWebView.hpp @@ -26,6 +26,7 @@ #include "wx/textctrl.h" #include #include +#include "Lazy.hpp" namespace Slic3r { @@ -34,7 +35,7 @@ namespace GUI { class PrinterWebViewHandler; -class PrinterWebView : public wxPanel { +class PrinterWebView : public wxPanel, public LazyInstance { public: PrinterWebView(wxWindow *parent); virtual ~PrinterWebView(); diff --git a/src/slic3r/GUI/Project.cpp b/src/slic3r/GUI/Project.cpp index 6d1eb0e180..8d87939afc 100644 --- a/src/slic3r/GUI/Project.cpp +++ b/src/slic3r/GUI/Project.cpp @@ -44,6 +44,7 @@ const std::vector license_list = { ProjectPanel::ProjectPanel(wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, long style) : wxPanel(parent, id, pos, size, style) { + SetBackgroundColour(*wxWHITE); m_project_home_url = wxString::Format("file://%s/web/model/index.html", from_u8(resources_dir())); wxString strlang = wxGetApp().current_language_code_safe(); if (strlang != "") @@ -67,6 +68,7 @@ ProjectPanel::ProjectPanel(wxWindow *parent, wxWindowID id, const wxPoint &pos, m_auxiliary = new AuxiliaryPanel(this); m_auxiliary->Hide(); main_sizer->Add(m_auxiliary, wxSizerFlags().Expand().Proportion(1)); + add_build_steps_of(*m_auxiliary); Bind(EVT_AUXILIARY_DONE, [this](wxCommandEvent& e) { update_model_data();}); SetSizer(main_sizer); diff --git a/src/slic3r/GUI/Project.hpp b/src/slic3r/GUI/Project.hpp index a590212cb7..a22bc44430 100644 --- a/src/slic3r/GUI/Project.hpp +++ b/src/slic3r/GUI/Project.hpp @@ -35,6 +35,7 @@ #include "libslic3r/ProjectTask.hpp" #include "wxExtensions.hpp" #include "Auxiliary.hpp" +#include "Lazy.hpp" #define AUFILE_GREY700 wxColour(107, 107, 107) #define AUFILE_GREY500 wxColour(158, 158, 158) @@ -59,7 +60,7 @@ struct project_file{ std::string size; }; -class ProjectPanel : public wxPanel +class ProjectPanel : public wxPanel, public StagedBuild, public LazyInstance { private: std::atomic m_web_init_completed{false}; @@ -90,7 +91,6 @@ public: void msw_rescale(); void update_model_data(); void clear_model_info(); - void init_auxiliary() { m_auxiliary->init_auxiliary(); } bool Show(bool show); void OnScriptMessage(wxWebViewEvent& evt); diff --git a/src/slic3r/GUI/ProjectDirtyStateManager.cpp b/src/slic3r/GUI/ProjectDirtyStateManager.cpp index c986328f71..53eb3cd353 100644 --- a/src/slic3r/GUI/ProjectDirtyStateManager.cpp +++ b/src/slic3r/GUI/ProjectDirtyStateManager.cpp @@ -6,6 +6,7 @@ #include "MainFrame.hpp" #include "I18N.hpp" #include "Plater.hpp" +#include "libslic3r/LifecycleEvents.hpp" #include @@ -17,13 +18,23 @@ namespace GUI { void ProjectDirtyStateManager::update_from_undo_redo_stack(bool dirty) { + const bool was_dirty = is_dirty(); m_plater_dirty = dirty; + notify_dirty_change(was_dirty, "undo_redo"); if (const Plater *plater = wxGetApp().plater(); plater && wxGetApp().initialized()) wxGetApp().mainframe->update_title(); } +void ProjectDirtyStateManager::set_plater_dirty(bool is_dirty) +{ + const bool was_dirty = this->is_dirty(); + m_plater_dirty = is_dirty; + notify_dirty_change(was_dirty, "plater"); +} + void ProjectDirtyStateManager::update_from_presets() { + const bool was_dirty = is_dirty(); m_presets_dirty = false; // check switching of the presets only for exist/loaded project, but not for new GUI_App &app = wxGetApp(); @@ -45,18 +56,53 @@ void ProjectDirtyStateManager::update_from_presets() } m_presets_dirty |= app.has_unsaved_preset_changes(); m_project_config_dirty = m_initial_project_config != app.preset_bundle->project_config; + notify_dirty_change(was_dirty, "presets"); app.mainframe->update_title(); } void ProjectDirtyStateManager::reset_after_save() { + const bool was_dirty = is_dirty(); this->reset_initial_presets(); m_plater_dirty = false; m_presets_dirty = false; m_project_config_dirty = false; + notify_dirty_change(was_dirty, "save"); wxGetApp().mainframe->update_title(); } +void ProjectDirtyStateManager::notify_dirty_change(bool was_dirty, const char *source) +{ + if (m_suppress_depth > 0) + return; + + const bool dirty = is_dirty(); + if (was_dirty == dirty) + return; + + LifecycleEventContext ctx; + ctx.code = LifecycleEvtCode::Ok; + ctx.dirty = dirty; + ctx.source = source; + fire_lifecycle_event(LifecycleEvent::ProjectDirtyChanged, ctx); +} + +void ProjectDirtyStateManager::begin_suppress_notifications() +{ + if (m_suppress_depth == 0) + m_suppress_entry_dirty = is_dirty(); + ++m_suppress_depth; +} + +void ProjectDirtyStateManager::end_suppress_notifications() +{ + assert(m_suppress_depth > 0); + if (m_suppress_depth > 0) + --m_suppress_depth; + if (m_suppress_depth == 0) + notify_dirty_change(m_suppress_entry_dirty, "batch"); +} + void ProjectDirtyStateManager::reset_initial_presets() { m_initial_presets.fill(std::string{}); @@ -168,4 +214,3 @@ void ProjectDirtyStateManager::render_debug_window() const } // namespace GUI } // namespace Slic3r - diff --git a/src/slic3r/GUI/ProjectDirtyStateManager.hpp b/src/slic3r/GUI/ProjectDirtyStateManager.hpp index 171d19e219..fd121d1d85 100644 --- a/src/slic3r/GUI/ProjectDirtyStateManager.hpp +++ b/src/slic3r/GUI/ProjectDirtyStateManager.hpp @@ -14,21 +14,42 @@ public: void reset_after_save(); void reset_initial_presets(); - void set_plater_dirty(bool is_dirty) { m_plater_dirty = is_dirty; } + void set_plater_dirty(bool is_dirty); bool is_dirty() const { return m_plater_dirty || m_project_config_dirty || m_presets_dirty; } bool is_presets_dirty() const { return m_presets_dirty; } + // RAII guard coalescing dirty-state updates: while any guard is alive, ProjectDirtyChanged + // notifications are held back; when the outermost guard is destroyed, at most one + // notification fires, reflecting only the net change across the whole guarded scope. + class NotificationSuppressor + { + public: + explicit NotificationSuppressor(ProjectDirtyStateManager &owner) : m_owner(owner) { m_owner.begin_suppress_notifications(); } + ~NotificationSuppressor() { m_owner.end_suppress_notifications(); } + NotificationSuppressor(const NotificationSuppressor &) = delete; + NotificationSuppressor &operator=(const NotificationSuppressor &) = delete; + private: + ProjectDirtyStateManager &m_owner; + }; + #if ENABLE_PROJECT_DIRTY_STATE_DEBUG_WINDOW void render_debug_window() const; #endif // ENABLE_PROJECT_DIRTY_STATE_DEBUG_WINDOW private: + void notify_dirty_change(bool was_dirty, const char *source); + void begin_suppress_notifications(); + void end_suppress_notifications(); + // Does the Undo / Redo stack indicate the project is dirty? bool m_plater_dirty { false }; // Do the presets indicate the project is dirty? bool m_presets_dirty { false }; // Is the project config dirty? bool m_project_config_dirty { false }; + // NotificationSuppressor nesting depth and the dirty state observed when the outermost guard began. + int m_suppress_depth { 0 }; + bool m_suppress_entry_dirty { false }; // Keeps track of preset names selected at the time of last project save. std::array m_initial_presets; DynamicPrintConfig m_initial_project_config; diff --git a/src/slic3r/GUI/SceneRaycaster.cpp b/src/slic3r/GUI/SceneRaycaster.cpp index 64a091211b..408e910ff8 100644 --- a/src/slic3r/GUI/SceneRaycaster.cpp +++ b/src/slic3r/GUI/SceneRaycaster.cpp @@ -99,8 +99,11 @@ void SceneRaycaster::remove_raycaster(std::shared_ptr item) } } -SceneRaycaster::HitResult SceneRaycaster::hit(const Vec2d& mouse_pos, const Camera& camera, const ClippingPlane* clipping_plane) const +SceneRaycaster::HitResult SceneRaycaster::hit(const Vec2d& mouse_pos, const Camera& camera, + const ClippingPlane* clipping_plane, SceneRaycaster::EHitMode mode) const { + // Orca: Picking may favor an already selected volume for interaction, while camera + // navigation must always use the geometrically closest visible scene surface. // helper class used to return currently selected volume as hit when overlapping with other volumes // to allow the user to click and drag on a selected volume class VolumeKeeper @@ -110,7 +113,11 @@ SceneRaycaster::HitResult SceneRaycaster::hit(const Vec2d& mouse_pos, const Came bool m_selected_volume_already_found{ false }; public: - VolumeKeeper() { + explicit VolumeKeeper(bool enabled) { + // Orca: Disable selected-volume bias for navigation raycasts. + if (!enabled) + return; + const Selection& selection = wxGetApp().plater()->get_selection(); if (selection.is_single_volume() || selection.is_single_modifier()) { const GLVolume* volume = selection.get_first_volume(); @@ -135,7 +142,7 @@ SceneRaycaster::HitResult SceneRaycaster::hit(const Vec2d& mouse_pos, const Came } }; - VolumeKeeper volume_keeper; + VolumeKeeper volume_keeper(mode == EHitMode::Picking); double closest_hit_squared_distance = std::numeric_limits::max(); auto is_closest = [&closest_hit_squared_distance, &volume_keeper](const Camera& camera, const Vec3f& hit) { @@ -154,7 +161,7 @@ SceneRaycaster::HitResult SceneRaycaster::hit(const Vec2d& mouse_pos, const Came HitResult ret; - auto test_raycasters = [this, is_closest, clipping_plane, &volume_keeper](EType type, const Vec2d& mouse_pos, const Camera& camera, HitResult& ret) { + auto test_raycasters = [this, is_closest, clipping_plane, mode, &volume_keeper](EType type, const Vec2d& mouse_pos, const Camera& camera, HitResult& ret) { const ClippingPlane* clip_plane = (clipping_plane != nullptr && type == EType::Volume) ? clipping_plane : nullptr; const std::vector>* raycasters = get_raycasters(type); const Vec3f camera_forward = camera.get_dir_forward().cast(); @@ -163,12 +170,22 @@ SceneRaycaster::HitResult SceneRaycaster::hit(const Vec2d& mouse_pos, const Came if (!item->is_active()) continue; + // Each plate's component 0 is its surface; the remaining Bed IDs are controls. + // Keep controls clickable, but do not use them as camera-pan anchors. + if (mode != EHitMode::Picking && type == EType::Bed && + decode_id(type, item->get_id()) % PartPlate::GRABBER_COUNT != 0) + continue; + current_hit.raycaster_id = item->get_id(); const Transform3d& trafo = item->get_transform(); if (item->get_raycaster()->closest_hit(mouse_pos, trafo, camera, current_hit.position, current_hit.normal, clip_plane)) { current_hit.position = (trafo * current_hit.position.cast()).cast(); current_hit.normal = (trafo.matrix().block(0, 0, 3, 3).inverse().transpose() * current_hit.normal.cast()).normalized().cast(); - if (item->use_back_faces() || current_hit.normal.dot(camera_forward) < 0.0f) { + // Orca: Perspective rays away from the viewport center are not parallel to camera_forward. + // Keep picking's legacy policy, but accept every front-facing navigation surface. + const Vec3f view_direction = mode != EHitMode::Picking && camera.get_type() == Camera::EType::Perspective ? + Vec3f((current_hit.position.cast() - camera.get_position()).cast()) : camera_forward; + if (item->use_back_faces() || current_hit.normal.dot(view_direction) < 0.0f) { if (is_closest(camera, current_hit.position)) { if (volume_keeper.is_active()) { if (volume_keeper.check_hit_result(current_hit)) @@ -182,14 +199,18 @@ SceneRaycaster::HitResult SceneRaycaster::hit(const Vec2d& mouse_pos, const Came } }; - if (!m_gizmos.empty()) - test_raycasters(EType::Gizmo, mouse_pos, camera, ret); + // Orca: Gizmo geometry is an interaction target, not a valid depth anchor for camera movement. + if (mode == EHitMode::Picking) { + if (!m_gizmos.empty()) + test_raycasters(EType::Gizmo, mouse_pos, camera, ret); - if (!m_fallback_gizmos.empty() && !ret.is_valid()) - test_raycasters(EType::FallbackGizmo, mouse_pos, camera, ret); + if (!m_fallback_gizmos.empty() && !ret.is_valid()) + test_raycasters(EType::FallbackGizmo, mouse_pos, camera, ret); + } if (!m_gizmos_on_top || !ret.is_valid()) { - if (camera.is_looking_downward() && !m_bed.empty()) + // Orca: In perspective the bottom of the viewport can see the bed even at a horizontal view. + if ((mode == EHitMode::SceneOnly || (mode == EHitMode::Picking && camera.is_looking_downward())) && !m_bed.empty()) test_raycasters(EType::Bed, mouse_pos, camera, ret); if (!m_volumes.empty()) test_raycasters(EType::Volume, mouse_pos, camera, ret); diff --git a/src/slic3r/GUI/SceneRaycaster.hpp b/src/slic3r/GUI/SceneRaycaster.hpp index 99152712dd..9aa527abee 100644 --- a/src/slic3r/GUI/SceneRaycaster.hpp +++ b/src/slic3r/GUI/SceneRaycaster.hpp @@ -57,6 +57,15 @@ public: FallbackGizmo = 2000000 }; + // Orca: Navigation needs the closest visible scene surface, without picking-specific + // gizmo and selected-volume priority. + enum class EHitMode : unsigned char + { + Picking, + SceneOnly, + VolumesOnly // Navigation when the bed is hidden. + }; + struct HitResult { EType type{ EType::None }; @@ -97,7 +106,8 @@ public: void set_gizmos_on_top(bool value) { m_gizmos_on_top = value; } - HitResult hit(const Vec2d& mouse_pos, const Camera& camera, const ClippingPlane* clipping_plane = nullptr) const; + HitResult hit(const Vec2d& mouse_pos, const Camera& camera, const ClippingPlane* clipping_plane = nullptr, + EHitMode mode = EHitMode::Picking) const; #if ENABLE_RAYCAST_PICKING_DEBUG void render_hit(const Camera& camera); diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 629aef7296..a9767d6c72 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -3470,7 +3470,7 @@ void SelectMachineDialog::navigate_to_timelapse_page() main_frame->jump_to_monitor(); // then switch to Storage (Media) tab inside Monitor - auto* monitor = dynamic_cast(main_frame->m_monitor); + MonitorPanel* monitor = MonitorPanel::if_built(); if (monitor) { auto* tabpanel = monitor->get_tabpanel(); if (tabpanel) { diff --git a/src/slic3r/GUI/Shortcuts.cpp b/src/slic3r/GUI/Shortcuts.cpp new file mode 100644 index 0000000000..0bcf0ccef9 --- /dev/null +++ b/src/slic3r/GUI/Shortcuts.cpp @@ -0,0 +1,377 @@ +#include "Shortcuts.hpp" + +#include "I18N.hpp" +#include "libslic3r/AppConfig.hpp" + +#include +#include +#include + +namespace Slic3r { namespace GUI { + +namespace { + +constexpr uint8_t GLOBAL = context_bit(ShortcutContext::Global); +constexpr uint8_t PLATER = context_bit(ShortcutContext::Plater); +constexpr uint8_t PREVIEW = context_bit(ShortcutContext::Preview); +constexpr uint8_t OBJECT_LIST = context_bit(ShortcutContext::ObjectList); +constexpr uint8_t PAINTING = context_bit(ShortcutContext::Painting); +constexpr uint8_t CANVAS = PLATER | PREVIEW; + +constexpr int CTRL = wxMOD_CONTROL; +constexpr int SHIFT = wxMOD_SHIFT; +constexpr int CTRL_SHIFT = wxMOD_CONTROL | wxMOD_SHIFT; + +#ifdef __APPLE__ +constexpr KeyChord PREFERENCES_CHORD{ ',', CTRL }; +constexpr KeyChord DELETE_CHORD{ WXK_BACK }; +constexpr KeyChord MOUSE3D_CHORD{ 'M', CTRL_SHIFT }; +#else +constexpr KeyChord PREFERENCES_CHORD{ 'P', CTRL }; +constexpr KeyChord DELETE_CHORD{ WXK_DELETE }; +constexpr KeyChord MOUSE3D_CHORD{ 'M', CTRL }; +#endif + +// Each row: enum value, AppConfig key, description shown in the dialog, contexts the key is +// looked up in, and the default chord. Rows are in the order the dialog lists them, within +// the sections of the Shortcut enum. +// SHORTCUT runs once per key press. +// REPEATING runs again on every auto-repeat of a held key. +// STEPPING repeats, and Shift or Ctrl held with its key select a step variant of it instead +// of another shortcut (ShortcutInfo::modifier_variants). +#define SHORTCUT(id, key, name, contexts, ...) ShortcutInfo{ Shortcut::id, key, name, contexts, __VA_ARGS__, false, false } +#define REPEATING(id, key, name, contexts, ...) ShortcutInfo{ Shortcut::id, key, name, contexts, __VA_ARGS__, true, false } +#define STEPPING(id, key, name, contexts, ...) ShortcutInfo{ Shortcut::id, key, name, contexts, __VA_ARGS__, true, true } + +constexpr std::array shortcut_table = {{ + // Project + SHORTCUT(NewProject, "new_project", L("New Project"), GLOBAL, { 'N', CTRL }), + SHORTCUT(OpenProject, "open_project", L("Open Project"), GLOBAL, { 'O', CTRL }), + SHORTCUT(SaveProject, "save_project", L("Save Project"), GLOBAL, { 'S', CTRL }), + SHORTCUT(SaveProjectAs, "save_project_as", L("Save Project as"), GLOBAL, { 'S', CTRL_SHIFT }), + SHORTCUT(ImportModel, "import_model", L("Import geometry data from STL/STEP/3MF/OBJ/AMF files"), GLOBAL, { 'I', CTRL }), + SHORTCUT(Publish3mf, "publish_3mf", L("Publish 3MF"), GLOBAL, { 'E', CTRL_SHIFT }), + + // Slicing and printing + SHORTCUT(SlicePlate, "slice_plate", L("Slice plate"), GLOBAL, { 'R', CTRL }), + SHORTCUT(ExportSlicedFile, "export_sliced_file", L("Export plate sliced file"), GLOBAL, { 'G', CTRL }), + SHORTCUT(PrintPlate, "print_plate", L("Print plate"), GLOBAL, { 'G', CTRL_SHIFT }), + SHORTCUT(PrintHostQueue, "print_host_queue", L("Print host upload queue"), GLOBAL, { 'J', CTRL }), + + // Selection + SHORTCUT(SelectAll, "select_all", L("Select all objects"), PLATER | OBJECT_LIST, { 'A', CTRL }), + SHORTCUT(SelectAllPlates, "select_all_plates", L("Select all objects on all plates"), PLATER, { 'A', CTRL_SHIFT }), + + // Editing + REPEATING(Undo, "undo", L("Undo"), PLATER | OBJECT_LIST, { 'Z', CTRL }), + REPEATING(Redo, "redo", L("Redo"), PLATER | OBJECT_LIST, { 'Y', CTRL }), + SHORTCUT(Cut, "cut", L("Cut"), PLATER | OBJECT_LIST, { 'X', CTRL }), + SHORTCUT(Copy, "copy", L("Copy to clipboard"), PLATER | OBJECT_LIST, { 'C', CTRL }), + SHORTCUT(Paste, "paste", L("Paste from clipboard"), PLATER | OBJECT_LIST, { 'V', CTRL }), + SHORTCUT(DeleteSelected, "delete_selected", L("Delete Selected"), PLATER | OBJECT_LIST, DELETE_CHORD), + SHORTCUT(DeleteAll, "delete_all", L("Delete All"), PLATER, { 'D', CTRL }), + SHORTCUT(CloneSelected, "clone_selected", L("Clone Selected"), PLATER | OBJECT_LIST, { 'K', CTRL }), + + // Objects + REPEATING(AddInstance, "add_instance", L("Add instance"), PLATER | OBJECT_LIST, { '+' }), + REPEATING(RemoveInstance, "remove_instance", L("Remove instance"), PLATER | OBJECT_LIST, { '-' }), + SHORTCUT(TogglePrintable, "toggle_printable", L("Toggle printable for object/part"), PLATER | OBJECT_LIST, { 'V' }), + SHORTCUT(ToggleAutoDrop, "toggle_auto_drop", L("Auto Drop"), OBJECT_LIST, { 'D' }), + + // Placement + SHORTCUT(Arrange, "arrange", L("Arrange all objects"), PLATER, { 'A' }), + SHORTCUT(ArrangePlate, "arrange_plate", L("Arrange objects on selected plates"), PLATER, { 'A', SHIFT }), + SHORTCUT(Orient, "orient", L("Auto orient all/selected objects"), PLATER, { 'Q' }), + SHORTCUT(OrientPlate, "orient_plate", L("Auto orient all objects on current plate"), PLATER, { 'Q', SHIFT }), + STEPPING(MoveSelectionLeft, "move_selection_left", L("Move selection 10mm in negative X direction"), PLATER, { WXK_LEFT }), + STEPPING(MoveSelectionRight, "move_selection_right", L("Move selection 10mm in positive X direction"), PLATER, { WXK_RIGHT }), + STEPPING(MoveSelectionUp, "move_selection_up", L("Move selection 10mm in positive Y direction"), PLATER, { WXK_UP }), + STEPPING(MoveSelectionDown, "move_selection_down", L("Move selection 10mm in negative Y direction"), PLATER, { WXK_DOWN }), + REPEATING(RotateSelectionLeft, "rotate_selection_left", L("Rotate selection 45 degrees counterclockwise"), PLATER, { WXK_PAGEUP }), + REPEATING(RotateSelectionRight, "rotate_selection_right", L("Rotate selection 45 degrees clockwise"), PLATER, { WXK_PAGEDOWN }), + + // Gizmos + SHORTCUT(GizmoMove, "gizmo_move", L("Gizmo move"), PLATER, { 'M' }), + SHORTCUT(GizmoRotate, "gizmo_rotate", L("Gizmo rotate"), PLATER, { 'R' }), + SHORTCUT(GizmoScale, "gizmo_scale", L("Gizmo scale"), PLATER, { 'S' }), + SHORTCUT(GizmoFlatten, "gizmo_flatten", L("Gizmo place face on bed"), PLATER, { 'F' }), + SHORTCUT(GizmoCut, "gizmo_cut", L("Gizmo cut"), PLATER, { 'C' }), + SHORTCUT(GizmoMeshBoolean, "gizmo_mesh_boolean", L("Gizmo mesh boolean"), PLATER, { 'B' }), + SHORTCUT(GizmoFdmSupports, "gizmo_fdm_supports", L("Gizmo FDM paint-on supports"), PLATER, { 'L' }), + SHORTCUT(GizmoSeam, "gizmo_seam", L("Gizmo FDM paint-on seam"), PLATER, { 'P' }), + SHORTCUT(GizmoFuzzySkin, "gizmo_fuzzy_skin", L("Gizmo FDM paint-on fuzzy skin"), PLATER, { 'H' }), + SHORTCUT(GizmoMmuSegmentation, "gizmo_mmu_segmentation", L("Gizmo multi-material painting"), PLATER, { 'N' }), + SHORTCUT(GizmoEmboss, "gizmo_emboss", L("Gizmo text emboss/engrave"), PLATER, { 'T' }), + SHORTCUT(GizmoMeasure, "gizmo_measure", L("Gizmo measure"), PLATER, { 'U' }), + SHORTCUT(GizmoAssembly, "gizmo_assembly", L("Gizmo assemble"), PLATER, { 'Y' }), + SHORTCUT(GizmoBrimEars, "gizmo_brim_ears", L("Gizmo brim ears"), PLATER, { 'E' }), + + // Sliders + SHORTCUT(GoToLayer, "go_to_layer", L("Jump to layer"), PREVIEW, { 'G', SHIFT }), + STEPPING(LayerSliderUp, "layer_slider_up", L("Vertical slider - Move active thumb Up"), PREVIEW, { WXK_UP }), + STEPPING(LayerSliderDown, "layer_slider_down", L("Vertical slider - Move active thumb Down"), PREVIEW, { WXK_DOWN }), + STEPPING(MovesSliderLeft, "moves_slider_left", L("Horizontal slider - Move active thumb Left"), PREVIEW, { WXK_LEFT }), + STEPPING(MovesSliderRight, "moves_slider_right", L("Horizontal slider - Move active thumb Right"), PREVIEW, { WXK_RIGHT }), + REPEATING(MovesSliderStart, "moves_slider_start", L("Horizontal slider - Move to start position"), PREVIEW, { WXK_HOME }), + REPEATING(MovesSliderEnd, "moves_slider_end", L("Horizontal slider - Move to last position"), PREVIEW, { WXK_END }), + + // Painting tools + SHORTCUT(PaintToolCircle, "paint_tool_circle", L("Circle"), PAINTING, { 'C' }), + SHORTCUT(PaintToolSphere, "paint_tool_sphere", L("Sphere"), PAINTING, { 'S' }), + SHORTCUT(PaintToolFill, "paint_tool_fill", L("Fill"), PAINTING, { 'F' }), + SHORTCUT(PaintToolGapFill, "paint_tool_gap_fill", L("Gap Fill"), PAINTING, { 'G' }), + SHORTCUT(PaintToolTriangle, "paint_tool_triangle", L("Triangle"), PAINTING, { 'T' }), + SHORTCUT(PaintToolHeightRange, "paint_tool_height_range", L("Height Range"), PAINTING, { 'H' }), + + // Camera + SHORTCUT(ViewDefault, "view_default", L("Camera view - Default"), GLOBAL, { '0', CTRL }), + SHORTCUT(ViewTop, "view_top", L("Camera view - Top"), GLOBAL, { '1', CTRL }), + SHORTCUT(ViewBottom, "view_bottom", L("Camera view - Bottom"), GLOBAL, { '2', CTRL }), + SHORTCUT(ViewFront, "view_front", L("Camera view - Front"), GLOBAL, { '3', CTRL }), + SHORTCUT(ViewRear, "view_rear", L("Camera view - Behind"), GLOBAL, { '4', CTRL }), + SHORTCUT(ViewLeft, "view_left", L("Camera Angle - Left side"), GLOBAL, { '5', CTRL }), + SHORTCUT(ViewRight, "view_right", L("Camera Angle - Right side"), GLOBAL, { '6', CTRL }), + SHORTCUT(ViewPlate, "view_plate", L("Camera view - Current plate"), GLOBAL, { '7', CTRL }), + REPEATING(ZoomIn, "zoom_in", L("Zoom in"), CANVAS, { 'I' }), + REPEATING(ZoomOut, "zoom_out", L("Zoom out"), CANVAS, { 'O' }), + SHORTCUT(Mouse3DSettings, "mouse3d_settings", L("Show/Hide 3Dconnexion devices settings dialog"), CANVAS, MOUSE3D_CHORD), + + // Display + SHORTCUT(ShowLabels, "show_labels", L("Show object labels in 3D scene."), GLOBAL, { 'E', CTRL }), + SHORTCUT(ShowWireframe, "show_wireframe", L("Show/Hide wireframe"), CANVAS, { WXK_RETURN, CTRL_SHIFT }), + SHORTCUT(ToggleGcodeWindow, "toggle_gcode_window", L("On/Off G-code window"), PREVIEW, { 'C' }), + SHORTCUT(ToggleOneLayerMode, "toggle_one_layer_mode", L("On/Off one layer mode of the vertical slider"), PREVIEW, { 'L' }), + + // Application + SHORTCUT(Preferences, "preferences", L("Preferences"), GLOBAL, PREFERENCES_CHORD), + SHORTCUT(Search, "search", L("Search"), GLOBAL, { 'F', CTRL }), + SHORTCUT(SwitchView, "switch_view", L("Switch between Prepare/Preview"), CANVAS, { WXK_TAB }), + SHORTCUT(CollapseSidebar, "collapse_sidebar", L("Collapse/Expand the sidebar"), CANVAS, { WXK_TAB, SHIFT }), + SHORTCUT(SpeedDial, "speed_dial", L("Open the speed dial"), GLOBAL, { WXK_SPACE }), + SHORTCUT(ReloadDevicePage, "reload_device_page", L("Reload the device page"), CANVAS, { WXK_F5 }), + SHORTCUT(KeyboardShortcuts, "keyboard_shortcuts", L("Show keyboard shortcuts list"), CANVAS, { '?' }), +}}; + +#undef SHORTCUT +#undef REPEATING +#undef STEPPING + +// The first shortcut of each section's run in shortcut_table and the section's heading, indexed +// by ShortcutSection. +struct SectionInfo +{ + Shortcut first; + const char* name; +}; + +constexpr std::array section_table = {{ + { Shortcut::NewProject, L("Project") }, + { Shortcut::SlicePlate, L("Slicing and printing") }, + { Shortcut::SelectAll, L("Selection") }, + { Shortcut::Undo, L("Editing") }, + { Shortcut::AddInstance, L("Objects") }, + { Shortcut::Arrange, L("Placement") }, + { Shortcut::GizmoMove, L("Gizmos") }, + { Shortcut::GoToLayer, L("Sliders") }, + { Shortcut::PaintToolCircle, L("Painting tools") }, + { Shortcut::ViewDefault, L("Camera") }, + { Shortcut::ShowLabels, L("Display") }, + { Shortcut::Preferences, L("Application") }, +}}; + +constexpr bool sections_follow_table_order() +{ + if (section_table.front().first != Shortcut(0)) + return false; + for (size_t i = 1; i < section_table.size(); ++i) + if (section_table[i].first <= section_table[i - 1].first) + return false; + return true; +} +static_assert(sections_follow_table_order(), "section_table must begin at the first shortcut and ascend"); + +constexpr bool table_is_in_enum_order() +{ + for (size_t i = 0; i < shortcut_table.size(); ++i) + if (shortcut_table[i].id != Shortcut(i)) + return false; + return true; +} +static_assert(table_is_in_enum_order(), "shortcut_table must list every Shortcut in declaration order"); + +const char* CONFIG_SECTION = "shortcuts"; +const char* UNBOUND = "none"; + +bool share_context(uint8_t a, uint8_t b) { return (a & b) != 0 || (a & GLOBAL) != 0 || (b & GLOBAL) != 0; } + +// The modifiers a modifier_variants shortcut accepts on top of its binding. +constexpr int STEP_MODIFIERS = wxMOD_SHIFT | wxMOD_CONTROL; + +// The step modifiers chord adds to binding, 0 when chord is not a step of it; a binding with +// Shift or Ctrl of its own has no steps, so no two bindings share one. +int step_modifiers(const KeyChord& chord, const KeyChord& binding) +{ + if (!binding.valid() || (binding.modifiers & STEP_MODIFIERS) != 0 || chord.key != binding.key || + (chord.modifiers & ~STEP_MODIFIERS) != binding.modifiers) + return 0; + return chord.modifiers & STEP_MODIFIERS; +} + +} // namespace + +const ShortcutInfo& shortcut_info(Shortcut shortcut) { return shortcut_table[size_t(shortcut)]; } + +ShortcutSection shortcut_section(Shortcut shortcut) +{ + size_t section = 0; + for (size_t i = 1; i < section_table.size(); ++i) + if (section_table[i].first <= shortcut) + section = i; + return ShortcutSection(section); +} + +const char* section_name(ShortcutSection section) { return section_table[size_t(section)].name; } + +std::vector shortcuts_in(ShortcutContext context) +{ + std::vector out; + for (const ShortcutInfo& info : shortcut_table) + if (info.contexts & context_bit(context)) + out.push_back(info.id); + return out; +} + +ShortcutRegistry::ShortcutRegistry() { rebuild_index(); } + +KeyChord ShortcutRegistry::binding(Shortcut shortcut) const +{ + const std::optional& override = m_overrides[size_t(shortcut)]; + return override.has_value() ? *override : shortcut_info(shortcut).default_chord; +} + +bool ShortcutRegistry::is_customized(Shortcut shortcut) const { return m_overrides[size_t(shortcut)].has_value(); } + +std::string ShortcutRegistry::display(Shortcut shortcut) const { return binding(shortcut).display(); } + +std::string ShortcutRegistry::with_key(const std::string& text, Shortcut shortcut) const +{ + const std::string key = display(shortcut); + return key.empty() ? text : text + " [" + key + "]"; +} + +std::string ShortcutRegistry::accelerator(Shortcut shortcut) const +{ + const KeyChord chord = binding(shortcut); + return chord.is_menu_accelerator() ? chord.to_string() : std::string(); +} + +std::optional ShortcutRegistry::lookup(ShortcutContext context, const KeyChord& chord) const +{ + if (!chord.valid()) + return std::nullopt; + auto it = m_index.find(chord); + if (it == m_index.end()) + return std::nullopt; + for (Shortcut shortcut : it->second) + if (shortcut_info(shortcut).contexts & context_bit(context)) + return shortcut; + return std::nullopt; +} + +std::optional ShortcutRegistry::match(ShortcutContext context, const KeyChord& chord) const +{ + if (const std::optional exact = lookup(context, chord); exact.has_value()) + return Match{ *exact, 0 }; + if ((chord.modifiers & STEP_MODIFIERS) == 0) + return std::nullopt; + for (const ShortcutInfo& info : shortcut_table) + if (info.modifier_variants && (info.contexts & context_bit(context))) + if (const int step = step_modifiers(chord, binding(info.id)); step != 0) + return Match{ info.id, step }; + return std::nullopt; +} + +std::vector ShortcutRegistry::conflicts(Shortcut shortcut, const KeyChord& chord) const +{ + std::vector out; + if (!chord.valid()) + return out; + const uint8_t contexts = shortcut_info(shortcut).contexts; + for (const ShortcutInfo& other : shortcut_table) + if (other.id != shortcut && share_context(contexts, other.contexts) && binding(other.id) == chord) + out.push_back(other.id); + return out; +} + +std::optional ShortcutRegistry::step_owner(Shortcut shortcut, const KeyChord& chord) const +{ + const uint8_t contexts = shortcut_info(shortcut).contexts; + for (const ShortcutInfo& other : shortcut_table) + if (other.modifier_variants && other.id != shortcut && share_context(contexts, other.contexts)) + if (const int step = step_modifiers(chord, binding(other.id)); step == wxMOD_SHIFT || step == wxMOD_CONTROL) // the combined step stays assignable + return other.id; + return std::nullopt; +} + +void ShortcutRegistry::bind(Shortcut shortcut, const KeyChord& chord) +{ + const ShortcutInfo& info = shortcut_info(shortcut); + if (chord == info.default_chord) + m_overrides[size_t(shortcut)].reset(); + else + m_overrides[size_t(shortcut)] = chord; + rebuild_index(); +} + +void ShortcutRegistry::reset(Shortcut shortcut) +{ + m_overrides[size_t(shortcut)].reset(); + rebuild_index(); +} + +void ShortcutRegistry::reset_all() +{ + m_overrides.fill(std::nullopt); + rebuild_index(); +} + +void ShortcutRegistry::load(const AppConfig& config) +{ + m_overrides.fill(std::nullopt); + if (config.has_section(CONFIG_SECTION)) { + const std::map& section = config.get_section(CONFIG_SECTION); + for (const ShortcutInfo& info : shortcut_table) { + auto it = section.find(info.key); + if (it == section.end()) + continue; + if (it->second == UNBOUND) + m_overrides[size_t(info.id)] = KeyChord{}; + else if (std::optional chord = KeyChord::parse(it->second); chord.has_value()) + // A Global chord is seen before any text field, so it needs a modifier or a non-typing key. + if ((info.contexts & GLOBAL) == 0 || chord->is_menu_accelerator()) + m_overrides[size_t(info.id)] = *chord; + } + } + rebuild_index(); +} + +void ShortcutRegistry::save(AppConfig& config) const +{ + for (const ShortcutInfo& info : shortcut_table) { + const std::optional& override = m_overrides[size_t(info.id)]; + if (override.has_value()) + config.set(CONFIG_SECTION, info.key, override->valid() ? override->to_string() : UNBOUND); + else + config.erase(CONFIG_SECTION, info.key); + } +} + +void ShortcutRegistry::rebuild_index() +{ + m_index.clear(); + for (const ShortcutInfo& info : shortcut_table) + if (const KeyChord chord = binding(info.id); chord.valid()) + m_index[chord].push_back(info.id); +} + +}} // namespace Slic3r::GUI diff --git a/src/slic3r/GUI/Shortcuts.hpp b/src/slic3r/GUI/Shortcuts.hpp new file mode 100644 index 0000000000..ba002556ca --- /dev/null +++ b/src/slic3r/GUI/Shortcuts.hpp @@ -0,0 +1,127 @@ +#pragma once + +#include "KeyChord.hpp" + +#include +#include +#include +#include +#include +#include + +namespace Slic3r { + +class AppConfig; + +namespace GUI { + +// Where a key press is looked up. A shortcut may belong to several contexts; Global ones are +// dispatched by the main frame before any child window sees the key. +enum class ShortcutContext : uint8_t { Global, Plater, Preview, ObjectList, Painting, Count }; + +constexpr uint8_t context_bit(ShortcutContext context) { return uint8_t(1u << unsigned(context)); } + +enum class Shortcut : uint8_t { + // Project + NewProject, OpenProject, SaveProject, SaveProjectAs, ImportModel, Publish3mf, + // Slicing and printing + SlicePlate, ExportSlicedFile, PrintPlate, PrintHostQueue, + // Selection + SelectAll, SelectAllPlates, + // Editing + Undo, Redo, Cut, Copy, Paste, DeleteSelected, DeleteAll, CloneSelected, + // Objects + AddInstance, RemoveInstance, TogglePrintable, ToggleAutoDrop, + // Placement + Arrange, ArrangePlate, Orient, OrientPlate, + MoveSelectionLeft, MoveSelectionRight, MoveSelectionUp, MoveSelectionDown, RotateSelectionLeft, RotateSelectionRight, + // Gizmos + GizmoMove, GizmoRotate, GizmoScale, GizmoFlatten, GizmoCut, GizmoMeshBoolean, GizmoFdmSupports, GizmoSeam, GizmoFuzzySkin, + GizmoMmuSegmentation, GizmoEmboss, GizmoMeasure, GizmoAssembly, GizmoBrimEars, + // Sliders + GoToLayer, LayerSliderUp, LayerSliderDown, MovesSliderLeft, MovesSliderRight, MovesSliderStart, MovesSliderEnd, + // Painting tools + PaintToolCircle, PaintToolSphere, PaintToolFill, PaintToolGapFill, PaintToolTriangle, PaintToolHeightRange, + // Camera + ViewDefault, ViewTop, ViewBottom, ViewFront, ViewRear, ViewLeft, ViewRight, ViewPlate, ZoomIn, ZoomOut, Mouse3DSettings, + // Display + ShowLabels, ShowWireframe, ToggleGcodeWindow, ToggleOneLayerMode, + // Application + Preferences, Search, SwitchView, CollapseSidebar, SpeedDial, ReloadDevicePage, KeyboardShortcuts, + Count +}; + +struct ShortcutInfo +{ + Shortcut id; + const char* key; // AppConfig key + const char* name; // untranslated description + uint8_t contexts; // context_bit() mask + KeyChord default_chord; + bool repeatable; // runs on key auto-repeat as well + // Shift or Ctrl held with the bound key select a variant of this action, such as the finer + // move step or the faster slider step. + bool modifier_variants; +}; + +// Headings of the shortcuts dialog, in listing order. +enum class ShortcutSection : uint8_t { + Project, SlicingAndPrinting, Selection, Editing, Objects, Placement, Gizmos, Sliders, PaintingTools, Camera, Display, Application, + Count +}; + +const ShortcutInfo& shortcut_info(Shortcut shortcut); +ShortcutSection shortcut_section(Shortcut shortcut); +const char* section_name(ShortcutSection section); // untranslated heading +std::vector shortcuts_in(ShortcutContext context); // in table order + +// Effective key bindings: the built-in defaults overlaid with the user's own. Owns the +// chord -> shortcut index every dispatcher queries. +class ShortcutRegistry +{ +public: + ShortcutRegistry(); + + KeyChord binding(Shortcut shortcut) const; // invalid when unbound + bool is_customized(Shortcut shortcut) const; + + std::string display(Shortcut shortcut) const; // "Ctrl+N" for tooltips and the shortcuts dialog + std::string with_key(const std::string& text, Shortcut shortcut) const; // "text [Ctrl+N]", or text alone when unbound + std::string accelerator(Shortcut shortcut) const; // wx accelerator text for menu labels; empty when unbound or not menu-safe + + // Matches a key event in one context. Global shortcuts are only found through the Global context. + std::optional lookup(ShortcutContext context, const KeyChord& chord) const; + + // lookup(), then the modifier_variants shortcuts, which also match with Shift or Ctrl added + // to their binding; step_modifiers holds whichever of the two were added. + struct Match + { + Shortcut shortcut; + int step_modifiers; + }; + std::optional match(ShortcutContext context, const KeyChord& chord) const; + + // Shortcuts other than shortcut bound to chord in a context it shares; Global shortcuts + // share every context. + std::vector conflicts(Shortcut shortcut, const KeyChord& chord) const; + + // The modifier_variants shortcut in a shared context whose Shift or Ctrl step is chord; + // such a chord is reserved for that step. + std::optional step_owner(Shortcut shortcut, const KeyChord& chord) const; + + void bind(Shortcut shortcut, const KeyChord& chord); // an invalid chord unbinds + void reset(Shortcut shortcut); + void reset_all(); + + void load(const AppConfig& config); + void save(AppConfig& config) const; + +private: + void rebuild_index(); + + std::array, size_t(Shortcut::Count)> m_overrides; + std::unordered_map, KeyChordHash> m_index; +}; + +} // namespace GUI +} // namespace Slic3r diff --git a/src/slic3r/GUI/StagedBuild.hpp b/src/slic3r/GUI/StagedBuild.hpp new file mode 100644 index 0000000000..8f4c0454c3 --- /dev/null +++ b/src/slic3r/GUI/StagedBuild.hpp @@ -0,0 +1,60 @@ +#pragma once + +#include +#include +#include + +namespace Slic3r { namespace GUI { + +// A panel whose constructor builds the skeleton and queues the rest as steps, run in order +// on the main thread, one at a time. +class StagedBuild +{ +public: + virtual ~StagedBuild() = default; + + bool built() const + { + return m_next_step == m_steps.size() && + std::all_of(m_children.begin(), m_children.end(), [](const StagedBuild* child) { return child->built(); }); + } + + // Runs one step and returns true while more remain. Own steps first, then whatever a + // child queued after its steps were forwarded. + bool build_step() + { + if (m_next_step < m_steps.size()) { + // Copied out, since a step may queue more steps and reallocate m_steps. + auto step = std::move(m_steps[m_next_step++]); + step(); + } else if (StagedBuild* child = unfinished_child()) { + child->build_step(); + } + return !built(); + } + +protected: + void add_build_step(std::function step) { m_steps.push_back(std::move(step)); } + + // Queues one step per step the child has now, and keeps the child so that built() waits + // for any it queues later. + void add_build_steps_of(StagedBuild& child) + { + m_children.push_back(&child); + for (size_t i = child.m_next_step; i < child.m_steps.size(); ++i) + add_build_step([&child] { child.build_step(); }); + } + +private: + StagedBuild* unfinished_child() const + { + auto it = std::find_if(m_children.begin(), m_children.end(), [](const StagedBuild* child) { return !child->built(); }); + return it == m_children.end() ? nullptr : *it; + } + + std::vector> m_steps; + std::vector m_children; + size_t m_next_step{ 0 }; +}; + +}} // namespace Slic3r::GUI diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index fb0029edc3..218371f0b5 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -1328,18 +1328,21 @@ StatusBasePanel::StatusBasePanel(wxWindow *parent, wxWindowID id, const wxPoint wxBoxSizer *bSizer_left = new wxBoxSizer(wxVERTICAL); - auto m_monitoring_sizer = create_monitoring_page(); - bSizer_left->Add(m_monitoring_sizer, 1, wxEXPAND | wxALL, 0); + // The sizers are nested here so each step only appends to its own. + add_build_step([this, bSizer_left] { + auto m_monitoring_sizer = create_monitoring_page(); + bSizer_left->Add(m_monitoring_sizer, 1, wxEXPAND | wxALL, 0); - auto m_panel_separotor1 = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); - m_panel_separotor1->SetBackgroundColour(STATUS_PANEL_BG); - m_panel_separotor1->SetMinSize(wxSize(-1, PAGE_SPACING)); - m_panel_separotor1->SetMaxSize(wxSize(-1, PAGE_SPACING)); - m_monitoring_sizer->Add(m_panel_separotor1, 0, wxEXPAND, 0); + auto m_panel_separotor1 = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); + m_panel_separotor1->SetBackgroundColour(STATUS_PANEL_BG); + m_panel_separotor1->SetMinSize(wxSize(-1, PAGE_SPACING)); + m_panel_separotor1->SetMaxSize(wxSize(-1, PAGE_SPACING)); + m_monitoring_sizer->Add(m_panel_separotor1, 0, wxEXPAND, 0); - m_project_task_panel = new PrintingTaskPanel(this, PrintingTaskType::PRINGINT); - m_project_task_panel->init_bitmaps(); - m_monitoring_sizer->Add(m_project_task_panel, 0, wxALL | wxEXPAND , 0); + m_project_task_panel = new PrintingTaskPanel(this, PrintingTaskType::PRINGINT); + m_project_task_panel->init_bitmaps(); + m_monitoring_sizer->Add(m_project_task_panel, 0, wxALL | wxEXPAND , 0); + }); // auto m_panel_separotor2 = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); // m_panel_separotor2->SetBackgroundColour(STATUS_PANEL_BG); @@ -1359,8 +1362,10 @@ StatusBasePanel::StatusBasePanel(wxWindow *parent, wxWindowID id, const wxPoint m_machine_ctrl_panel->SetDoubleBuffered(true); auto m_machine_control = create_machine_control_page(m_machine_ctrl_panel); m_machine_ctrl_panel->SetSizer(m_machine_control); - m_machine_ctrl_panel->Layout(); - m_machine_control->Fit(m_machine_ctrl_panel); + add_build_step([this, m_machine_control] { + m_machine_ctrl_panel->Layout(); + m_machine_control->Fit(m_machine_ctrl_panel); + }); bSizer_status_below->Add(m_machine_ctrl_panel, 0, wxALL, 0); @@ -1375,8 +1380,11 @@ StatusBasePanel::StatusBasePanel(wxWindow *parent, wxWindowID id, const wxPoint m_panel_separotor_bottom->SetBackgroundColour(STATUS_PANEL_BG); bSizer_status->Add(m_panel_separotor_bottom, 0, wxEXPAND | wxALL, 0); - this->SetSizerAndFit(bSizer_status); - this->Layout(); + this->SetSizer(bSizer_status); + add_build_step([this, bSizer_status] { + bSizer_status->SetSizeHints(this); + this->Layout(); + }); } StatusBasePanel::~StatusBasePanel() @@ -1614,16 +1622,24 @@ wxBoxSizer *StatusBasePanel::create_machine_control_page(wxWindow *parent) wxBoxSizer *bSizer_control = new wxBoxSizer(wxVERTICAL); - auto temp_axis_ctrl_sizer = create_temp_axis_group(parent); - auto m_filament_load_sizer = create_filament_group(parent); - + // The slot sizers keep each group's place in bSizer_control. + wxBoxSizer *temp_axis_slot = new wxBoxSizer(wxVERTICAL); + wxBoxSizer *filament_slot = new wxBoxSizer(wxVERTICAL); /* ams control box or live nozzle-rack panel (rack printers switch between the two) */ wxSizer *ams_rack_sizer = new wxBoxSizer(wxHORIZONTAL); - ams_rack_sizer->Add(create_ams_group(parent), 0, wxEXPAND | wxLEFT); - m_panel_nozzle_rack = new wgtDeviceNozzleRack(parent); - m_panel_nozzle_rack->Show(false); - ams_rack_sizer->Add(m_panel_nozzle_rack, 0, wxEXPAND | wxLEFT); + add_build_step([this, parent, temp_axis_slot, filament_slot] { + temp_axis_slot->Add(create_temp_axis_group(parent), 0, wxEXPAND); + filament_slot->Add(create_filament_group(parent), 0, wxEXPAND); + }); + add_build_step([this, parent, ams_rack_sizer] { + ams_rack_sizer->Add(create_ams_group(parent), 0, wxEXPAND | wxLEFT); + }); + add_build_step([this, parent, ams_rack_sizer] { + m_panel_nozzle_rack = new wgtDeviceNozzleRack(parent); + m_panel_nozzle_rack->Show(false); + ams_rack_sizer->Add(m_panel_nozzle_rack, 0, wxEXPAND | wxLEFT); + }); m_ams_rack_switch = new SwitchBoard(parent, _L("Filament"), _L("Hotends"), wxSize(FromDIP(126), FromDIP(26))); m_ams_rack_switch->updateState("left"); @@ -1631,12 +1647,12 @@ wxBoxSizer *StatusBasePanel::create_machine_control_page(wxWindow *parent) m_ams_rack_switch->Bind(wxCUSTOMEVT_SWITCH_POS, &StatusBasePanel::on_ams_rack_switch, this); bSizer_control->Add(0, 0, 0, wxTOP, FromDIP(8)); - bSizer_control->Add(temp_axis_ctrl_sizer, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, FromDIP(8)); + bSizer_control->Add(temp_axis_slot, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, FromDIP(8)); bSizer_control->Add(m_ams_rack_switch, 0, wxALIGN_CENTRE|wxTOP, FromDIP(6)); bSizer_control->Add(0, 0, 0, wxTOP, FromDIP(6)); bSizer_control->Add(ams_rack_sizer, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, FromDIP(8)); bSizer_control->Add(0, 0, 0, wxTOP, FromDIP(6)); - bSizer_control->Add(m_filament_load_sizer, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, FromDIP(8)); + bSizer_control->Add(filament_slot, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, FromDIP(8)); bSizer_control->Add(0, 0, 0, wxTOP, FromDIP(4)); bSizer_right->Add(bSizer_control, 1, wxEXPAND | wxALL, 0); @@ -2228,8 +2244,10 @@ void StatusBasePanel::expand_filament_loading(wxMouseEvent& e) m_filament_step->Show(tag_show); Layout(); Fit(); - wxGetApp().mainframe->m_monitor->get_status_panel()->Layout(); - wxGetApp().mainframe->m_monitor->Layout(); + if (MonitorPanel* monitor = MonitorPanel::if_built()) { + monitor->get_status_panel()->Layout(); + monitor->Layout(); + } } void StatusBasePanel::show_ams_group(bool show) @@ -2240,7 +2258,8 @@ void StatusBasePanel::show_ams_group(bool show) m_ams_control->Fit(); Layout(); Fit(); - wxGetApp().mainframe->m_monitor->Layout(); + if (MonitorPanel* monitor = MonitorPanel::if_built()) + monitor->Layout(); } // On rack printers, don't clobber the rack view when the user has the switch on "Hotends". @@ -2253,7 +2272,8 @@ void StatusBasePanel::show_ams_group(bool show) m_ams_control->Fit(); Layout(); Fit(); - wxGetApp().mainframe->m_monitor->Layout(); + if (MonitorPanel* monitor = MonitorPanel::if_built()) + monitor->Layout(); } } @@ -2277,8 +2297,10 @@ void StatusBasePanel::show_filament_load_group(bool show) Layout(); Fit(); - wxGetApp().mainframe->m_monitor->get_status_panel()->Layout(); - wxGetApp().mainframe->m_monitor->Layout(); + if (MonitorPanel* monitor = MonitorPanel::if_built()) { + monitor->get_status_panel()->Layout(); + monitor->Layout(); + } } } @@ -2403,6 +2425,12 @@ void StatusPanel::update_camera_state(MachineObject* obj) StatusPanel::StatusPanel(wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, long style, const wxString &name) : StatusBasePanel(parent, id, pos, size, style) +{ + // Wires the controls the base class builds in steps, so it is the last step. + add_build_step([this] { wire_controls(); }); +} + +void StatusPanel::wire_controls() { init_scaled_buttons(); m_buttons.push_back(m_bpButton_z_10); @@ -2514,47 +2542,50 @@ StatusPanel::StatusPanel(wxWindow *parent, wxWindowID id, const wxPoint &pos, co StatusPanel::~StatusPanel() { - // Disconnect Events - m_project_task_panel->get_bitmap_thumbnail()->Disconnect(wxEVT_LEFT_DOWN, wxMouseEventHandler(StatusPanel::refresh_thumbnail_webrequest), NULL, this); - m_project_task_panel->get_partskip_button()->Disconnect(wxEVT_LEFT_DOWN, wxCommandEventHandler(StatusPanel::on_subtask_partskip), NULL, this); - m_project_task_panel->get_pause_resume_button()->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_subtask_pause_resume), NULL, this); - m_project_task_panel->get_abort_button()->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_subtask_abort), NULL, this); - m_project_task_panel->get_market_scoring_button()->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_market_scoring), NULL, this); - m_project_task_panel->get_market_retry_buttom()->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_market_retry), NULL, this); - m_project_task_panel->get_clean_button()->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_print_error_clean), NULL, this); + // The controls only exist once the last build step has run. + if (built()) { + // Disconnect Events + m_project_task_panel->get_bitmap_thumbnail()->Disconnect(wxEVT_LEFT_DOWN, wxMouseEventHandler(StatusPanel::refresh_thumbnail_webrequest), NULL, this); + m_project_task_panel->get_partskip_button()->Disconnect(wxEVT_LEFT_DOWN, wxCommandEventHandler(StatusPanel::on_subtask_partskip), NULL, this); + m_project_task_panel->get_pause_resume_button()->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_subtask_pause_resume), NULL, this); + m_project_task_panel->get_abort_button()->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_subtask_abort), NULL, this); + m_project_task_panel->get_market_scoring_button()->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_market_scoring), NULL, this); + m_project_task_panel->get_market_retry_buttom()->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_market_retry), NULL, this); + m_project_task_panel->get_clean_button()->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_print_error_clean), NULL, this); - m_setting_button->Disconnect(wxEVT_LEFT_DOWN, wxMouseEventHandler(StatusPanel::on_camera_enter), NULL, this); - m_setting_button->Disconnect(wxEVT_LEFT_DCLICK, wxMouseEventHandler(StatusPanel::on_camera_enter), NULL, this); - m_tempCtrl_bed->Disconnect(wxEVT_KILL_FOCUS, wxFocusEventHandler(StatusPanel::on_bed_temp_kill_focus), NULL, this); - m_tempCtrl_bed->Disconnect(wxEVT_SET_FOCUS, wxFocusEventHandler(StatusPanel::on_bed_temp_set_focus), NULL, this); - m_tempCtrl_nozzle->Disconnect(wxEVT_KILL_FOCUS, wxFocusEventHandler(StatusPanel::on_nozzle_temp_kill_focus), NULL, this); - m_tempCtrl_nozzle->Disconnect(wxEVT_SET_FOCUS, wxFocusEventHandler(StatusPanel::on_nozzle_temp_set_focus), NULL, this); + m_setting_button->Disconnect(wxEVT_LEFT_DOWN, wxMouseEventHandler(StatusPanel::on_camera_enter), NULL, this); + m_setting_button->Disconnect(wxEVT_LEFT_DCLICK, wxMouseEventHandler(StatusPanel::on_camera_enter), NULL, this); + m_tempCtrl_bed->Disconnect(wxEVT_KILL_FOCUS, wxFocusEventHandler(StatusPanel::on_bed_temp_kill_focus), NULL, this); + m_tempCtrl_bed->Disconnect(wxEVT_SET_FOCUS, wxFocusEventHandler(StatusPanel::on_bed_temp_set_focus), NULL, this); + m_tempCtrl_nozzle->Disconnect(wxEVT_KILL_FOCUS, wxFocusEventHandler(StatusPanel::on_nozzle_temp_kill_focus), NULL, this); + m_tempCtrl_nozzle->Disconnect(wxEVT_SET_FOCUS, wxFocusEventHandler(StatusPanel::on_nozzle_temp_set_focus), NULL, this); - m_tempCtrl_nozzle_deputy->Disconnect(wxEVT_KILL_FOCUS, wxFocusEventHandler(StatusPanel::on_nozzle_temp_kill_focus), NULL, this); - m_tempCtrl_nozzle_deputy->Disconnect(wxEVT_SET_FOCUS, wxFocusEventHandler(StatusPanel::on_nozzle_temp_set_focus), NULL, this); + m_tempCtrl_nozzle_deputy->Disconnect(wxEVT_KILL_FOCUS, wxFocusEventHandler(StatusPanel::on_nozzle_temp_kill_focus), NULL, this); + m_tempCtrl_nozzle_deputy->Disconnect(wxEVT_SET_FOCUS, wxFocusEventHandler(StatusPanel::on_nozzle_temp_set_focus), NULL, this); - m_switch_lamp->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_lamp_switch), NULL, this); - /*m_switch_nozzle_fan->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_nozzle_fan_switch), NULL, this); - m_switch_printing_fan->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_nozzle_fan_switch), NULL, this); - m_switch_cham_fan->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_nozzle_fan_switch), NULL, this);*/ + m_switch_lamp->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_lamp_switch), NULL, this); + /*m_switch_nozzle_fan->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_nozzle_fan_switch), NULL, this); + m_switch_printing_fan->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_nozzle_fan_switch), NULL, this); + m_switch_cham_fan->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_nozzle_fan_switch), NULL, this);*/ - //m_switch_fan->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_nozzle_fan_switch), NULL, this); - //m_switch_fan->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_nozzle_fan_switch), NULL, this); - m_switch_fan->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_nozzle_fan_switch), NULL, this); + //m_switch_fan->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_nozzle_fan_switch), NULL, this); + //m_switch_fan->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_nozzle_fan_switch), NULL, this); + m_switch_fan->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_nozzle_fan_switch), NULL, this); - m_bpButton_xy->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_axis_ctrl_xy), NULL, this); - m_bpButton_z_10->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_axis_ctrl_z_up_10), NULL, this); - m_bpButton_z_1->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_axis_ctrl_z_up_1), NULL, this); - m_bpButton_z_down_1->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_axis_ctrl_z_down_1), NULL, this); - m_bpButton_z_down_10->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_axis_ctrl_z_down_10), NULL, this); - m_bpButton_e_10->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_axis_ctrl_e_up_10), NULL, this); - m_bpButton_e_down_10->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_axis_ctrl_e_down_10), NULL, this); - m_nozzle_btn_panel->Disconnect(wxCUSTOMEVT_SWITCH_POS, wxCommandEventHandler(StatusPanel::on_nozzle_selected), NULL, this); - m_switch_speed->Disconnect(wxEVT_LEFT_DOWN, wxCommandEventHandler(StatusPanel::on_switch_speed), NULL, this); - m_calibration_btn->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_start_calibration), NULL, this); - m_options_btn->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_show_print_options), NULL, this); - m_safety_btn->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_show_safety_options), NULL, this); - m_parts_btn->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_show_parts_options), NULL, this); + m_bpButton_xy->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_axis_ctrl_xy), NULL, this); + m_bpButton_z_10->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_axis_ctrl_z_up_10), NULL, this); + m_bpButton_z_1->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_axis_ctrl_z_up_1), NULL, this); + m_bpButton_z_down_1->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_axis_ctrl_z_down_1), NULL, this); + m_bpButton_z_down_10->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_axis_ctrl_z_down_10), NULL, this); + m_bpButton_e_10->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_axis_ctrl_e_up_10), NULL, this); + m_bpButton_e_down_10->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_axis_ctrl_e_down_10), NULL, this); + m_nozzle_btn_panel->Disconnect(wxCUSTOMEVT_SWITCH_POS, wxCommandEventHandler(StatusPanel::on_nozzle_selected), NULL, this); + m_switch_speed->Disconnect(wxEVT_LEFT_DOWN, wxCommandEventHandler(StatusPanel::on_switch_speed), NULL, this); + m_calibration_btn->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_start_calibration), NULL, this); + m_options_btn->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_show_print_options), NULL, this); + m_safety_btn->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_show_safety_options), NULL, this); + m_parts_btn->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(StatusPanel::on_show_parts_options), NULL, this); + } // remove warning dialogs if (abort_dlg != nullptr) @@ -5216,7 +5247,9 @@ void StatusPanel::set_default() m_filament_step->Hide(); error_info_reset(); #ifndef __WXGTK__ - SetFocus(); + // Also reached while the panel is built off screen. + if (IsShownOnScreen()) + SetFocus(); #endif } diff --git a/src/slic3r/GUI/StatusPanel.hpp b/src/slic3r/GUI/StatusPanel.hpp index 341bb9ab69..d79c3d3915 100644 --- a/src/slic3r/GUI/StatusPanel.hpp +++ b/src/slic3r/GUI/StatusPanel.hpp @@ -36,6 +36,7 @@ #include "HMS.hpp" #include "PartSkipDialog.hpp" #include "DeviceErrorDialog.hpp" +#include "StagedBuild.hpp" class StepIndicator; @@ -375,7 +376,7 @@ public: void paint(wxPaintEvent&); }; -class StatusBasePanel : public wxScrolledWindow +class StatusBasePanel : public wxScrolledWindow, public StagedBuild { protected: wxBitmap m_item_placeholder; @@ -443,7 +444,7 @@ protected: wxMediaCtrl3 * m_media_ctrl; - MediaPlayCtrl * m_media_play_ctrl; + MediaPlayCtrl * m_media_play_ctrl{nullptr}; Label * m_staticText_printing; wxStaticBitmap *m_bitmap_thumbnail; @@ -629,6 +630,7 @@ class StatusPanel : public StatusBasePanel { private: friend class MonitorPanel; + void wire_controls(); protected: std::shared_ptr m_slice_info_popup; @@ -679,7 +681,7 @@ protected: std::map m_print_connect_types; std::vector