3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into pm_support_spots_generator

Browse source
This commit is contained in:
PavelMikus 2022-09-07 17:18:02 +02:00
commit 3202756d22
46 changed files with 15821 additions and 15754 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2230
resources/localization/PrusaSlicer.pot
View file

File diff suppressed because it is too large Load diff

BIN
resources/localization/ca/PrusaSlicer.mo
View file

Binary file not shown.

2343
resources/localization/ca/PrusaSlicer_ca.po
View file

File diff suppressed because it is too large Load diff

BIN
resources/localization/cs/PrusaSlicer.mo
View file

Binary file not shown.

18
resources/localization/cs/PrusaSlicer_cs.po
View file

@ -2135,8 +2135,8 @@ msgid "Choose one or more files (STL, OBJ):"
msgstr "Vyberte jeden nebo více souborů (STL, OBJ):"
#: src/slic3r/GUI/GUI_App.cpp:1870
msgid "Choose one or more files (STL/OBJ/AMF/3MF/PRUSA):"
msgstr "Vyberte jeden nebo více souborů (STL/OBJ/AMF/3MF/PRUSA):"
msgid "Choose one or more files (STL/3MF/STEP/OBJ/AMF/PRUSA):"
msgstr "Vyberte jeden nebo více souborů (STL/3MF/STEP/OBJ/AMF/PRUSA):"
#: src/slic3r/GUI/ConfigWizard.cpp:1361
msgid "Choose the type of firmware used by your printer."
@ -6044,12 +6044,13 @@ msgid "Import STL (Imperial Units)"
msgstr "Importovat STL (imperiální jednotky)"
#: src/slic3r/GUI/MainFrame.cpp:1208
msgid "Import STL/OBJ/AM&F/3MF"
msgstr "Importovat STL/OBJ/AM&F/3MF"
msgid "Import STL/3MF/STEP/OBJ/AM&F"
msgstr "Importovat STL/3MF/STEP/OBJ/AM&F"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:83
msgid "Import STL/OBJ/AMF/3MF without config, keep plater"
msgstr "Importovat STL/OBJ/AMF/3MF bez konfigurace, zachová stávající podložku"
msgid "Import STL/3MF/STEP/OBJ/AMF without config, keep plater"
msgstr ""
"Importovat STL/3MF/STEP/OBJ/AMF bez konfigurace, zachová stávající podložku"
#: src/slic3r/GUI/Plater.cpp:5293
msgid "Import config only"
@ -8227,9 +8228,8 @@ msgid "Open new instance"
msgstr "Otevřít novou instanci"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:78
msgid "Open project STL/OBJ/AMF/3MF with config, clear plater"
msgstr ""
"Otevřít projekt STL/OBJ/AMF/3MF s konfigurací, odstranit modely na podložce"
msgid "Open project AMF/3MF with config, clear plater"
msgstr "Otevřít projekt AMF/3MF s konfigurací, odstranit modely na podložce"
#: src/slic3r/GUI/MainFrame.cpp:1082
#, c-format, boost-format

BIN
resources/localization/de/PrusaSlicer.mo
View file

Binary file not shown.

16
resources/localization/de/PrusaSlicer_de.po
View file

