Closed
Conversation
fix build fail bug.
fix code format for read config file data.
…rver fail show the error dialog.
…Slicer into dev_upgrade_alves
feature update version info
feature add authority for mac os
…tect for some logic.
fix add protect for some logic
feature code format.
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
|
❌ Documentation validation failed 🔗 Link Validation Errors📄 doc/developer-reference\Built-in-placeholders-variables.md:
📄 doc/developer-reference\How-to-wiki.md:
📄 doc/Home.md:
📄 doc/Tab.cpp:
🖼️ Image Validation Errors📄 doc/developer-reference\How-to-create-profiles.md:
|
|
❌ Documentation validation failed 🔗 Link Validation Errors📄 doc/developer-reference\Built-in-placeholders-variables.md:
📄 doc/developer-reference\How-to-wiki.md:
📄 doc/Home.md:
📄 doc/Tab.cpp:
🖼️ Image Validation Errors📄 doc/developer-reference\How-to-create-profiles.md:
|
|
❌ Documentation validation failed 🔗 Link Validation Errors📄 doc/developer-reference\Built-in-placeholders-variables.md:
📄 doc/developer-reference\How-to-wiki.md:
📄 doc/Home.md:
📄 doc/Tab.cpp:
🖼️ Image Validation Errors📄 doc/developer-reference\How-to-create-profiles.md:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
feature sync 2.3.0 to main