Merged 2.5.0-beta1 into master (NO CONFLICTS FIXED)
This commit is contained in:
commit
bce2b148f4
99 changed files with 22989 additions and 14036 deletions
|
@ -80,7 +80,7 @@ void KBShortcutsDialog::fill_shortcuts()
|
|||
{ ctrl + alt + "S", L("Save project as (3mf)") },
|
||||
{ ctrl + "R", L("(Re)slice") },
|
||||
// File>Import
|
||||
{ ctrl + "I", L("Import STL/OBJ/AMF/3MF without config, keep plater") },
|
||||
{ ctrl + "I", L("Import STL/OBJ/AMF/3MF/STEP without config, keep plater") },
|
||||
{ ctrl + "L", L("Import Config from ini/amf/3mf/gcode") },
|
||||
{ ctrl + alt + "L", L("Load Config from ini/amf/3mf/gcode and merge") },
|
||||
// File>Export
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue