juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-06-12 23:13:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge: Snapmaker Orca 2.1.2

Browse Source
This commit is contained in:
xiaoyeliu
2025-11-17 10:04:25 +08:00
parent 737948be1f
commit e89263e51a
1147 changed files with 668188 additions and 15290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/GUI.cpp
View File

@@ -27,6 +27,7 @@
#include "format.hpp"
#include "WebUserLoginDialog.hpp"
#include "WebSMUserLoginDialog.hpp"
#include "libslic3r/Print.hpp"
@@ -344,7 +345,7 @@ static void add_config_substitutions(const ConfigSubstitutions& conf_substitutio
static wxString substitution_message(const wxString& changes)
{
return
_L("The configuration may be generated by a newer version of OrcaSlicer.") + " " +
_L("The configuration may be generated by a newer version of Snapmaker Orca.") + " " +
_L("Some values have been replaced. Please check them:") + "\n" + changes + "\n";
}
@@ -499,7 +500,8 @@ void login()
//LoginDialog dlg;
//dlg.ShowModal();
ZUserLogin dlg;
// ZUserLogin dlg;
SMUserLogin dlg;
dlg.run();
}