mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-16 13:32:44 +00:00
Merge origin/main (00429da739) into belt-printer.
Conflicts resolved:
- src/CMakeLists.txt: keep both wxInspector workarounds.
- GCodeProcessor.cpp: keep the belt compare_pos / z_for_height lines.
- PrintObjectSlice.cpp: the belt bbox-Z guard also covers main's
printable_region_ids bookkeeping.
- TreeSupport.cpp: the belt-floor check runs before main's PendingNode
queueing.
- Tab.hpp: keep the belt fields, drop the removed upload description
fields.
- tests/libslic3r/CMakeLists.txt: keep both test files.
Also included:
- eSUN PLA belt presets declare their own filament_id (OFkrxQC4) and
scripts/filament_id_snapshot.json is regenerated, as main's filament_id
check requires.
- Custom.json version bumped to 02.04.00.05 so the belt entries reach
existing installs.
- Fix the ambiguous WithinRel call in the belt apron width test, which
otherwise breaks the fff_print build.
37 lines
623 B
JSON
37 lines
623 B
JSON
{
|
|
"type": "filament",
|
|
"name": "eSUN PLA @IdeaFormer IR3 V2",
|
|
"inherits": "Generic PLA @IdeaFormer IR3 V2",
|
|
"filament_id": "OFkrxQC4",
|
|
"from": "system",
|
|
"setting_id": "XqkviBmFHEglXueX",
|
|
"instantiation": "true",
|
|
"compatible_printers": [
|
|
"IdeaFormer IR3 V2 0.4 nozzle"
|
|
],
|
|
"filament_type": [
|
|
"PLA"
|
|
],
|
|
"filament_vendor": [
|
|
"eSUN"
|
|
],
|
|
"filament_settings_id": [
|
|
"eSUN PLA @IdeaFormer IR3 V2"
|
|
],
|
|
"nozzle_temperature_initial_layer": [
|
|
"200"
|
|
],
|
|
"nozzle_temperature": [
|
|
"200"
|
|
],
|
|
"enable_pressure_advance": [
|
|
"1"
|
|
],
|
|
"pressure_advance": [
|
|
"0.12"
|
|
],
|
|
"filament_max_volumetric_speed": [
|
|
"20"
|
|
]
|
|
}
|