@ -2130,8 +2130,8 @@ msgid "Choose one or more files (STL, OBJ):"
msgstr "Wählen Sie eine oder mehrere Dateien (STL, OBJ):"
#: src/slic3r/GUI/GUI_App.cpp:1870
msgid "Choose one or more files (STL/OBJ/AMF/3MF/PRUSA):"
msgstr "Wählen Sie eine oder mehrere Dateien (STL/OBJ/AMF/3MF/PRUSA):"
msgid "Choose one or more files (STL/3MF/STEP/OBJ/AMF/PRUSA):"
msgstr "Wählen Sie eine oder mehrere Dateien (STL/3MF/STEP/OBJ/AMF/PRUSA):"
#: src/slic3r/GUI/ConfigWizard.cpp:1361
msgid "Choose the type of firmware used by your printer."
@ -6141,13 +6141,13 @@ msgid "Import STL (Imperial Units)"
msgstr "STL importieren (imperiale Einheiten)"
#: src/slic3r/GUI/MainFrame.cpp:1208
msgid "Import STL/OBJ/AM&F/3MF"
msgstr "Importiere STL/OBJ/AM&F/3MF"
msgid "Import STL/3MF/STEP/OBJ/AM&F"
msgstr "Importiere STL/3MF/STEP/OBJ/AM&F"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:83
msgid "Import STL/OBJ/AMF/3MF without config, keep plater"
msgid "Import STL/3MF/STEP/OBJ/AMF without config, keep plater"
msgstr ""
"Importiere STL/OBJ/AMF/3MF mit Konfigurationsdaten, Druckplatte beibehalten"
"Importiere STL/3MF/STEP/OBJ/AMF mit Konfigurationsdaten, Druckplatte beibehalten"
#: src/slic3r/GUI/Plater.cpp:5293
msgid "Import config only"
@ -8357,8 +8357,8 @@ msgid "Open new instance"
msgstr "Neue Instanz öffnen"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:78
msgid "Open project STL/OBJ/AMF/3MF with config, clear plater"
msgstr "Öffne Projekt STL/OBJ/AMF/3MF mit Konfiguration, Druckplatte leeren"
msgid "Open project AMF/3MF with config, clear plater"
msgstr "Öffne Projekt AMF/3MF mit Konfiguration, Druckplatte leeren"
#: src/slic3r/GUI/MainFrame.cpp:1082
#, c-format, boost-format

2230
resources/localization/en/PrusaSlicer_en.po
View file

File diff suppressed because it is too large Load diff

BIN
resources/localization/es/PrusaSlicer.mo
View file

Binary file not shown.

16
resources/localization/es/PrusaSlicer_es.po
View file

@ -2115,8 +2115,8 @@ msgid "Choose one or more files (STL, OBJ):"
msgstr "Elije uno o varios archivos (STL, OBJ):"
#: src/slic3r/GUI/GUI_App.cpp:1870
msgid "Choose one or more files (STL/OBJ/AMF/3MF/PRUSA):"
msgstr "Escoje uno o más archivos (STL/OBJ/AMF/3MF/PRUSA):"
msgid "Choose one or more files (STL/3MF/STEP/OBJ/AMF/PRUSA):"
msgstr "Escoje uno o más archivos (STL/3MF/STEP/OBJ/AMF/PRUSA):"
#: src/slic3r/GUI/ConfigWizard.cpp:1361
msgid "Choose the type of firmware used by your printer."
@ -6096,12 +6096,12 @@ msgid "Import STL (Imperial Units)"
msgstr "Importar STL (Unidades Imperiales)"
#: src/slic3r/GUI/MainFrame.cpp:1208
msgid "Import STL/OBJ/AM&F/3MF"
msgstr "Importar STL/OBJ/AM&F/3MF"
msgid "Import STL/3MF/STEP/OBJ/AM&F"
msgstr "Importar STL/3MF/STEP/OBJ/AM&F"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:83
msgid "Import STL/OBJ/AMF/3MF without config, keep plater"
msgstr "Importar STL/OBJ/AMF/3MF sin configuración, mantener la base"
msgid "Import STL/3MF/STEP/OBJ/AMF without config, keep plater"
msgstr "Importar STL/3MF/STEP/OBJ/AMF sin configuración, mantener la base"
#: src/slic3r/GUI/Plater.cpp:5293
msgid "Import config only"
@ -8302,8 +8302,8 @@ msgid "Open new instance"
msgstr "Abrir instancia nueva"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:78
msgid "Open project STL/OBJ/AMF/3MF with config, clear plater"
msgstr "Abrir proyecto STL/OBJ/AMF/3MF con configuración, limpiar plataforma"
msgid "Open project AMF/3MF with config, clear plater"
msgstr "Abrir proyecto AMF/3MF con configuración, limpiar plataforma"
#: src/slic3r/GUI/MainFrame.cpp:1082
#, c-format, boost-format

BIN
resources/localization/fr/PrusaSlicer.mo
View file

Binary file not shown.

17
resources/localization/fr/PrusaSlicer_fr.po
View file

