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.
286 lines
4.3 KiB
JSON
286 lines
4.3 KiB
JSON
{
|
|
"type": "filament",
|
|
"name": "Snapmaker PLA Matte @U1",
|
|
"inherits": "Snapmaker PLA @U1 base",
|
|
"from": "system",
|
|
"setting_id": "uAhykL5ap1DAKacf",
|
|
"filament_id": "OFF9cgY5",
|
|
"instantiation": "true",
|
|
"compatible_printers": [
|
|
"Snapmaker U1 (0.4 nozzle)"
|
|
],
|
|
"activate_air_filtration": [
|
|
"0"
|
|
],
|
|
"activate_chamber_temp_control": [
|
|
"0"
|
|
],
|
|
"adaptive_pressure_advance": [
|
|
"0"
|
|
],
|
|
"adaptive_pressure_advance_bridges": [
|
|
"0"
|
|
],
|
|
"adaptive_pressure_advance_model": [
|
|
"0,0,0\n0,0,0"
|
|
],
|
|
"adaptive_pressure_advance_overhangs": [
|
|
"0"
|
|
],
|
|
"additional_cooling_fan_speed": [
|
|
"80"
|
|
],
|
|
"chamber_temperature": [
|
|
"0"
|
|
],
|
|
"close_fan_the_first_x_layers": [
|
|
"1"
|
|
],
|
|
"compatible_printers_condition": "",
|
|
"compatible_prints": [],
|
|
"compatible_prints_condition": "",
|
|
"complete_print_exhaust_fan_speed": [
|
|
"70"
|
|
],
|
|
"cool_plate_temp": [
|
|
"60"
|
|
],
|
|
"cool_plate_temp_initial_layer": [
|
|
"60"
|
|
],
|
|
"dont_slow_down_outer_wall": [
|
|
"0"
|
|
],
|
|
"during_print_exhaust_fan_speed": [
|
|
"70"
|
|
],
|
|
"enable_overhang_bridge_fan": [
|
|
"1"
|
|
],
|
|
"enable_pressure_advance": [
|
|
"0"
|
|
],
|
|
"eng_plate_temp": [
|
|
"60"
|
|
],
|
|
"eng_plate_temp_initial_layer": [
|
|
"60"
|
|
],
|
|
"fan_cooling_layer_time": [
|
|
"100"
|
|
],
|
|
"fan_max_speed": [
|
|
"100"
|
|
],
|
|
"fan_min_speed": [
|
|
"100"
|
|
],
|
|
"filament_cooling_final_speed": [
|
|
"3.5"
|
|
],
|
|
"filament_cooling_initial_speed": [
|
|
"10"
|
|
],
|
|
"filament_cooling_moves": [
|
|
"2"
|
|
],
|
|
"filament_cost": [
|
|
"25.4"
|
|
],
|
|
"filament_density": [
|
|
"1.32"
|
|
],
|
|
"filament_deretraction_speed": [
|
|
"nil"
|
|
],
|
|
"filament_diameter": [
|
|
"1.75"
|
|
],
|
|
"filament_end_gcode": [
|
|
"; filament end gcode \n"
|
|
],
|
|
"filament_flow_ratio": [
|
|
"1"
|
|
],
|
|
"filament_is_support": [
|
|
"0"
|
|
],
|
|
"filament_loading_speed": [
|
|
"10"
|
|
],
|
|
"filament_loading_speed_start": [
|
|
"50"
|
|
],
|
|
"filament_long_retractions_when_cut": [
|
|
"nil"
|
|
],
|
|
"filament_max_volumetric_speed": [
|
|
"22"
|
|
],
|
|
"filament_minimal_purge_on_wipe_tower": [
|
|
"15"
|
|
],
|
|
"filament_multitool_ramming": [
|
|
"1"
|
|
],
|
|
"filament_multitool_ramming_flow": [
|
|
"40"
|
|
],
|
|
"filament_multitool_ramming_volume": [
|
|
"5"
|
|
],
|
|
"filament_notes": [
|
|
""
|
|
],
|
|
"filament_ramming_parameters": [
|
|
"120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6"
|
|
],
|
|
"filament_retract_before_wipe": [
|
|
"nil"
|
|
],
|
|
"filament_retract_length_toolchange": [
|
|
"5"
|
|
],
|
|
"filament_retract_lift_above": [
|
|
"nil"
|
|
],
|
|
"filament_retract_lift_below": [
|
|
"nil"
|
|
],
|
|
"filament_retract_lift_enforce": [
|
|
"nil"
|
|
],
|
|
"filament_retract_restart_extra": [
|
|
"nil"
|
|
],
|
|
"filament_retract_when_changing_layer": [
|
|
"nil"
|
|
],
|
|
"filament_retraction_distances_when_cut": [
|
|
"nil"
|
|
],
|
|
"filament_retraction_length": [
|
|
"nil"
|
|
],
|
|
"filament_retraction_minimum_travel": [
|
|
"nil"
|
|
],
|
|
"filament_retraction_speed": [
|
|
"nil"
|
|
],
|
|
"filament_shrink": [
|
|
"100%"
|
|
],
|
|
"filament_shrinkage_compensation_z": [
|
|
"100%"
|
|
],
|
|
"filament_soluble": [
|
|
"0"
|
|
],
|
|
"filament_stamping_distance": [
|
|
"45"
|
|
],
|
|
"filament_stamping_loading_speed": [
|
|
"29"
|
|
],
|
|
"filament_start_gcode": [
|
|
"; filament start gcode\n"
|
|
],
|
|
"filament_toolchange_delay": [
|
|
"0"
|
|
],
|
|
"filament_type": [
|
|
"PLA"
|
|
],
|
|
"filament_unloading_speed": [
|
|
"100"
|
|
],
|
|
"filament_unloading_speed_start": [
|
|
"100"
|
|
],
|
|
"filament_vendor": [
|
|
"Snapmaker"
|
|
],
|
|
"filament_wipe": [
|
|
"nil"
|
|
],
|
|
"filament_wipe_distance": [
|
|
"nil"
|
|
],
|
|
"filament_z_hop": [
|
|
"nil"
|
|
],
|
|
"filament_z_hop_types": [
|
|
"nil"
|
|
],
|
|
"full_fan_speed_layer": [
|
|
"0"
|
|
],
|
|
"hot_plate_temp": [
|
|
"65"
|
|
],
|
|
"hot_plate_temp_initial_layer": [
|
|
"65"
|
|
],
|
|
"idle_temperature": [
|
|
"0"
|
|
],
|
|
"nozzle_temperature": [
|
|
"215"
|
|
],
|
|
"nozzle_temperature_initial_layer": [
|
|
"215"
|
|
],
|
|
"nozzle_temperature_range_high": [
|
|
"240"
|
|
],
|
|
"nozzle_temperature_range_low": [
|
|
"190"
|
|
],
|
|
"overhang_fan_speed": [
|
|
"100"
|
|
],
|
|
"overhang_fan_threshold": [
|
|
"50%"
|
|
],
|
|
"pellet_flow_coefficient": [
|
|
"0.4157"
|
|
],
|
|
"pressure_advance": [
|
|
"0.02"
|
|
],
|
|
"reduce_fan_stop_start_freq": [
|
|
"1"
|
|
],
|
|
"required_nozzle_HRC": [
|
|
"0"
|
|
],
|
|
"slow_down_for_layer_cooling": [
|
|
"1"
|
|
],
|
|
"slow_down_layer_time": [
|
|
"4"
|
|
],
|
|
"slow_down_min_speed": [
|
|
"20"
|
|
],
|
|
"support_material_interface_fan_speed": [
|
|
"-1"
|
|
],
|
|
"temperature_vitrification": [
|
|
"45"
|
|
],
|
|
"textured_cool_plate_temp": [
|
|
"40"
|
|
],
|
|
"textured_cool_plate_temp_initial_layer": [
|
|
"40"
|
|
],
|
|
"textured_plate_temp": [
|
|
"65"
|
|
],
|
|
"textured_plate_temp_initial_layer": [
|
|
"65"
|
|
]
|
|
}
|