juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-30 12:21:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #46 from Snapmaker/2.2.0-dev

Browse Source 
Fix login url in region "cn" & Fix import 3mf
This commit is contained in:
xiaoyeliu
2025-11-27 17:09:30 +08:00
committed by GitHub
parent e51d4ad563 06362b69f1
commit ede7388004
2 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/slic3r/GUI/GUI_App.cpp
+5 -2
View File
@@ -525,10 +525,13 @@ static const FileWildcards file_wildcards_by_type[FT_SIZE] = {
/* FT_OBJ */ {"OBJ files"sv, {".obj"sv}}, /* FT_OBJ */ {"OBJ files"sv, {".obj"sv}},
/* FT_AMF */ {"AMF files"sv, {".amf"sv, ".zip.amf"sv, ".xml"sv}}, /* FT_AMF */ {"AMF files"sv, {".amf"sv, ".zip.amf"sv, ".xml"sv}},
/* FT_3MF */ {"3MF files"sv, {".3mf"sv}}, /* FT_3MF */ {"3MF files"sv, {".3mf"sv}},
/* FT_GCODE */ { "G-code files"sv, { ".gcode"sv, ".3mf"sv } }, /* FT_GCODE_3MF */ {"Gcode 3MF files"sv, {".gcode.3mf"sv}},
/* FT_GCODE */ {"G-code files"sv, {".gcode"sv}},
#ifdef __APPLE__ #ifdef __APPLE__
/* FT_MODEL */ /* FT_MODEL */
{"Supported files"sv, {".3mf"sv, ".stl"sv, ".oltp"sv, ".stp"sv, ".step"sv, ".svg"sv, ".amf"sv, ".obj"sv, ".usd"sv, ".usda"sv, ".usdc"sv, ".usdz"sv, ".abc"sv, ".ply"sv}}, {"Supported files"sv,
{".3mf"sv, ".stl"sv, ".oltp"sv, ".stp"sv, ".step"sv, ".svg"sv, ".amf"sv, ".obj"sv, ".usd"sv, ".usda"sv, ".usdc"sv, ".usdz"sv, ".abc"sv,
".ply"sv}},
#else #else
/* FT_MODEL */ /* FT_MODEL */
{"Supported files"sv, {".3mf"sv, ".stl"sv, ".oltp"sv, ".stp"sv, ".step"sv, ".svg"sv, ".amf"sv, ".obj"sv}}, {"Supported files"sv, {".3mf"sv, ".stl"sv, ".oltp"sv, ".stp"sv, ".step"sv, ".svg"sv, ".amf"sv, ".obj"sv}},
src/slic3r/GUI/WebSMUserLoginDialog.cpp
+3 -3
View File
@@ -51,9 +51,9 @@ SMUserLogin::SMUserLogin(bool isLogout) : wxDialog((wxWindow *) (wxGetApp().main
m_userInfoUrl = "https://account.snapmaker.com/api/common/accounts/current"; m_userInfoUrl = "https://account.snapmaker.com/api/common/accounts/current";
m_home_url = "https://www.snapmaker.com/"; m_home_url = "https://www.snapmaker.com/";
} else { } else {
TargetUrl = "https://pre.id.snapmaker.cn?from=orca"; TargetUrl = "https://id.snapmaker.cn?from=orca";
LogoutUrl = "https://pre.id.snapmaker.cn/logout?from=orca"; LogoutUrl = "https://id.snapmaker.cn/logout?from=orca";
m_hostUrl = "https://pre.id.snapmaker.cn"; m_hostUrl = "https://id.snapmaker.cn";
m_accountUrl = "https://api.snapmaker.cn"; m_accountUrl = "https://api.snapmaker.cn";
m_userInfoUrl = "https://api.snapmaker.cn/api/common/accounts/current"; m_userInfoUrl = "https://api.snapmaker.cn/api/common/accounts/current";
m_home_url = "https://www.snapmaker.cn/"; m_home_url = "https://www.snapmaker.cn/";