@ -2139,8 +2139,8 @@ msgid "Choose one or more files (STL, OBJ):"
msgstr "Choisissez un ou plusieurs fichiers (STL, OBJ) :"
#: src/slic3r/GUI/GUI_App.cpp:1870
msgid "Choose one or more files (STL/OBJ/AMF/3MF/PRUSA):"
msgstr "Choisir un ou plusieurs fichiers (STL/OBJ/AMF/3MF/PRUSA) :"
msgid "Choose one or more files (STL/3MF/STEP/OBJ/AMF/PRUSA):"
msgstr "Choisir un ou plusieurs fichiers (STL/3MF/STEP/OBJ/AMF/PRUSA) :"
#: src/slic3r/GUI/ConfigWizard.cpp:1361
msgid "Choose the type of firmware used by your printer."
@ -6155,12 +6155,12 @@ msgid "Import STL (Imperial Units)"
msgstr "Importer le STL (unités impériales)"
#: src/slic3r/GUI/MainFrame.cpp:1208
msgid "Import STL/OBJ/AM&F/3MF"
msgstr "Importer STL/OBJ/AM&F/3MF"
msgid "Import STL/3MF/STEP/OBJ/AM&F"
msgstr "Importer STL/3MF/STEP/OBJ/AM&F"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:83
msgid "Import STL/OBJ/AMF/3MF without config, keep plater"
msgstr "Importer un STL/OBJ/AMF/3MF sans configuration, conserver le plateau"
msgid "Import STL/3MF/STEP/OBJ/AMF without config, keep plater"
msgstr "Importer un STL/3MF/STEP/OBJ/AMF sans configuration, conserver le plateau"
#: src/slic3r/GUI/Plater.cpp:5293
msgid "Import config only"
@ -8375,9 +8375,8 @@ msgid "Open new instance"
msgstr "Ouvrir une nouvelle instance"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:78
msgid "Open project STL/OBJ/AMF/3MF with config, clear plater"
msgstr ""
"Ouvrir un projet STL/OBJ/AMF/3MF avec configuration, libérer le plateau"
msgid "Open project AMF/3MF with config, clear plater"
msgstr "Ouvrir un projet AMF/3MF avec configuration, libérer le plateau"
#: src/slic3r/GUI/MainFrame.cpp:1082
#, c-format, boost-format

BIN
resources/localization/hu/PrusaSlicer.mo
View file

Binary file not shown.

2238
resources/localization/hu/PrusaSlicer_hu.po
View file

File diff suppressed because it is too large Load diff

BIN
resources/localization/it/PrusaSlicer.mo
View file

Binary file not shown.

16
resources/localization/it/PrusaSlicer_it.po
View file

@ -2119,8 +2119,8 @@ msgid "Choose one or more files (STL, OBJ):"
msgstr "Scegli uno o più file (STL, OBJ):"
#: src/slic3r/GUI/GUI_App.cpp:1870
msgid "Choose one or more files (STL/OBJ/AMF/3MF/PRUSA):"
msgstr "Seleziona uno o più file (STL/OBJ/AMF/3MF/PRUSA):"
msgid "Choose one or more files (STL/3MF/STEP/OBJ/AMF/PRUSA):"
msgstr "Seleziona uno o più file (STL/3MF/STEP/OBJ/AMF/PRUSA):"
#: src/slic3r/GUI/ConfigWizard.cpp:1361
msgid "Choose the type of firmware used by your printer."
@ -6091,12 +6091,12 @@ msgid "Import STL (Imperial Units)"
msgstr "Importa STL (unità imperiali)"
#: src/slic3r/GUI/MainFrame.cpp:1208
msgid "Import STL/OBJ/AM&F/3MF"
msgstr "Importa STL/OBJ/AM&F/3MF"
msgid "Import STL/3MF/STEP/OBJ/AM&F"
msgstr "Importa STL/3MF/STEP/OBJ/AM&F"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:83
msgid "Import STL/OBJ/AMF/3MF without config, keep plater"
msgstr "Importa STL/OBJ/AMF/3MF senza configurazione, mantieni piano"
msgid "Import STL/3MF/STEP/OBJ/AMF without config, keep plater"
msgstr "Importa STL/3MF/STEP/OBJ/AMF senza configurazione, mantieni piano"
#: src/slic3r/GUI/Plater.cpp:5293
msgid "Import config only"
@ -8294,8 +8294,8 @@ msgid "Open new instance"
msgstr "Apri una nuova istanza"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:78
msgid "Open project STL/OBJ/AMF/3MF with config, clear plater"
msgstr "Apri progetto STL/OBJ/AMF/3MF con configurazione, pulisci piano"
msgid "Open project AMF/3MF with config, clear plater"
msgstr "Apri progetto AMF/3MF con configurazione, pulisci piano"
#: src/slic3r/GUI/MainFrame.cpp:1082
#, c-format, boost-format

