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

@@ -2,6 +2,7 @@
"type": "machine",
"name": "RatRig V-Core 4 300 0.8 nozzle",
"inherits": "fdm_klipper_common",
"default_print_profile": "0.30mm Big @RatRig V-Core 4 0.8",
"from": "system",
"setting_id": "feTeGuFkLzWFFSC4",
"instantiation": "true",

View File

@@ -2,6 +2,7 @@
"type": "machine",
"name": "RatRig V-Core 4 400 0.8 nozzle",
"inherits": "fdm_klipper_common",
"default_print_profile": "0.30mm Big @RatRig V-Core 4 0.8",
"from": "system",
"setting_id": "DQ7Lzsuk87A4qtav",
"instantiation": "true",

View File

@@ -2,6 +2,7 @@
"type": "machine",
"name": "RatRig V-Core 4 500 0.8 nozzle",
"inherits": "fdm_klipper_common",
"default_print_profile": "0.30mm Big @RatRig V-Core 4 0.8",
"from": "system",
"setting_id": "VMKIyofeEpPvUvkY",
"instantiation": "true",

View File

@@ -0,0 +1,67 @@
{
"type": "process",
"name": "0.30mm Big @RatRig V-Core 4 0.8",
"inherits": "fdm_process_ratrig_common",
"from": "system",
"setting_id": "2tM04aSQ8NcTsmQo",
"instantiation": "true",
"layer_height": "0.3",
"inital_layer_height": "0.35",
"wall_count": "3",
"top_shell_layers": "4",
"bottom_shell_layers": "3",
"top_shell_thickness": "0",
"sparse_infill_density": "25%",
"infill_anchor": "600%",
"infill_anchor_max": "5",
"infill_combination": "1",
"skirt_loops": "2",
"skirt_distance": "10",
"support_threshold_angle": "65",
"support_bottom_z_distance": "0.2",
"support_on_build_plate_only": "1",
"support_object_xy_distance": "60%",
"inner_wall_speed": "300",
"small_perimeter_speed": "250",
"outer_wall_speed": "250",
"sparse_infill_speed": "400",
"internal_solid_infill_speed": "100%",
"top_surface_speed": "100%",
"support_speed": "50",
"support_interface_speed": "100%",
"bridge_speed": "50",
"gap_infill_speed": "200",
"travel_speed": "600",
"initial_layer_speed": "80",
"enable_overhang_speed": "1",
"overhang_1_4_speed": "20",
"overhang_2_4_speed": "45",
"overhang_3_4_speed": "80",
"overhang_4_4_speed": "100",
"outer_wall_acceleration": "8000",
"inner_wall_acceleration": "10000",
"top_surface_acceleration": "0",
"internal_solid_infill_acceleration": "0",
"sparse_infill_acceleration": "15000",
"bridge_acceleration": "5000",
"initial_layer_acceleration": "2500",
"travel_acceleration": "15000",
"default_acceleration": "15000",
"line_width": "0.75",
"initial_layer_line_width": "1.1",
"inner_wall_line_width": "0.75",
"outer_wall_line_width": "0.70",
"sparse_infill_line_width": "0.75",
"internal_solid_infill_line_width": "0.75",
"top_surface_line_width": "0.75",
"support_line_width": "0.75",
"infill_wall_overlap": "18%",
"bridge_flow": "0.85",
"resolution": "0.0125",
"elefant_foot_compensation": "0.1",
"compatible_printers": [
"RatRig V-Core 4 300 0.8 nozzle",
"RatRig V-Core 4 400 0.8 nozzle",
"RatRig V-Core 4 500 0.8 nozzle"
]
}