Merge branch 'main' into feature/filament_id

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.
This commit is contained in:
SoftFever
2026-08-08 02:05:37 +08:00
2224 changed files with 2621813 additions and 1287333 deletions

View File

@@ -36,6 +36,9 @@
"filament_max_volumetric_speed": [
"8"
],
"filament_multitool_ramming_flow": [
"8"
],
"filament_type": [
"PET-CF"
],

View File

@@ -39,6 +39,9 @@
"filament_max_volumetric_speed": [
"8"
],
"filament_multitool_ramming_flow": [
"8"
],
"filament_vendor": [
"Bambu Lab"
],

View File

@@ -39,6 +39,9 @@
"filament_max_volumetric_speed": [
"6"
],
"filament_multitool_ramming_flow": [
"6"
],
"filament_vendor": [
"Bambu Lab"
],

View File

@@ -21,6 +21,9 @@
"filament_max_volumetric_speed": [
"6"
],
"filament_multitool_ramming_flow": [
"6"
],
"filament_type": [
"PLA-AERO"
],

View File

@@ -27,6 +27,9 @@
"filament_max_volumetric_speed": [
"6"
],
"filament_multitool_ramming_flow": [
"6"
],
"filament_scarf_seam_type": [
"none"
],

View File

@@ -21,6 +21,9 @@
"filament_max_volumetric_speed": [
"6"
],
"filament_multitool_ramming_flow": [
"6"
],
"filament_vendor": [
"Bambu Lab"
],

View File

@@ -36,6 +36,9 @@
"filament_max_volumetric_speed": [
"1"
],
"filament_multitool_ramming_flow": [
"1"
],
"filament_retraction_minimum_travel": [
"3"
],

View File

@@ -72,15 +72,6 @@
"fan_min_speed": [
"10"
],
"filament_cooling_final_speed": [
"0"
],
"filament_cooling_initial_speed": [
"0"
],
"filament_cooling_moves": [
"0"
],
"filament_cost": [
"599"
],
@@ -99,30 +90,12 @@
"filament_is_support": [
"0"
],
"filament_loading_speed": [
"0"
],
"filament_loading_speed_start": [
"0"
],
"filament_long_retractions_when_cut": [
"nil"
],
"filament_max_volumetric_speed": [
"15"
],
"filament_minimal_purge_on_wipe_tower": [
"0"
],
"filament_multitool_ramming": [
"0"
],
"filament_multitool_ramming_flow": [
"10"
],
"filament_multitool_ramming_volume": [
"10"
],
"filament_notes": [
""
],
@@ -165,21 +138,6 @@
"filament_soluble": [
"0"
],
"filament_stamping_distance": [
"0"
],
"filament_stamping_loading_speed": [
"0"
],
"filament_toolchange_delay": [
"0"
],
"filament_unloading_speed": [
"0"
],
"filament_unloading_speed_start": [
"0"
],
"filament_vendor": [
"Elas"
],

View File

@@ -42,15 +42,6 @@
"fan_min_speed": [
"20"
],
"filament_cooling_final_speed": [
"0"
],
"filament_cooling_initial_speed": [
"0"
],
"filament_cooling_moves": [
"0"
],
"filament_cost": [
"445"
],
@@ -69,30 +60,12 @@
"filament_is_support": [
"0"
],
"filament_loading_speed": [
"0"
],
"filament_loading_speed_start": [
"0"
],
"filament_long_retractions_when_cut": [
"1"
],
"filament_max_volumetric_speed": [
"18"
],
"filament_minimal_purge_on_wipe_tower": [
"0"
],
"filament_multitool_ramming": [
"0"
],
"filament_multitool_ramming_flow": [
"10"
],
"filament_multitool_ramming_volume": [
"10"
],
"filament_notes": [
""
],
@@ -135,21 +108,6 @@
"filament_soluble": [
"0"
],
"filament_stamping_distance": [
"0"
],
"filament_stamping_loading_speed": [
"0"
],
"filament_toolchange_delay": [
"0"
],
"filament_unloading_speed": [
"0"
],
"filament_unloading_speed_start": [
"0"
],
"filament_wipe": [
"nil"
],

View File

@@ -71,15 +71,6 @@
"fan_min_speed": [
"60"
],
"filament_cooling_final_speed": [
"0"
],
"filament_cooling_initial_speed": [
"0"
],
"filament_cooling_moves": [
"0"
],
"filament_cost": [
"449.5"
],
@@ -98,30 +89,12 @@
"filament_is_support": [
"0"
],
"filament_loading_speed": [
"0"
],
"filament_loading_speed_start": [
"0"
],
"filament_long_retractions_when_cut": [
"nil"
],
"filament_max_volumetric_speed": [
"25"
],
"filament_minimal_purge_on_wipe_tower": [
"0"
],
"filament_multitool_ramming": [
"0"
],
"filament_multitool_ramming_flow": [
"10"
],
"filament_multitool_ramming_volume": [
"10"
],
"filament_notes": [
""
],
@@ -164,21 +137,6 @@
"filament_soluble": [
"0"
],
"filament_stamping_distance": [
"0"
],
"filament_stamping_loading_speed": [
"0"
],
"filament_toolchange_delay": [
"0"
],
"filament_unloading_speed": [
"0"
],
"filament_unloading_speed_start": [
"0"
],
"filament_vendor": [
"Elas"
],