BIN
resources/localization/ja/PrusaSlicer.mo
View file

Binary file not shown.

16
resources/localization/ja/PrusaSlicer_ja.po
View file

@ -2081,8 +2081,8 @@ msgid "Choose one or more files (STL, OBJ):"
msgstr "1つ以上のファイル(STL, OBJ)を選択します："
#: src/slic3r/GUI/GUI_App.cpp:1870
msgid "Choose one or more files (STL/OBJ/AMF/3MF/PRUSA):"
msgstr "1つ以上のファイルの選択(STL/OBJ/AMF/3MF/PRUSA):"
msgid "Choose one or more files (STL/3MF/STEP/OBJ/AMF/PRUSA):"
msgstr "1つ以上のファイルの選択(STL/3MF/STEP/OBJ/AMF/PRUSA):"
#: src/slic3r/GUI/ConfigWizard.cpp:1361
msgid "Choose the type of firmware used by your printer."
@ -5963,12 +5963,12 @@ msgid "Import STL (Imperial Units)"
msgstr "STLのインポート(インチ)"
#: src/slic3r/GUI/MainFrame.cpp:1208
msgid "Import STL/OBJ/AM&F/3MF"
msgstr "STL/OBJ/AMF/3MFのインポート(&F)"
msgid "Import STL/3MF/STEP/OBJ/AM&F"
msgstr "STL/3MF/STEP/OBJ/AMFのインポート(&F)"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:83
msgid "Import STL/OBJ/AMF/3MF without config, keep plater"
msgstr "既存のプレートを保持しながらSTL/OBJ/AMF/3MFを設定なしでインポート"
msgid "Import STL/3MF/STEP/OBJ/AMF without config, keep plater"
msgstr "既存のプレートを保持しながらSTL/3MF/STEP/OBJ/AMFを設定なしでインポート"
#: src/slic3r/GUI/Plater.cpp:5293
msgid "Import config only"
@ -8124,8 +8124,8 @@ msgid "Open new instance"
msgstr "新しいインスタンスを開く"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:78
msgid "Open project STL/OBJ/AMF/3MF with config, clear plater"
msgstr "プロジェクトSTL/OBJ/AMF/3MFを設定を含めて開き、プレートをクリアします"
msgid "Open project AMF/3MF with config, clear plater"
msgstr "プロジェクトAMF/3MFを設定を含めて開き、プレートをクリアします"
#: src/slic3r/GUI/MainFrame.cpp:1082
#, c-format, boost-format

BIN
resources/localization/ko/PrusaSlicer.mo
View file

Binary file not shown.

2234
resources/localization/ko/PrusaSlicer_ko_KR.po
View file

File diff suppressed because it is too large Load diff

BIN
resources/localization/ko_KR/PrusaSlicer.mo
View file

Binary file not shown.

2238
resources/localization/ko_KR/PrusaSlicer_ko.po
View file

File diff suppressed because it is too large Load diff

2238
resources/localization/ko_KR/PrusaSlicer_ko_KR.po
View file

File diff suppressed because it is too large Load diff

BIN
resources/localization/nl/PrusaSlicer.mo
View file

Binary file not shown.

2242
resources/localization/nl/PrusaSlicer_nl.po
View file

File diff suppressed because it is too large Load diff

BIN
resources/localization/pl/PrusaSlicer.mo
View file

Binary file not shown.

16
resources/localization/pl/PrusaSlicer_pl.po
View file

