mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-07-16 07:22:10 +00:00
7252f6acb7
Reconciles the belt-printer branch with upstream PRs through #13723. Six files had conflicts; three additional files needed manual follow-up fixes where the auto-merge produced code that referenced upstream-renamed fields or changed function signatures. Notable reconciliations: - TreeSupport.cpp: kept belt-floor early-exit branches around HEAD's drop-down logic, folded upstream's `(distance_to_top > 0 ? 1 : 0)` formula into the non-belt-floor path (upstream PR #11812). Dropped dead `roof_enabled`/`force_tip_to_roof` locals. - TreeSupport3D.cpp: combined upstream's safety-offset + remove_small changes with HEAD's belt-floor clip in the per-slice trim loop. Dropped HEAD's `else` block (superseded by upstream's rewritten bottom-contact propagation) and re-added the belt-floor clip into the new propagation loop. Gated the propagation on belt printers to prevent OOM when belt-floor clipping produces empty initial slices. - TriangleSelector.{cpp,hpp}: merged both new `select_patch` parameters (HEAD's `up_direction` and upstream's `select_partially`); body uses `dot(up_direction)` for the overhang angle check and forwards `select_partially` to `select_triangle`. - SupportMaterial.cpp: `slicing_params.soluble_interface` → `zero_gap_interface_bottom` in HEAD's `detect_belt_floor_bottom_contacts`, matching upstream's same-purpose rename at line 2495. - Custom.json, GCodeWriter.cpp: simple additive merges (kept entries / includes from both sides). Verified by building OrcaSlicer (RelWithDebInfo) after a full deps rebuild (Eigen v5.0.1, libigl v2.6.0 are now managed deps) and slicing a scaled Benchy on the NORMALIZER belt-printer profile without OOM. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
320 lines
7.8 KiB
JSON
320 lines
7.8 KiB
JSON
{
|
|
"name": "Custom Printer",
|
|
"version": "02.03.02.62",
|
|
"force_update": "0",
|
|
"description": "My configurations",
|
|
"machine_model_list": [
|
|
{
|
|
"name": "Generic Belt Printer",
|
|
"sub_path": "machine/MyBeltPrinter.json"
|
|
},
|
|
{
|
|
"name": "Generic Klipper Printer",
|
|
"sub_path": "machine/MyKlipper.json"
|
|
},
|
|
{
|
|
"name": "Generic Marlin Printer",
|
|
"sub_path": "machine/MyMarlin.json"
|
|
},
|
|
{
|
|
"name": "Generic RRF Printer",
|
|
"sub_path": "machine/MyRRF.json"
|
|
},
|
|
{
|
|
"name": "Generic Repetier Printer",
|
|
"sub_path": "machine/MyRepetier.json"
|
|
},
|
|
{
|
|
"name": "Generic ToolChanger Printer",
|
|
"sub_path": "machine/MyToolChanger.json"
|
|
}
|
|
],
|
|
"process_list": [
|
|
{
|
|
"name": "fdm_process_common",
|
|
"sub_path": "process/fdm_process_common.json"
|
|
},
|
|
{
|
|
"name": "fdm_process_klipper_common",
|
|
"sub_path": "process/fdm_process_klipper_common.json"
|
|
},
|
|
{
|
|
"name": "fdm_process_marlin_common",
|
|
"sub_path": "process/fdm_process_marlin_common.json"
|
|
},
|
|
{
|
|
"name": "fdm_process_rrf_common",
|
|
"sub_path": "process/fdm_process_rrf_common.json"
|
|
},
|
|
{
|
|
"name": "fdm_process_repetier_common",
|
|
"sub_path": "process/fdm_process_repetier_common.json"
|
|
},
|
|
|
|
{
|
|
"name": "0.08mm Extra Fine @MyKlipper",
|
|
"sub_path": "process/0.08mm Extra Fine @MyKlipper.json"
|
|
},
|
|
{
|
|
"name": "0.12mm Fine @MyKlipper",
|
|
"sub_path": "process/0.12mm Fine @MyKlipper.json"
|
|
},
|
|
{
|
|
"name": "0.15mm Optimal @MyKlipper",
|
|
"sub_path": "process/0.15mm Optimal @MyKlipper.json"
|
|
},
|
|
{
|
|
"name": "0.16mm Optimal @MyKlipper",
|
|
"sub_path": "process/0.16mm Optimal @MyKlipper.json"
|
|
},
|
|
{
|
|
"name": "0.20mm Standard @MyKlipper",
|
|
"sub_path": "process/0.20mm Standard @MyKlipper.json"
|
|
},
|
|
{
|
|
"name": "0.24mm Draft @MyKlipper",
|
|
"sub_path": "process/0.24mm Draft @MyKlipper.json"
|
|
},
|
|
{
|
|
"name": "0.28mm Extra Draft @MyKlipper",
|
|
"sub_path": "process/0.28mm Extra Draft @MyKlipper.json"
|
|
},
|
|
{
|
|
"name": "0.32mm Standard @MyKlipper",
|
|
"sub_path": "process/0.32mm Extra Draft @MyKlipper.json"
|
|
},
|
|
{
|
|
"name": "0.40mm Standard @MyKlipper",
|
|
"sub_path": "process/0.40mm Extra Draft @MyKlipper.json"
|
|
},
|
|
{
|
|
"name": "0.56mm Standard @MyKlipper",
|
|
"sub_path": "process/0.56mm Extra Draft @MyKlipper.json"
|
|
},
|
|
{
|
|
"name": "fdm_process_mytoolchanger_common",
|
|
"sub_path": "process/fdm_process_mytoolchanger_common.json"
|
|
},
|
|
{
|
|
"name": "0.08mm Extra Fine @MyMarlin",
|
|
"sub_path": "process/0.08mm Extra Fine @MyMarlin.json"
|
|
},
|
|
{
|
|
"name": "0.12mm Fine @MyMarlin",
|
|
"sub_path": "process/0.12mm Fine @MyMarlin.json"
|
|
},
|
|
{
|
|
"name": "0.15mm Optimal @MyMarlin",
|
|
"sub_path": "process/0.15mm Optimal @MyMarlin.json"
|
|
},
|
|
{
|
|
"name": "0.20mm Standard @MyMarlin",
|
|
"sub_path": "process/0.20mm Standard @MyMarlin.json"
|
|
},
|
|
{
|
|
"name": "0.24mm Draft @MyMarlin",
|
|
"sub_path": "process/0.24mm Draft @MyMarlin.json"
|
|
},
|
|
{
|
|
"name": "0.28mm Extra Draft @MyMarlin",
|
|
"sub_path": "process/0.28mm Extra Draft @MyMarlin.json"
|
|
},
|
|
{
|
|
"name": "0.08mm Extra Fine @MyRRF",
|
|
"sub_path": "process/0.08mm Extra Fine @MyRRF.json"
|
|
},
|
|
{
|
|
"name": "0.12mm Fine @MyRRF",
|
|
"sub_path": "process/0.12mm Fine @MyRRF.json"
|
|
},
|
|
{
|
|
"name": "0.15mm Optimal @MyRRF",
|
|
"sub_path": "process/0.15mm Optimal @MyRRF.json"
|
|
},
|
|
{
|
|
"name": "0.20mm Standard @MyRRF",
|
|
"sub_path": "process/0.20mm Standard @MyRRF.json"
|
|
},
|
|
{
|
|
"name": "0.24mm Draft @MyRRF",
|
|
"sub_path": "process/0.24mm Draft @MyRRF.json"
|
|
},
|
|
{
|
|
"name": "0.28mm Extra Draft @MyRRF",
|
|
"sub_path": "process/0.28mm Extra Draft @MyRRF.json"
|
|
},
|
|
{
|
|
"name": "0.20mm Standard @MyRepetier",
|
|
"sub_path": "process/0.20mm Standard @MyRepetier.json"
|
|
},
|
|
{
|
|
"name": "0.08mm Extra Fine @MyToolChanger",
|
|
"sub_path": "process/0.08mm Extra Fine @MyToolChanger.json"
|
|
},
|
|
{
|
|
"name": "0.12mm Fine @MyToolChanger",
|
|
"sub_path": "process/0.12mm Fine @MyToolChanger.json"
|
|
},
|
|
{
|
|
"name": "0.15mm Optimal @MyToolChanger",
|
|
"sub_path": "process/0.15mm Optimal @MyToolChanger.json"
|
|
},
|
|
{
|
|
"name": "0.16mm Optimal @MyToolChanger",
|
|
"sub_path": "process/0.16mm Optimal @MyToolChanger.json"
|
|
},
|
|
{
|
|
"name": "0.20mm Standard @MyToolChanger",
|
|
"sub_path": "process/0.20mm Standard @MyToolChanger.json"
|
|
},
|
|
{
|
|
"name": "0.24mm Draft @MyToolChanger",
|
|
"sub_path": "process/0.24mm Draft @MyToolChanger.json"
|
|
},
|
|
{
|
|
"name": "0.28mm Extra Draft @MyToolChanger",
|
|
"sub_path": "process/0.28mm Extra Draft @MyToolChanger.json"
|
|
},
|
|
{
|
|
"name": "0.32mm Extra Draft @MyToolChanger",
|
|
"sub_path": "process/0.32mm Extra Draft @MyToolChanger.json"
|
|
},
|
|
{
|
|
"name": "0.40mm Standard @MyToolChanger",
|
|
"sub_path": "process/0.40mm Extra Draft @MyToolChanger.json"
|
|
},
|
|
{
|
|
"name": "0.56mm Standard @MyToolChanger",
|
|
"sub_path": "process/0.56mm Extra Draft @MyToolChanger.json"
|
|
}
|
|
],
|
|
"filament_list": [
|
|
{
|
|
"name": "Generic ABS @MyToolChanger",
|
|
"sub_path": "filament/Generic ABS @MyToolChanger.json"
|
|
},
|
|
{
|
|
"name": "Generic ASA @MyToolChanger",
|
|
"sub_path": "filament/Generic ASA @MyToolChanger.json"
|
|
},
|
|
{
|
|
"name": "Generic PA @MyToolChanger",
|
|
"sub_path": "filament/Generic PA @MyToolChanger.json"
|
|
},
|
|
{
|
|
"name": "Generic PA-CF @MyToolChanger",
|
|
"sub_path": "filament/Generic PA-CF @MyToolChanger.json"
|
|
},
|
|
{
|
|
"name": "Generic PC @MyToolChanger",
|
|
"sub_path": "filament/Generic PC @MyToolChanger.json"
|
|
},
|
|
{
|
|
"name": "Generic PETG @MyToolChanger",
|
|
"sub_path": "filament/Generic PETG @MyToolChanger.json"
|
|
},
|
|
{
|
|
"name": "Generic PLA @MyToolChanger",
|
|
"sub_path": "filament/Generic PLA @MyToolChanger.json"
|
|
},
|
|
{
|
|
"name": "Generic PLA-CF @MyToolChanger",
|
|
"sub_path": "filament/Generic PLA-CF @MyToolChanger.json"
|
|
},
|
|
{
|
|
"name": "Generic PVA @MyToolChanger",
|
|
"sub_path": "filament/Generic PVA @MyToolChanger.json"
|
|
},
|
|
{
|
|
"name": "Generic TPU @MyToolChanger",
|
|
"sub_path": "filament/Generic TPU @MyToolChanger.json"
|
|
}
|
|
],
|
|
"machine_list": [
|
|
{
|
|
"name": "fdm_machine_common",
|
|
"sub_path": "machine/fdm_machine_common.json"
|
|
},
|
|
{
|
|
"name": "MyMarlin 0.4 nozzle",
|
|
"sub_path": "machine/MyMarlin 0.4 nozzle.json"
|
|
},
|
|
{
|
|
"name": "fdm_klipper_common",
|
|
"sub_path": "machine/fdm_klipper_common.json"
|
|
},
|
|
{
|
|
"name": "fdm_rrf_common",
|
|
"sub_path": "machine/fdm_rrf_common.json"
|
|
},
|
|
{
|
|
"name": "fdm_repetier_common",
|
|
"sub_path": "machine/fdm_repetier_common.json"
|
|
},
|
|
{
|
|
"name": "MyKlipper 0.2 nozzle",
|
|
"sub_path": "machine/MyKlipper 0.2 nozzle.json"
|
|
},
|
|
{
|
|
"name": "MyKlipper 0.4 nozzle",
|
|
"sub_path": "machine/MyKlipper 0.4 nozzle.json"
|
|
},
|
|
{
|
|
"name": "MyKlipper 0.6 nozzle",
|
|
"sub_path": "machine/MyKlipper 0.6 nozzle.json"
|
|
},
|
|
{
|
|
"name": "MyKlipper 0.8 nozzle",
|
|
"sub_path": "machine/MyKlipper 0.8 nozzle.json"
|
|
},
|
|
{
|
|
"name": "fdm_belt_common",
|
|
"sub_path": "machine/fdm_belt_common.json"
|
|
},
|
|
{
|
|
"name": "fdm_toolchanger_common",
|
|
"sub_path": "machine/fdm_toolchanger_common.json"
|
|
},
|
|
{
|
|
"name": "MyRRF 0.4 nozzle",
|
|
"sub_path": "machine/MyRRF 0.4 nozzle.json"
|
|
},
|
|
{
|
|
"name": "MyBeltPrinter 0.2 nozzle",
|
|
"sub_path": "machine/MyBeltPrinter 0.2 nozzle.json"
|
|
},
|
|
{
|
|
"name": "MyBeltPrinter 0.4 nozzle",
|
|
"sub_path": "machine/MyBeltPrinter 0.4 nozzle.json"
|
|
},
|
|
{
|
|
"name": "MyBeltPrinter 0.6 nozzle",
|
|
"sub_path": "machine/MyBeltPrinter 0.6 nozzle.json"
|
|
},
|
|
{
|
|
"name": "MyBeltPrinter 0.8 nozzle",
|
|
"sub_path": "machine/MyBeltPrinter 0.8 nozzle.json"
|
|
},
|
|
{
|
|
"name": "MyRepetier 0.4 nozzle",
|
|
"sub_path": "machine/MyRepetier 0.4 nozzle.json"
|
|
},
|
|
{
|
|
"name": "MyToolChanger 0.2 nozzle",
|
|
"sub_path": "machine/MyToolChanger 0.2 nozzle.json"
|
|
},
|
|
{
|
|
"name": "MyToolChanger 0.4 nozzle",
|
|
"sub_path": "machine/MyToolChanger 0.4 nozzle.json"
|
|
},
|
|
{
|
|
"name": "MyToolChanger 0.6 nozzle",
|
|
"sub_path": "machine/MyToolChanger 0.6 nozzle.json"
|
|
},
|
|
{
|
|
"name": "MyToolChanger 0.8 nozzle",
|
|
"sub_path": "machine/MyToolChanger 0.8 nozzle.json"
|
|
}
|
|
]
|
|
}
|