mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-09 10:16:50 +00:00
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:
@@ -19,7 +19,6 @@
|
||||
"enable_pressure_advance": [
|
||||
"1"
|
||||
],
|
||||
"extruder_rotation_volume": "624",
|
||||
"fan_cooling_layer_time": [
|
||||
"100"
|
||||
],
|
||||
@@ -95,13 +94,6 @@
|
||||
"hot_plate_temp_initial_layer": [
|
||||
"75"
|
||||
],
|
||||
"mixing_stepper_rotation_volume": "8000",
|
||||
"multi_zone_1_initial_layer": "240",
|
||||
"multi_zone_1_temperature": "240",
|
||||
"multi_zone_2_initial_layer": "240",
|
||||
"multi_zone_2_temperature": "240",
|
||||
"multi_zone_3_initial_layer": "220",
|
||||
"multi_zone_3_temperature": "220",
|
||||
"nozzle_temperature_range_high": [
|
||||
"260"
|
||||
],
|
||||
|
||||
@@ -19,7 +19,6 @@
|
||||
"enable_pressure_advance": [
|
||||
"1"
|
||||
],
|
||||
"extruder_rotation_volume": "456",
|
||||
"fan_cooling_layer_time": [
|
||||
"100"
|
||||
],
|
||||
@@ -95,13 +94,6 @@
|
||||
"hot_plate_temp_initial_layer": [
|
||||
"50"
|
||||
],
|
||||
"mixing_stepper_rotation_volume": "8000",
|
||||
"multi_zone_1_initial_layer": "200",
|
||||
"multi_zone_1_temperature": "200",
|
||||
"multi_zone_2_initial_layer": "200",
|
||||
"multi_zone_2_temperature": "200",
|
||||
"multi_zone_3_initial_layer": "200",
|
||||
"multi_zone_3_temperature": "200",
|
||||
"nozzle_temperature_range_high": [
|
||||
"220"
|
||||
],
|
||||
|
||||
@@ -69,7 +69,7 @@
|
||||
"12",
|
||||
"12"
|
||||
],
|
||||
"machine_start_gcode": "START_PRINT BED_TEMPERATURE=[bed_temperature_initial_layer] KAMP_LEVELING=1 EXTRUDER_ROTATION_VOLUME={extruder_rotation_volume[0]} MIXING_STEPPER_ROTATION_VOLUME={mixing_stepper_rotation_volume[0]} PURGE_LAYER_HEIGHT=2 PURGE_PARKING_SPEED=10000 PURGE_LENGHT=500 PURGE_SPEED=500 PURGE_MATERIAL_QUANTITY=10000 EXTRUDER_TEMPERATURE=[nozzle_temperature] EXTRUDER_TEMPERATURE_INITIAL_LAYER=[nozzle_temperature_initial_layer] PRESSURE_ADVANCE=0.2 PRESSURE_ADVANCE_SMOOTH_TIME=0.5 ZONE_1_TEMPERATURE={multi_zone_1_initial_layer[0]} ZONE_2_TEMPERATURE={multi_zone_2_initial_layer[0]} ZONE_3_TEMPERATURE={multi_zone_3_initial_layer[0]}",
|
||||
"machine_start_gcode": "START_PRINT BED_TEMPERATURE=[bed_temperature_initial_layer] KAMP_LEVELING=1 PURGE_LAYER_HEIGHT=2 PURGE_PARKING_SPEED=10000 PURGE_LENGHT=500 PURGE_SPEED=500 PURGE_MATERIAL_QUANTITY=10000 EXTRUDER_TEMPERATURE=[nozzle_temperature] EXTRUDER_TEMPERATURE_INITIAL_LAYER=[nozzle_temperature_initial_layer] PRESSURE_ADVANCE=0.2 PRESSURE_ADVANCE_SMOOTH_TIME=0.5",
|
||||
"print_host": "G1OS.local",
|
||||
"printer_model": "Ginger G1",
|
||||
"retract_before_wipe": [
|
||||
@@ -98,12 +98,5 @@
|
||||
"z_hop_types": [
|
||||
"Normal Lift"
|
||||
],
|
||||
"pellet_modded_printer": "1",
|
||||
"use_extruder_rotation_volume": "1",
|
||||
"use_active_pellet_feeding": "1",
|
||||
"multi_zone": "1",
|
||||
"multi_zone_number": "3",
|
||||
"active_feeder_motor_name": [
|
||||
"mixing_stepper"
|
||||
]
|
||||
"pellet_modded_printer": "1"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user