Skip to content

feature sync 2.3.0 to main#206

Closed
LiuLikeQian wants to merge 1811 commits intomainfrom
2.3.0_to_main
Closed

feature sync 2.3.0 to main#206
LiuLikeQian wants to merge 1811 commits intomainfrom
2.3.0_to_main

Conversation

@LiuLikeQian
Copy link
Copy Markdown
Collaborator

feature sync 2.3.0 to main

LiuLikeQian and others added 30 commits January 7, 2026 19:05
fix code format for read config file data.
LiuLikeQian and others added 24 commits March 11, 2026 10:32
feature add authority for mac os
feature update flutter resource.
fix build the mac os failed question.
feature update flutter resource.
feature add profile and remove some not work code
fix modify machine and switch page bug
# Conflicts:
#	.devcontainer/devcontainer.json
#	.github/workflows/build_all.yml
#	.github/workflows/build_check_cache.yml
#	.github/workflows/build_deps.yml
#	.github/workflows/build_orca.yml
#	Build.PL
#	BuildLinux.sh
#	CMakeLists.txt
#	README.md
#	build_release.bat
#	build_release_macos.sh
#	build_release_vs2022.bat
#	cmake/modules/MacOSXBundleInfo.plist.in
#	deps/CGAL/CGAL.cmake
#	deps/CMakeLists.txt
#	deps/FREETYPE/FREETYPE.cmake
#	deps/MPFR/MPFR.cmake
#	deps/OCCT/OCCT.cmake
#	deps/OpenCV/OpenCV.cmake
#	deps/OpenVDB/OpenVDB.cmake
#	deps/TIFF/TIFF.cmake
#	deps/wxWidgets/wxWidgets.cmake
#	deps_src/mcut/include/mcut/internal/frontend.h
#	doc/Auxiliary-fan.md
#	doc/Calibration.md
#	doc/Chamber-temperature.md
#	doc/Precise-wall.md
#	doc/developer-reference/Localization_guide.md
#	doc/print_settings/speed/speed_settings_advanced.md
#	doc/printer_settings/adaptive-bed-mesh.md
#	doc/printer_settings/air-filtration.md
#	doc/semm.md
#	flatpak/io.github.softfever.OrcaSlicer.metainfo.xml
#	flatpak/io.github.softfever.OrcaSlicer.yml
#	lib/Slic3r.pm
#	localazy.json
#	localization/i18n/Snapmaker_Orca.pot
#	localization/i18n/ca/Snapmaker_Orca_ca.po
#	localization/i18n/cs/Snapmaker_Orca_cs.po
#	localization/i18n/de/Snapmaker_Orca_de.po
#	localization/i18n/en/Snapmaker_Orca_en.po
#	localization/i18n/es/Snapmaker_Orca_es.po
#	localization/i18n/fr/Snapmaker_Orca_fr.po
#	localization/i18n/hu/Snapmaker_Orca_hu.po
#	localization/i18n/it/Snapmaker_Orca_it.po
#	localization/i18n/ja/Snapmaker_Orca_ja.po
#	localization/i18n/ko/Snapmaker_Orca_ko.po
#	localization/i18n/nl/Snapmaker_Orca_nl.po
#	localization/i18n/pl/Snapmaker_Orca_pl.po
#	localization/i18n/pt_BR/Snapmaker_Orca_pt_BR.po
#	localization/i18n/ru/Snapmaker_Orca_ru.po
#	localization/i18n/sv/Snapmaker_Orca_sv.po
#	localization/i18n/tr/Snapmaker_Orca_tr.po
#	localization/i18n/uk/Snapmaker_Orca_uk.po
#	localization/i18n/zh_CN/Snapmaker_Orca_zh_CN.po
#	localization/i18n/zh_TW/Snapmaker_Orca_zh_TW.po
#	resources/profiles/Custom/Snapmaker_Orca_bed_texture.svg
#	resources/profiles/Snapmaker.json
#	resources/profiles/Snapmaker/filament/Snapmaker ABS Benchy @Dual.json
#	resources/profiles/Snapmaker/filament/Snapmaker ABS Benchy @J1.json
#	resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support @base.json
#	resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @J1.json
#	resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @base.json
#	resources/profiles/Snapmaker/filament/Snapmaker PLA Matte.json
#	resources/profiles/Snapmaker/filament/Snapmaker PLA Metal @U1 base.json
#	resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @Dual.json
#	resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @Dual.json
#	resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @J1.json
#	resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @base.json
#	resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed.json
#	resources/profiles/Snapmaker/filament/Snapmaker TPU @U1 base.json
#	resources/profiles/Snapmaker/filament/Snapmaker TPU High-Flow @Dual.json
#	resources/profiles/Snapmaker/filament/Snapmaker TPU High-Flow @J1.json
#	resources/profiles/Snapmaker/filament/fdm_filament_abs.json
#	resources/profiles/Snapmaker/filament/fdm_filament_petg.json
#	resources/profiles/Snapmaker/filament/fdm_filament_pla.json
#	resources/profiles/Snapmaker/filament/fdm_filament_pva.json
#	resources/profiles/Snapmaker/filament/fdm_filament_tpu.json
#	resources/profiles/Snapmaker/machine/fdm_common.json
#	resources/web/data/text.js
#	resources/web/guide/22/22.js
#	resources/web/guide/23/23.js
#	resources/web/guide/3/index.html
#	resources/web/guide/31/index.html
#	scripts/DockerBuild.sh
#	scripts/DockerRun.sh
#	scripts/Dockerfile
#	scripts/flatpak/entrypoint
#	scripts/flatpak/io.github.Snapmaker.Snapmaker_Orca.metainfo.xml
#	scripts/flatpak/io.github.Snapmaker.Snapmaker_Orca.yml
#	scripts/flatpak/io.github.softfever.Snapmaker_Orca.metainfo.xml
#	scripts/flatpak/io.github.softfever.Snapmaker_Orca.yml
#	scripts/run_gettext.bat
#	scripts/run_gettext.sh
#	src/CMakeLists.txt
#	src/OrcaSlicer_profile_validator.cpp
#	src/Snapmaker_Orca_app_msvc.cpp
#	src/Snapmaker_Orca_profile_validator.cpp
#	src/dev-utils/Snapmaker_Orca_profile_validator.cpp
#	src/dev-utils/platform/msw/Snapmaker_Orca-gcodeviewer.rc.in
#	src/dev-utils/platform/msw/Snapmaker_Orca.manifest.in
#	src/dev-utils/platform/msw/Snapmaker_Orca.rc.in
#	src/dev-utils/platform/unix/Snapmaker_Orca.desktop
#	src/libslic3r/AppConfig.cpp
#	src/libslic3r/AppConfig.hpp
#	src/libslic3r/GCode.hpp
#	src/libslic3r/GCode/WipeTower2.cpp
#	src/libslic3r/Model.cpp
#	src/libslic3r/PresetBundle.cpp
#	src/libslic3r/PresetBundle.hpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/libslic3r.h
#	src/libslic3r/libslic3r_version.h.in
#	src/platform/unix/BuildLinuxImage.sh.in
#	src/slic3r/CMakeLists.txt
#	src/slic3r/GUI/AboutDialog.cpp
#	src/slic3r/GUI/CreatePresetsDialog.cpp
#	src/slic3r/GUI/DesktopIntegrationDialog.cpp
#	src/slic3r/GUI/GUI.cpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/GUI_App.hpp
#	src/slic3r/GUI/GUI_Init.cpp
#	src/slic3r/GUI/GUI_ObjectList.cpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/MediaFilePanel.cpp
#	src/slic3r/GUI/MsgDialog.cpp
#	src/slic3r/GUI/NetworkTestDialog.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Preferences.cpp
#	src/slic3r/GUI/PrintHostDialogs.cpp
#	src/slic3r/GUI/ReleaseNote.cpp
#	src/slic3r/GUI/SelectMachine.cpp
#	src/slic3r/GUI/StatusPanel.cpp
#	src/slic3r/GUI/Tab.cpp
#	src/slic3r/GUI/UnsavedChangesDialog.cpp
#	src/slic3r/GUI/UpdateDialogs.cpp
#	src/slic3r/GUI/WebGuideDialog.cpp
#	src/slic3r/GUI/WebSMUserLoginDialog.cpp
#	src/slic3r/GUI/WebSMUserLoginDialog.hpp
#	src/slic3r/GUI/WebViewDialog.cpp
#	src/slic3r/GUI/WipeTowerDialog.cpp
#	src/slic3r/Utils/PresetUpdater.cpp
#	version.inc
@github-actions
Copy link
Copy Markdown

