mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-08-05 01:02:08 +00:00
Merge origin/main into feature/protobuf_config_and_dynamic_ui
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.
This commit is contained in:
@@ -161,6 +161,12 @@ modules:
|
||||
- /include
|
||||
- "*.a"
|
||||
- "*.la"
|
||||
# CPython headers: useless at runtime (no compiler in the runtime
|
||||
# sandbox, so C-extension source builds can't happen anyway), and a
|
||||
# few MB of bloat. /app/libpython is installed by this module, so the
|
||||
# entry must live in THIS module's cleanup (module-level cleanup only
|
||||
# matches files the module itself installed).
|
||||
- /libpython/include
|
||||
|
||||
sources:
|
||||
# OrcaSlicer deps/ directory (avoids copying .git from worktree)
|
||||
@@ -294,6 +300,18 @@ modules:
|
||||
sha256: 1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277
|
||||
dest: external-packages/OpenCV
|
||||
|
||||
# CPython 3.12.13
|
||||
- type: file
|
||||
url: https://www.python.org/ftp/python/3.12.13/Python-3.12.13.tar.xz
|
||||
sha256: c08bc65a81971c1dd5783182826503369466c7e67374d1646519adf05207b684
|
||||
dest: external-packages/python3
|
||||
|
||||
# wxInspector 1.0.0
|
||||
- type: file
|
||||
url: https://github.com/Noisyfox/wxInspector/archive/refs/tags/v1.0.0.zip
|
||||
sha256: 0ba163956f2d468b19a91b96c5aba66ee9610843ea41dda628ea44cdafde7db7
|
||||
dest: external-packages/wxInspector
|
||||
|
||||
# ---------------------------------------------------------------
|
||||
# Fallback archives for deps normally provided by the GNOME SDK.
|
||||
# These are only used if find_package() fails to locate them.
|
||||
|
||||
Reference in New Issue
Block a user