mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-08-04 16:52:29 +00:00
571819bfb2
Resolve the 4 proto-refactored conflicts (Preset.cpp, Print.cpp, PrintConfig.cpp, Tab.cpp) by keeping the branch's generated-include versions; auto-merged non-conflict changes from main are preserved. Reconcile main's new settings into the proto schema. main added 52 new active init_fff_params settings not present in the proto; ported them all (type/label/tooltip/default/enum/preset) into print/filament/printer.proto so the config registers, profiles load, and the GUI does not crash on missing defs. Added GuiType.plugin_picker to config_metadata.proto and regenerated config_metadata_pb2.py. Codegen: run_codegen validate PASSED (712 fields). UI layout (layout.yaml placement) for the 52 new settings is a follow-up; they are registered and serialized but not yet placed in GUI tabs.