View File

@@ -71,15 +71,6 @@
"fan_min_speed": [
"100"
],
"filament_cooling_final_speed": [
"0"
],
"filament_cooling_initial_speed": [
"0"
],
"filament_cooling_moves": [
"0"
],
"filament_cost": [
"500"
],
@@ -98,30 +89,12 @@
"filament_is_support": [
"0"
],
"filament_loading_speed": [
"0"
],
"filament_loading_speed_start": [
"0"
],
"filament_long_retractions_when_cut": [
"nil"
],
"filament_max_volumetric_speed": [
"18"
],
"filament_minimal_purge_on_wipe_tower": [
"0"
],
"filament_multitool_ramming": [
"0"
],
"filament_multitool_ramming_flow": [
"10"
],
"filament_multitool_ramming_volume": [
"10"
],
"filament_notes": [
""
],
@@ -164,21 +137,6 @@
"filament_soluble": [
"0"
],
"filament_stamping_distance": [
"0"
],
"filament_stamping_loading_speed": [
"0"
],
"filament_toolchange_delay": [
"0"
],
"filament_unloading_speed": [
"0"
],
"filament_unloading_speed_start": [
"0"
],
"filament_vendor": [
"Elas"
],

View File

@@ -24,6 +24,9 @@
"filament_max_volumetric_speed": [
"6"
],
"filament_multitool_ramming_flow": [
"6"
],
"nozzle_temperature": [
"290"
],

View File

@@ -35,6 +35,9 @@
"filament_max_volumetric_speed": [
"8"
],
"filament_multitool_ramming_flow": [
"8"
],
"filament_vendor": [
"Elegoo"
],

View File

@@ -12,6 +12,9 @@
"filament_max_volumetric_speed": [
"10"
],
"filament_multitool_ramming_flow": [
"10"
],
"nozzle_temperature": [
"220"
],

View File

@@ -44,5 +44,8 @@
],
"filament_max_volumetric_speed": [
"10"
],
"filament_multitool_ramming_flow": [
"10"
]
}

View File

@@ -44,5 +44,8 @@
],
"filament_max_volumetric_speed": [
"8"
],
"filament_multitool_ramming_flow": [
"8"
]
}

View File

@@ -10,5 +10,8 @@
"filament_type": [
"PA-CF"
],
"filament_multitool_ramming_flow": [
"8"
],
"compatible_printers": []
}

View File

@@ -8,5 +8,8 @@
"filament_max_volumetric_speed": [
"20"
],
"filament_multitool_ramming_flow": [
"20"
],
"compatible_printers": []
}

View File

@@ -17,6 +17,9 @@
"filament_max_volumetric_speed": [
"11.5"
],
"filament_multitool_ramming_flow": [
"13"
],
"overhang_fan_speed": [
"100"
],

View File

@@ -12,6 +12,9 @@
"filament_max_volumetric_speed": [
"18"
],
"filament_multitool_ramming_flow": [
"25"
],
"slow_down_layer_time": [
"4"
],

View File

@@ -8,6 +8,9 @@
"filament_max_volumetric_speed": [
"11"
],
"filament_multitool_ramming_flow": [
"11"
],
"filament_retraction_length": [
"0.8"
],

View File

@@ -15,6 +15,9 @@
"filament_max_volumetric_speed": [
"6"
],
"filament_multitool_ramming_flow": [
"6"
],
"filament_type": [
"PP-CF"
],

View File

@@ -15,6 +15,9 @@
"filament_max_volumetric_speed": [
"6"
],
"filament_multitool_ramming_flow": [
"6"
],
"filament_type": [
"PP-GF"
],

View File

@@ -17,6 +17,9 @@
"filament_max_volumetric_speed": [
"8"
],
"filament_multitool_ramming_flow": [
"8"
],
"filament_vendor": [
"Overture"
],

View File

@@ -23,6 +23,9 @@
"filament_max_volumetric_speed": [
"7.5"
],
"filament_multitool_ramming_flow": [
"7.5"
],
"filament_vendor": [
"Valment"
],

View File

@@ -43,6 +43,12 @@
"filament_max_volumetric_speed": [
"12"
],
"filament_multitool_ramming_flow": [
"15"
],
"filament_multitool_ramming_volume": [
"10"
],
"filament_type": [
"ABS"
],

View File

@@ -43,6 +43,12 @@
"filament_max_volumetric_speed": [
"12"
],
"filament_multitool_ramming_flow": [
"12"
],
"filament_multitool_ramming_volume": [
"10"
],
"filament_type": [
"ASA"
],

View File