Documentation validation failed

🔗 Link Validation Errors

📄 doc/developer-reference\Built-in-placeholders-variables.md:

  • Line 93: home#process-settings - Fragment does not exist
  • Line 93: home#material-settings - Fragment does not exist

📄 doc/developer-reference\How-to-wiki.md:

  • Line 44: home#material-settings - Fragment does not exist
  • Line 45: home#process-settings - Fragment does not exist
  • Line 46: home#prepare - Fragment does not exist
  • Line 47: home#calibrations - Fragment does not exist
  • Line 50: home#process-settings - Fragment does not exist
  • Line 50: home#support-settings - Fragment does not exist
  • Line 50: home#others-settings - Fragment does not exist

📄 doc/Home.md:

  • Line 14: Precise-wall.md - File does not exist
  • Line 17: extrusion-rate-smoothing.md - File does not exist
  • Line 33: adaptive-pressure-advance.md - File does not exist

📄 doc/Tab.cpp:

  • Line 2233: fill-patterns - File does not exist
  • Line 2236: fill-patterns - File does not exist
  • Line 2417: multimaterial_settings_prime_tower#brim-chamfer - Fragment does not exist
  • Line 2418: multimaterial_settings_prime_tower#brim-chamfer-max-width - Fragment does not exist
  • Line 2443: multimaterial_settings_ooze_prevention#delta-temperature - Fragment does not exist

