mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-10 10:47:16 +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.
176 lines
2.6 KiB
JSON
176 lines
2.6 KiB
JSON
{
|
|
"type": "filament",
|
|
"name": "re3D PC @0.8 nozzle",
|
|
"from": "system",
|
|
"instantiation": "true",
|
|
"inherits": "fdm_filament_pc",
|
|
"filament_id": "OFU3QXL7",
|
|
"setting_id": "YVPbVSiVCzjp5ynf",
|
|
"filament_settings_id": [
|
|
"re3D PC @0.8 nozzle"
|
|
],
|
|
"filament_type": [
|
|
"PC"
|
|
],
|
|
"compatible_printers": [
|
|
"re3D Gigabot 4 0.8 nozzle",
|
|
"re3D Gigabot 4 XLT 0.8 nozzle",
|
|
"re3D Terabot 4 0.8 nozzle"
|
|
],
|
|
"filament_vendor": [
|
|
"re3D"
|
|
],
|
|
"filament_density": [
|
|
"1.19"
|
|
],
|
|
"filament_diameter": [
|
|
"2.85"
|
|
],
|
|
"filament_flow_ratio": [
|
|
"0.99"
|
|
],
|
|
"filament_max_volumetric_speed": [
|
|
"11.5"
|
|
],
|
|
"nozzle_temperature": [
|
|
"265"
|
|
],
|
|
"nozzle_temperature_initial_layer": [
|
|
"265"
|
|
],
|
|
"nozzle_temperature_range_low": [
|
|
"250"
|
|
],
|
|
"nozzle_temperature_range_high": [
|
|
"270"
|
|
],
|
|
"hot_plate_temp": [
|
|
"115"
|
|
],
|
|
"hot_plate_temp_initial_layer": [
|
|
"113"
|
|
],
|
|
"cool_plate_temp": [
|
|
"115"
|
|
],
|
|
"cool_plate_temp_initial_layer": [
|
|
"113"
|
|
],
|
|
"eng_plate_temp": [
|
|
"115"
|
|
],
|
|
"eng_plate_temp_initial_layer": [
|
|
"113"
|
|
],
|
|
"textured_plate_temp": [
|
|
"115"
|
|
],
|
|
"textured_plate_temp_initial_layer": [
|
|
"113"
|
|
],
|
|
"fan_max_speed": [
|
|
"80"
|
|
],
|
|
"fan_min_speed": [
|
|
"30"
|
|
],
|
|
"fan_cooling_layer_time": [
|
|
"20"
|
|
],
|
|
"close_fan_the_first_x_layers": [
|
|
"2"
|
|
],
|
|
"overhang_fan_threshold": [
|
|
"50%"
|
|
],
|
|
"overhang_fan_speed": [
|
|
"40"
|
|
],
|
|
"enable_overhang_bridge_fan": [
|
|
"1"
|
|
],
|
|
"slow_down_for_layer_cooling": [
|
|
"1"
|
|
],
|
|
"slow_down_layer_time": [
|
|
"30"
|
|
],
|
|
"slow_down_min_speed": [
|
|
"30"
|
|
],
|
|
"pressure_advance": [
|
|
"0.096"
|
|
],
|
|
"enable_pressure_advance": [
|
|
"1"
|
|
],
|
|
"reduce_fan_stop_start_freq": [
|
|
"0"
|
|
],
|
|
"filament_retraction_length": [
|
|
"0.8"
|
|
],
|
|
"filament_soluble": [
|
|
"0"
|
|
],
|
|
"support_material_interface_fan_speed": [
|
|
"100"
|
|
],
|
|
"filament_multitool_ramming": [
|
|
"1"
|
|
],
|
|
"filament_multitool_ramming_volume": [
|
|
"20"
|
|
],
|
|
"filament_multitool_ramming_flow": [
|
|
"10.5"
|
|
],
|
|
"filament_minimal_purge_on_wipe_tower": [
|
|
"15"
|
|
],
|
|
"filament_tower_interface_pre_extrusion_dist": [
|
|
"0"
|
|
],
|
|
"filament_tower_interface_pre_extrusion_length": [
|
|
"0"
|
|
],
|
|
"filament_tower_ironing_area": [
|
|
"0"
|
|
],
|
|
"filament_tower_interface_purge_volume": [
|
|
"0"
|
|
],
|
|
"filament_tower_interface_print_temp": [
|
|
"0"
|
|
],
|
|
"filament_loading_speed_start": [
|
|
"0"
|
|
],
|
|
"filament_loading_speed": [
|
|
"0"
|
|
],
|
|
"filament_unloading_speed_start": [
|
|
"0"
|
|
],
|
|
"filament_unloading_speed": [
|
|
"0"
|
|
],
|
|
"filament_toolchange_delay": [
|
|
"0"
|
|
],
|
|
"filament_cooling_moves": [
|
|
"0"
|
|
],
|
|
"filament_cooling_initial_speed": [
|
|
"0"
|
|
],
|
|
"filament_cooling_final_speed": [
|
|
"0"
|
|
],
|
|
"filament_stamping_loading_speed": [
|
|
"0"
|
|
],
|
|
"filament_stamping_distance": [
|
|
"0"
|
|
]
|
|
} |