@ -2145,8 +2145,8 @@ msgid "Choose one or more files (STL, OBJ):"
msgstr "Wybierz jeden lub więcej plików (STL, OBJ):"
#: src/slic3r/GUI/GUI_App.cpp:1870
msgid "Choose one or more files (STL/OBJ/AMF/3MF/PRUSA):"
msgstr "Wybierz jeden lub więcej plików (STL/OBJ/AMF/3MF/PRUSA):"
msgid "Choose one or more files (STL/3MF/STEP/OBJ/AMF/PRUSA):"
msgstr "Wybierz jeden lub więcej plików (STL/3MF/STEP/OBJ/AMF/PRUSA):"
#: src/slic3r/GUI/ConfigWizard.cpp:1361
msgid "Choose the type of firmware used by your printer."
@ -6080,12 +6080,12 @@ msgid "Import STL (Imperial Units)"
msgstr "Import STL (jednostki imperialne)"
#: src/slic3r/GUI/MainFrame.cpp:1208
msgid "Import STL/OBJ/AM&F/3MF"
msgstr "Import STL/OBJ/AM&F/3MF"
msgid "Import STL/3MF/STEP/OBJ/AM&F"
msgstr "Import STL/3MF/STEP/OBJ/AM&F"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:83
msgid "Import STL/OBJ/AMF/3MF without config, keep plater"
msgstr "Otwórz STL/OBJ/AMF/3MF bez konfiguracji, zachowaj zawartość stołu"
msgid "Import STL/3MF/STEP/OBJ/AMF without config, keep plater"
msgstr "Otwórz STL/3MF/STEP/OBJ/AMF bez konfiguracji, zachowaj zawartość stołu"
#: src/slic3r/GUI/Plater.cpp:5293
msgid "Import config only"
@ -8279,8 +8279,8 @@ msgid "Open new instance"
msgstr "Otwórz nową instancję"
#: src/slic3r/GUI/KBShortcutsDialog.cpp:78
msgid "Open project STL/OBJ/AMF/3MF with config, clear plater"
msgstr "Otwórz projekt STL/OBJ/AMF/3MF z konfiguracją, wyczyść stół"
msgid "Open project AMF/3MF with config, clear plater"
msgstr "Otwórz projekt AMF/3MF z konfiguracją, wyczyść stół"
#: src/slic3r/GUI/MainFrame.cpp:1082
#, c-format, boost-format

BIN
resources/localization/pt_BR/PrusaSlicer.mo
View file

Binary file not shown.

2258
resources/localization/pt_BR/PrusaSlicer_pt_BR.po
View file

File diff suppressed because it is too large Load diff

BIN
resources/localization/ru/PrusaSlicer.mo
View file

Binary file not shown.

2238
resources/localization/ru/PrusaSlicer_ru.po
View file

File diff suppressed because it is too large Load diff

BIN
resources/localization/tr/PrusaSlicer.mo
View file

Binary file not shown.

2235
resources/localization/tr/PrusaSlicer_tr.po
View file

File diff suppressed because it is too large Load diff

BIN
resources/localization/uk/PrusaSlicer.mo
View file

Binary file not shown.

2238
resources/localization/uk/PrusaSlicer_uk.po
View file

File diff suppressed because it is too large Load diff

BIN
resources/localization/zh_CN/PrusaSlicer.mo
View file

Binary file not shown.

2238
resources/localization/zh_CN/PrusaSlicer_zh_CN.po
View file

File diff suppressed because it is too large Load diff

BIN
resources/localization/zh_TW/PrusaSlicer.mo
View file

Binary file not shown.

2234
resources/localization/zh_TW/PrusaSlicer_zh_TW.po
View file

File diff suppressed because it is too large Load diff

2
src/libslic3r/PerimeterGenerator.cpp
View file

@ -235,7 +235,7 @@ static void fuzzy_extrusion_line(Arachne::ExtrusionLine &ext_lines, double fuzzy
}
if (ext_lines.back().p == ext_lines.front().p) // Connect endpoints.
out.back().p = out.front().p;
out.front().p = out.back().p;
if (out.size() >= 3)
ext_lines.junctions = std::move(out);

2
src/slic3r/GUI/Field.cpp
View file

@ -33,7 +33,7 @@ wxString double_to_string(double const value, const int max_precision /*= 4*/)
// Style_NoTrailingZeroes does not work on OSX. It also does not work correctly with some locales on Windows.
// return wxNumberFormatter::ToString(value, max_precision, wxNumberFormatter::Style_NoTrailingZeroes);
wxString s = wxNumberFormatter::ToString(value, max_precision, wxNumberFormatter::Style_None);
wxString s = wxNumberFormatter::ToString(value, value < 0.0001 ? 10 : max_precision, wxNumberFormatter::Style_None);
// The following code comes from wxNumberFormatter::RemoveTrailingZeroes(wxString& s)
// with the exception that here one sets the decimal separator explicitely to dot.

