mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-02 23:06:49 +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.
75 lines
1.1 KiB
JSON
75 lines
1.1 KiB
JSON
{
|
|
"type": "filament",
|
|
"name": "Snapmaker PLA-CF @U1 base",
|
|
"inherits": "fdm_filament_pla",
|
|
"from": "system",
|
|
"filament_id": "OFhQf8ou",
|
|
"instantiation": "false",
|
|
"filament_end_gcode": [
|
|
""
|
|
],
|
|
"required_nozzle_HRC": [
|
|
"40"
|
|
],
|
|
"hot_plate_temp": [
|
|
"55"
|
|
],
|
|
"hot_plate_temp_initial_layer": [
|
|
"55"
|
|
],
|
|
"filament_density": [
|
|
"1.22"
|
|
],
|
|
"filament_max_volumetric_speed": [
|
|
"15"
|
|
],
|
|
"filament_loading_speed_start": [
|
|
"35"
|
|
],
|
|
"filament_loading_speed": [
|
|
"35"
|
|
],
|
|
"filament_unloading_speed_start": [
|
|
"35"
|
|
],
|
|
"filament_unloading_speed": [
|
|
"35"
|
|
],
|
|
"filament_load_time": [
|
|
"2"
|
|
],
|
|
"filament_unload_time": [
|
|
"2"
|
|
],
|
|
"filament_cooling_moves": [
|
|
"2"
|
|
],
|
|
"filament_cooling_initial_speed": [
|
|
"35"
|
|
],
|
|
"filament_cooling_final_speed": [
|
|
"60"
|
|
],
|
|
"nozzle_temperature_initial_layer": [
|
|
"230"
|
|
],
|
|
"nozzle_temperature": [
|
|
"230"
|
|
],
|
|
"temperature_vitrification": [
|
|
"150"
|
|
],
|
|
"filament_type": [
|
|
"PLA-CF"
|
|
],
|
|
"nozzle_temperature_range_low": [
|
|
"210"
|
|
],
|
|
"nozzle_temperature_range_high": [
|
|
"250"
|
|
],
|
|
"additional_cooling_fan_speed": [
|
|
"0"
|
|
]
|
|
}
|