🖼️ Image Validation Errors

📄 doc/developer-reference\How-to-create-profiles.md:

  • Line 142: [Markdown] Alt text "Help menu" ≠ filename "go-to-configuration-folder"
  • Line 144: [Markdown] Alt text "Delete system folder" ≠ filename "profile-delete-system-folder"

@github-actions
Copy link
Copy Markdown

Documentation validation failed

🔗 Link Validation Errors

📄 doc/developer-reference\Built-in-placeholders-variables.md:

  • Line 93: home#process-settings - Fragment does not exist
  • Line 93: home#material-settings - Fragment does not exist

📄 doc/developer-reference\How-to-wiki.md:

  • Line 44: home#material-settings - Fragment does not exist
  • Line 45: home#process-settings - Fragment does not exist
  • Line 46: home#prepare - Fragment does not exist
  • Line 47: home#calibrations - Fragment does not exist
  • Line 50: home#process-settings - Fragment does not exist
  • Line 50: home#support-settings - Fragment does not exist
  • Line 50: home#others-settings - Fragment does not exist

📄 doc/Home.md:

  • Line 14: Precise-wall.md - File does not exist
  • Line 17: extrusion-rate-smoothing.md - File does not exist
  • Line 33: adaptive-pressure-advance.md - File does not exist

📄 doc/Tab.cpp:

  • Line 2233: fill-patterns - File does not exist
  • Line 2236: fill-patterns - File does not exist
  • Line 2417: multimaterial_settings_prime_tower#brim-chamfer - Fragment does not exist
  • Line 2418: multimaterial_settings_prime_tower#brim-chamfer-max-width - Fragment does not exist
  • Line 2443: multimaterial_settings_ooze_prevention#delta-temperature - Fragment does not exist

🖼️ Image Validation Errors

📄 doc/developer-reference\How-to-create-profiles.md:

  • Line 142: [Markdown] Alt text "Help menu" ≠ filename "go-to-configuration-folder"
  • Line 144: [Markdown] Alt text "Delete system folder" ≠ filename "profile-delete-system-folder"

@github-actions
Copy link
Copy Markdown

Documentation validation failed

🔗 Link Validation Errors

📄 doc/developer-reference\Built-in-placeholders-variables.md:

  • Line 93: home#process-settings - Fragment does not exist
  • Line 93: home#material-settings - Fragment does not exist

📄 doc/developer-reference\How-to-wiki.md:

  • Line 44: home#material-settings - Fragment does not exist
  • Line 45: home#process-settings - Fragment does not exist
  • Line 46: home#prepare - Fragment does not exist
  • Line 47: home#calibrations - Fragment does not exist
  • Line 50: home#process-settings - Fragment does not exist
  • Line 50: home#support-settings - Fragment does not exist
  • Line 50: home#others-settings - Fragment does not exist

📄 doc/Home.md:

  • Line 14: Precise-wall.md - File does not exist
  • Line 17: extrusion-rate-smoothing.md - File does not exist
  • Line 33: adaptive-pressure-advance.md - File does not exist

📄 doc/Tab.cpp:

  • Line 2233: fill-patterns - File does not exist
  • Line 2236: fill-patterns - File does not exist
  • Line 2417: multimaterial_settings_prime_tower#brim-chamfer - Fragment does not exist
  • Line 2418: multimaterial_settings_prime_tower#brim-chamfer-max-width - Fragment does not exist
  • Line 2443: multimaterial_settings_ooze_prevention#delta-temperature - Fragment does not exist

🖼️ Image Validation Errors

📄 doc/developer-reference\How-to-create-profiles.md:

  • Line 142: [Markdown] Alt text "Help menu" ≠ filename "go-to-configuration-folder"
  • Line 144: [Markdown] Alt text "Delete system folder" ≠ filename "profile-delete-system-folder"

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants