diff --git a/resources/web/guide/23/index.html b/resources/web/guide/23/index.html index 30a6ef9..ea1cdb8 100644 --- a/resources/web/guide/23/index.html +++ b/resources/web/guide/23/index.html @@ -17,7 +17,7 @@
System Filaments
-
Custom Filaments
+
diff --git a/src/slic3r/GUI/AboutDialog.cpp b/src/slic3r/GUI/AboutDialog.cpp index 67b4e21..e581ed3 100644 --- a/src/slic3r/GUI/AboutDialog.cpp +++ b/src/slic3r/GUI/AboutDialog.cpp @@ -151,7 +151,7 @@ wxString CopyrightsDialog::get_html_text() _L("License"), _L("CreatWare is licensed under "), "https://www.gnu.org/licenses/agpl-3.0.html",_L("GNU Affero General Public License, version 3"), - _L("CreatWare is based on PrusaSlicer and BambuStudio"), + _L("CreatWare is based on PrusaSlicer,OrcaSlicer and BambuStudio"), _L("Libraries"), _L("This software uses open source components whose copyright and other proprietary rights belong to their respective owners")); diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp index 415c47c..cbef5f3 100644 --- a/src/slic3r/GUI/Preferences.cpp +++ b/src/slic3r/GUI/Preferences.cpp @@ -1175,7 +1175,7 @@ wxWindow* PreferencesDialog::create_general_page() auto item_auto_arrange = create_item_checkbox(_L("Auto arrange plate after cloning"), page, _L("Auto arrange plate after object cloning"), 50, "auto_arrange"); auto title_presets = create_item_title(_L("Presets"), page, _L("Presets")); // auto title_network = create_item_title(_L("Network"), page, _L("Network")); - auto item_user_sync = create_item_checkbox(_L("Auto sync user presets(Printer/Filament/Process)"), page, _L("User Sync"), 50, "sync_user_preset"); + // auto item_user_sync = create_item_checkbox(_L("Auto sync user presets(Printer/Filament/Process)"), page, _L("User Sync"), 50, "sync_user_preset"); auto item_system_sync = create_item_checkbox(_L("Update built-in Presets automatically."), page, _L("System Sync"), 50, "sync_system_preset"); auto item_save_presets = create_item_button(_L("Clear my choice on the unsaved presets."), _L("Clear"), page, L"", _L("Clear my choice on the unsaved presets."), []() { wxGetApp().app_config->set("save_preset_choise", ""); @@ -1253,7 +1253,7 @@ wxWindow* PreferencesDialog::create_general_page() sizer_page->Add(item_auto_arrange, 0, wxTOP, FromDIP(3)); sizer_page->Add(title_presets, 0, wxTOP | wxEXPAND, FromDIP(20)); sizer_page->Add(item_calc_mode, 0, wxTOP, FromDIP(3)); - sizer_page->Add(item_user_sync, 0, wxTOP, FromDIP(3)); + // sizer_page->Add(item_user_sync, 0, wxTOP, FromDIP(3)); sizer_page->Add(item_system_sync, 0, wxTOP, FromDIP(3)); sizer_page->Add(item_remember_printer_config, 0, wxTOP, FromDIP(3)); sizer_page->Add(item_save_presets, 0, wxTOP, FromDIP(3));