mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-02 06:47:04 +00:00
1a62a25d36
Brings in 560 commits (merge base 2026-07-04 .. origin/main af9fd10d7a).
19 conflicts resolved; the other 138 touched files auto-merged.
Conflict resolutions
- Snapmaker/Polymaker (7): main normalised JSON key order in #15039 while this
branch inserted filament_id/filament_vendor. Took main's key order and kept
this branch's values, inserting a single filament_id key rather than letting
git's line merge leave duplicate "from"/"instantiation" keys.
- re3D rPETG @0.8/@1.75 nozzle (2): main renamed these from "re3D Greengate
rPETG @*" and re-vendored GreenGate3D -> re3D (#15169). Git's rename-aware
merge produced a file with two filament_vendor keys; took main's version
wholesale instead. The id is reconciled by the tooling, not by hand.
- re3D rPP (1): kept main's inherits change (fdm_filament_pet -> fdm_filament_pp,
local filament_type override dropped) and its widened compatible_printers.
The flattened type is still PP, so the product triple and id OFfHGM1D are
unchanged.
- re3D Greengate rPETG.json, Afinia {ABS+,ABS,PLA,TPU,Value ABS,Value PLA}.json
(7 modify/delete): accepted main's deletions. The Afinia ids are not orphaned
- the surviving @HS presets resolve the same triple and already carry the
same ids, so nothing is retired.
- .github/workflows/check_profiles.yml: kept both main's new "validate slice"
step and this branch's tree-wide filament-subtype check.
- tests/libslic3r/CMakeLists.txt: kept both test_filament_id_succession.cpp and
main's test_preset_diff.cpp.
Verified
- No conflict markers; all 12795 profile JSONs parse with no duplicate keys.
- All branch artifacts (tooling, snapshot, ledger, doc, tests) intact and
unmodified by the merge.
- The succession-ledger C++ call sites survived main's refactors; audited
Preset.{cpp,hpp}, PresetBundle.cpp, DeviceManager.cpp, PresetComboBoxes.cpp,
CaliHistoryDialog.cpp, MoonrakerPrinterAgent.cpp against base/ours/theirs.
- scripts/tests: 115/116 pass.
Known follow-up: assign_filament_ids.py --check reports 243 errors, all from
filament data main added in the last month (BBL/addnorth, Qidi X5/Plus 5,
Snapmaker U1, re3D). The single failing unit test is the live-tree conformance
test asserting that count is zero. Reconciliation lands separately.
46 lines
814 B
JSON
46 lines
814 B
JSON
{
|
|
"type": "filament",
|
|
"name": "Generic PETG @MyToolChanger",
|
|
"renamed_from": "My Generic PETG @MyToolChanger",
|
|
"inherits": "Generic PETG @System",
|
|
"from": "system",
|
|
"setting_id": "4qShNrl9EWAVBfeG",
|
|
"instantiation": "true",
|
|
"filament_cooling_final_speed": [
|
|
"3.5"
|
|
],
|
|
"filament_cooling_initial_speed": [
|
|
"10"
|
|
],
|
|
"filament_cooling_moves": [
|
|
"2"
|
|
],
|
|
"filament_load_time": [
|
|
"10.5"
|
|
],
|
|
"filament_loading_speed": [
|
|
"10"
|
|
],
|
|
"filament_loading_speed_start": [
|
|
"50"
|
|
],
|
|
"filament_stamping_distance": [
|
|
"45"
|
|
],
|
|
"filament_stamping_loading_speed": [
|
|
"29"
|
|
],
|
|
"filament_unload_time": [
|
|
"8.5"
|
|
],
|
|
"filament_unloading_speed": [
|
|
"100"
|
|
],
|
|
"compatible_printers": [
|
|
"MyToolChanger 0.4 nozzle",
|
|
"MyToolChanger 0.2 nozzle",
|
|
"MyToolChanger 0.6 nozzle",
|
|
"MyToolChanger 0.8 nozzle"
|
|
]
|
|
}
|