2
src/slic3r/GUI/GUI_App.cpp
View file

@ -1897,7 +1897,7 @@ void GUI_App::import_model(wxWindow *parent, wxArrayString& input_files) const
{
input_files.Clear();
wxFileDialog dialog(parent ? parent : GetTopWindow(),
_L("Choose one or more files (STL/OBJ/AMF/3MF/PRUSA/STEP):"),
_L("Choose one or more files (STL/3MF/STEP/OBJ/AMF/PRUSA):"),
from_u8(app_config->get_last_dir()), "",
file_wildcards(FT_MODEL), wxFD_OPEN | wxFD_MULTIPLE | wxFD_FILE_MUST_EXIST);

4
src/slic3r/GUI/KBShortcutsDialog.cpp
View file

@ -75,12 +75,12 @@ void KBShortcutsDialog::fill_shortcuts()
Shortcuts commands_shortcuts = {
// File
{ ctrl + "N", L("New project, clear plater") },
{ ctrl + "O", L("Open project STL/OBJ/AMF/3MF with config, clear plater") },
{ ctrl + "O", L("Open project AMF/3MF with config, clear plater") },
{ ctrl + "S", L("Save project (3mf)") },
{ ctrl + alt + "S", L("Save project as (3mf)") },
{ ctrl + "R", L("(Re)slice") },
// File>Import
{ ctrl + "I", L("Import STL/OBJ/AMF/3MF/STEP without config, keep plater") },
{ ctrl + "I", L("Import STL/3MF/STEP/OBJ/AMF 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

2
src/slic3r/GUI/MainFrame.cpp
View file

@ -1219,7 +1219,7 @@ void MainFrame::init_menubar_as_editor()
fileMenu->AppendSeparator();
wxMenu* import_menu = new wxMenu();
append_menu_item(import_menu, wxID_ANY, _L("Import STL/OBJ/AM&F/3MF/STEP") + dots + "\tCtrl+I", _L("Load a model"),
append_menu_item(import_menu, wxID_ANY, _L("Import STL/3MF/STEP/OBJ/AM&F") + dots + "\tCtrl+I", _L("Load a model"),
[this](wxCommandEvent&) { if (m_plater) m_plater->add_model(); }, "import_plater", nullptr,
[this](){return m_plater != nullptr; }, this);

12
src/slic3r/GUI/Plater.cpp
View file

@ -6225,7 +6225,17 @@ bool Plater::export_3mf(const boost::filesystem::path& output_path)
ThumbnailData thumbnail_data;
ThumbnailsParams thumbnail_params = { {}, false, true, true, true };
p->generate_thumbnail(thumbnail_data, THUMBNAIL_SIZE_3MF.first, THUMBNAIL_SIZE_3MF.second, thumbnail_params, Camera::EType::Ortho);
bool ret = Slic3r::store_3mf(path_u8.c_str(), &p->model, export_config ? &cfg : nullptr, full_pathnames, &thumbnail_data);
bool ret = false;
try
{
ret = Slic3r::store_3mf(path_u8.c_str(), &p->model, export_config ? &cfg : nullptr, full_pathnames, &thumbnail_data);
}
catch (boost::filesystem::filesystem_error& e)
{
const wxString what = _("Unable to save file") + ": " + path_u8 + "\n" + e.code().message();
MessageDialog dlg(this, what, _("Error saving 3mf file"), wxOK | wxICON_ERROR);
dlg.ShowModal();
}
if (ret) {
// Success
// p->statusbar()->set_status_text(format_wxstr(_L("3MF file exported to %s"), path));

2
version.inc
View file

@ -3,7 +3,7 @@
set(SLIC3R_APP_NAME "PrusaSlicer")
set(SLIC3R_APP_KEY "PrusaSlicer")
set(SLIC3R_VERSION "2.6.0-alpha0")
set(SLIC3R_VERSION "2.6.0-alpha1")
set(SLIC3R_BUILD_ID "PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN")
set(SLIC3R_RC_VERSION "2,6,0,0")
set(SLIC3R_RC_VERSION_DOTS "2.6.0.0")