mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-27 10:51:22 +00:00
Merge Main into Belt Printer
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.
This commit is contained in:
@@ -5,7 +5,6 @@
|
||||
"inherits": "Generic PC @System",
|
||||
"from": "system",
|
||||
"setting_id": "HMOa2jbj19Xjipt5",
|
||||
"filament_id": "GFC99",
|
||||
"instantiation": "true",
|
||||
"filament_cooling_final_speed": [
|
||||
"3.5"
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
"inherits": "Generic PETG @System",
|
||||
"from": "system",
|
||||
"setting_id": "4qShNrl9EWAVBfeG",
|
||||
"filament_id": "GFG99",
|
||||
"instantiation": "true",
|
||||
"filament_cooling_final_speed": [
|
||||
"3.5"
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
"inherits": "Generic PLA @System",
|
||||
"from": "system",
|
||||
"setting_id": "WbAYFZdqFwEZnNAX",
|
||||
"filament_id": "GFL99",
|
||||
"instantiation": "true",
|
||||
"filament_cooling_final_speed": [
|
||||
"3.5"
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
"inherits": "Generic PLA-CF @System",
|
||||
"from": "system",
|
||||
"setting_id": "53UFt3Q63NB0ztlP",
|
||||
"filament_id": "GFL98",
|
||||
"instantiation": "true",
|
||||
"filament_cooling_final_speed": [
|
||||
"3.5"
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
"inherits": "Generic PVA @System",
|
||||
"from": "system",
|
||||
"setting_id": "dyOUyXNOKP1VmSal",
|
||||
"filament_id": "GFS99",
|
||||
"instantiation": "true",
|
||||
"filament_cooling_final_speed": [
|
||||
"3.5"
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
"inherits": "Generic TPU @System",
|
||||
"from": "system",
|
||||
"setting_id": "H45dfn4BGdLAx9nN",
|
||||
"filament_id": "GFU99",
|
||||
"instantiation": "true",
|
||||
"filament_max_volumetric_speed": [
|
||||
"3.2"
|
||||
|
||||
Reference in New Issue
Block a user