@@ -40,6 +40,15 @@
"filament_max_volumetric_speed": [
"8"
],
"filament_multitool_ramming": [
"0"
],
"filament_multitool_ramming_flow": [
"6"
],
"filament_multitool_ramming_volume": [
"0.1"
],
"filament_type": [
"BVOH"
],

View File

@@ -66,6 +66,12 @@
"filament_minimal_purge_on_wipe_tower": [
"15"
],
"filament_multitool_ramming": [
"1"
],
"filament_multitool_ramming_volume": [
"5"
],
"filament_retract_before_wipe": [
"nil"
],

View File

@@ -40,6 +40,9 @@
"filament_max_volumetric_speed": [
"16"
],
"filament_multitool_ramming_flow": [
"16"
],
"filament_scarf_seam_type": [
"none"
],

View File

@@ -7,6 +7,9 @@
"filament_type": [
"EVA"
],
"filament_multitool_ramming_flow": [
"12"
],
"supertack_plate_temp": [
"0"
],

View File

@@ -40,6 +40,9 @@
"filament_max_volumetric_speed": [
"8"
],
"filament_multitool_ramming_flow": [
"8"
],
"filament_type": [
"HIPS"
],

View File

@@ -43,6 +43,9 @@
"filament_max_volumetric_speed": [
"8"
],
"filament_multitool_ramming_flow": [
"12"
],
"filament_type": [
"PA"
],

View File

@@ -7,6 +7,9 @@
"filament_max_volumetric_speed": [
"12"
],
"filament_multitool_ramming_flow": [
"12"
],
"filament_type": [
"PAHT"
],

View File

@@ -85,6 +85,9 @@
"filament_max_volumetric_speed": [
"12"
],
"filament_multitool_ramming_flow": [
"16"
],
"filament_flow_ratio": [
"0.94"
]

View File

@@ -25,6 +25,9 @@
"filament_max_volumetric_speed": [
"12"
],
"filament_multitool_ramming_flow": [
"10"
],
"filament_type": [
"PCTG"
],

View File

@@ -37,6 +37,9 @@
"filament_max_volumetric_speed": [
"12"
],
"filament_multitool_ramming_flow": [
"12"
],
"filament_type": [
"PE"
],

View File

@@ -25,6 +25,9 @@
"filament_max_volumetric_speed": [
"10"
],
"filament_multitool_ramming_flow": [
"15"
],
"filament_type": [
"PETG"
],

View File

@@ -37,6 +37,9 @@
"filament_max_volumetric_speed": [
"6"
],
"filament_multitool_ramming_flow": [
"6"
],
"filament_type": [
"PHA"
],

View File

@@ -37,6 +37,9 @@
"filament_max_volumetric_speed": [
"12"
],
"filament_multitool_ramming_flow": [
"20"
],
"filament_scarf_seam_type": [
"none"
],

View File

@@ -8,6 +8,9 @@
"filament_flow_ratio": [
"0.98"
],
"filament_multitool_ramming_flow": [
"10"
],
"slow_down_layer_time": [
"8"
]

View File

@@ -37,6 +37,9 @@
"filament_max_volumetric_speed": [
"12"
],
"filament_multitool_ramming_flow": [
"12"
],
"filament_type": [
"PP"
],

View File

@@ -46,6 +46,9 @@
"filament_max_volumetric_speed": [
"8"
],
"filament_multitool_ramming_flow": [
"8"
],
"filament_type": [
"PPA-CF"
],

View File

@@ -43,6 +43,9 @@
"filament_max_volumetric_speed": [
"4"
],
"filament_multitool_ramming_flow": [
"4"
],
"filament_type": [
"PPS"
],

View File

@@ -40,6 +40,15 @@
"filament_max_volumetric_speed": [
"12"
],
"filament_multitool_ramming": [
"0"
],
"filament_multitool_ramming_flow": [
"6"
],
"filament_multitool_ramming_volume": [
"0.1"
],
"filament_soluble": [
"1"
],

View File

@@ -10,6 +10,9 @@
"filament_max_volumetric_speed": [
"12"
],
"filament_multitool_ramming_flow": [
"12"
],
"filament_type": [
"SBS"
],

View File

@@ -43,6 +43,15 @@
"filament_max_volumetric_speed": [
"3.2"
],
"filament_multitool_ramming": [
"0"
],
"filament_multitool_ramming_flow": [
"3.2"
],
"filament_multitool_ramming_volume": [
"0.1"
],
"filament_retraction_length": [
"0.4"
],

View File

@@ -17,6 +17,9 @@
"filament_max_volumetric_speed": [
"8"
],
"filament_multitool_ramming_flow": [
"8"
],
"filament_vendor": [
"eSUN"
],

View File

@@ -17,6 +17,9 @@
"filament_max_volumetric_speed": [
"8"
],
"filament_multitool_ramming_flow": [
"8"
],
"filament_vendor": [
"eSUN"
],

View File

@@ -21,6 +21,9 @@
"filament_max_volumetric_speed": [
"6"
],
"filament_multitool_ramming_flow": [
"6"
],
"filament_vendor": [
"eSUN"
],