juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 02:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into dev/h2d

Browse Source 
# Conflicts:
#	resources/profiles/BBL.json
#	src/slic3r/GUI/AmsMappingPopup.cpp
#	src/slic3r/GUI/MediaFilePanel.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/StatusPanel.cpp
This commit is contained in:
Noisyfox
2025-09-16 11:27:44 +08:00
parent e7e6405ad3 1e87666487
commit 2375ab860a
6267 changed files with 210560 additions and 178856 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,7 +82,7 @@ const std::string& shortkey_ctrl_prefix()
{
static const std::string str =
#ifdef __APPLE__
"⌘+"
u8"\u2318+" // "⌘+" (Mac Command+)
#else
_u8L("Ctrl+")
#endif
@@ -94,9 +94,9 @@ const std::string& shortkey_alt_prefix()
{
static const std::string str =
#ifdef __APPLE__
"⌥+"
u8"\u2325+" // "⌥+" (Mac Option+)
#else
"Alt+"
_u8L("Alt+")
#endif
;
return str;