From 13f94b055947a11878c73fd19bb281c4fd04d7ce Mon Sep 17 00:00:00 2001 From: Heiko Liebscher Date: Fri, 7 Nov 2025 10:32:00 +0100 Subject: [PATCH 1/7] fix some de translations (#11290) * fix some de translations * fix space --- localization/i18n/de/OrcaSlicer_de.po | 40 +++++++++++++++++++-------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/localization/i18n/de/OrcaSlicer_de.po b/localization/i18n/de/OrcaSlicer_de.po index 0855636667..eb3c551b98 100644 --- a/localization/i18n/de/OrcaSlicer_de.po +++ b/localization/i18n/de/OrcaSlicer_de.po @@ -3109,24 +3109,33 @@ msgstr "Zugriffscode:%s IP-Adresse:%s" msgid "A Storage needs to be inserted before printing via LAN." msgstr "" +"Ein Speicher muss vor dem Drucken über LAN eingelegt werden." msgid "" "Sending print job over LAN, but the Storage in the printer is abnormal and " "print-issues may be caused by this." msgstr "" +"Druckauftrag wird über LAN gesendet, aber der Speicher im Drucker ist " +"fehlerhaft und Druckprobleme können dadurch verursacht werden." msgid "" "The Storage in the printer is abnormal. Please replace it with a normal " "Storage before sending print job to printer." msgstr "" +"Der Speicher im Drucker ist fehlerhaft. Bitte ersetzen Sie ihn durch einen " +"normalen Speicher, bevor Sie den Druckauftrag an den Drucker senden." msgid "" "The Storage in the printer is read-only. Please replace it with a normal " "Storage before sending print job to printer." msgstr "" +"Der Speicher im Drucker ist schreibgeschützt. Bitte ersetzen Sie ihn durch " +"einen normalen Speicher, bevor Sie den Druckauftrag an den Drucker senden." msgid "Encountered an unknown error with the Storage status. Please try again." msgstr "" +"Es ist ein unbekannter Fehler mit dem Speicherstatus aufgetreten. Bitte " +"versuchen Sie es erneut." msgid "Sending G-code file over LAN" msgstr "Sende Gcode-Datei über LAN" @@ -3145,16 +3154,22 @@ msgid "" "Sending G-code file over LAN, but the Storage in the printer is abnormal and " "print-issues may be caused by this." msgstr "" +"Gcode-Datei wird über LAN gesendet, aber der Speicher im Drucker ist fehlerhaft " +"und Druckprobleme können dadurch verursacht werden." msgid "" "The Storage in the printer is abnormal. Please replace it with a normal " "Storage before sending to printer." msgstr "" +"Der Speicher im Drucker ist fehlerhaft. Bitte ersetzen Sie ihn durch einen " +"normalen Speicher, bevor Sie etwas an den Drucker senden." msgid "" "The Storage in the printer is read-only. Please replace it with a normal " "Storage before sending to printer." msgstr "" +"Der Speicher im Drucker ist schreibgeschützt. Bitte ersetzen Sie ihn durch " +"einen normalen Speicher, bevor Sie etwas an den Drucker senden." msgid "Importing SLA archive" msgstr "SLA-Archiv importieren" @@ -5113,7 +5128,7 @@ msgid "Return" msgstr "Zurück" msgid "Toggle Axis" -msgstr "" +msgstr "Achse umschalten" msgid "Paint Toolbar" msgstr "Malwerkzeuge" @@ -7454,26 +7469,26 @@ msgid "Directory for the replace wasn't selected" msgstr "Verzeichnis um daraus zu ersetzen wurde nicht ausgewählt" msgid "Replaced with STLs from directory:\n" -msgstr "" +msgstr "Ersetzt mit STLs aus dem Verzeichnis:\n" #, boost-format msgid "✖ Skipped %1%: same file.\n" -msgstr "" +msgstr "✖ Übersprungen %1%: gleiche Datei.\n" #, boost-format msgid "✖ Skipped %1%: file does not exist.\n" -msgstr "" +msgstr "✖ Übersprungen %1%: Datei existiert nicht.\n" #, boost-format msgid "✖ Skipped %1%: failed to replace.\n" -msgstr "✖ %1% übersprungen: Ersetzen fehlgeschlagen.\n" +msgstr "✖ Übersprungen %1%: Ersetzen fehlgeschlagen.\n" #, boost-format msgid "✔ Replaced %1%.\n" -msgstr "" +msgstr "✔ Ersetzt %1%.\n" msgid "Replaced volumes" -msgstr "" +msgstr "Ersetzte Volumen" msgid "Please select a file" msgstr "Bitte wählen Sie eine Datei" @@ -8301,12 +8316,15 @@ msgstr "" "zusammen drucken." msgid "Allow Abnormal Storage" -msgstr "" +msgstr "Fehlerhaften Speicher zulassen" msgid "" "This allows the use of Storage that is marked as abnormal by the Printer.\n" "Use at your own risk, can cause issues!" msgstr "" +"Dies ermöglicht die Verwendung von Speicher, der vom Drucker als " +"fehlerhaft markiert ist.\n" +"Verwendung auf eigenes Risiko, kann Probleme verursachen!" msgid "Log Level" msgstr "Protokollstufe" @@ -8945,7 +8963,7 @@ msgid "Storage needs to be inserted before printing via LAN." msgstr "Speicher muss vor dem Drucken über LAN eingelegt werden." msgid "Storage is in abnormal state or is in read-only mode." -msgstr "" +msgstr "Speicher ist in einem abnormalen Zustand oder im Nur-Lese-Modus." msgid "Storage needs to be inserted before printing." msgstr "Speicher muss vor dem Drucken eingesetzt werden." @@ -15408,10 +15426,10 @@ msgid "The angle of ironing lines offset from the top surface." msgstr "Der Winkel der Glättlinien, der von der oberen Oberfläche abweicht." msgid "Fixed ironing angle" -msgstr "" +msgstr "Fester Glättwinkel" msgid "Use a fixed absolute angle for ironing." -msgstr "" +msgstr "Verwenden Sie einen festen absoluten Winkel zum Glätten." msgid "This G-code is inserted at every layer change after the Z lift." msgstr "" From f4d81304517897142a4705eafcab96d73284bdce Mon Sep 17 00:00:00 2001 From: Noisyfox Date: Sat, 8 Nov 2025 00:28:22 +0800 Subject: [PATCH 2/7] Fix emboss crash when displaying warning information (#11299) Revert "FIX:ImGuiInputTextFlags_Multiline should manual input" This reverts commit bb3f59e18fc1dbd639752be345f1dcb386951c72. --- deps_src/imgui/imgui_widgets.cpp | 2 +- src/slic3r/GUI/IMSlider.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps_src/imgui/imgui_widgets.cpp b/deps_src/imgui/imgui_widgets.cpp index df3cea066a..65f0bc5260 100644 --- a/deps_src/imgui/imgui_widgets.cpp +++ b/deps_src/imgui/imgui_widgets.cpp @@ -4415,7 +4415,7 @@ bool ImGui::InputText(const char* label, char* buf, size_t buf_size, ImGuiInputT bool ImGui::InputTextMultiline(const char* label, char* buf, size_t buf_size, const ImVec2& size, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data) { - return InputTextEx(label, NULL, buf, (int) buf_size, size, flags , callback, user_data);//ImGuiInputTextFlags_Multiline should manual input + return InputTextEx(label, NULL, buf, (int)buf_size, size, flags | ImGuiInputTextFlags_Multiline, callback, user_data); } bool ImGui::InputTextWithHint(const char* label, const char* hint, char* buf, size_t buf_size, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data) diff --git a/src/slic3r/GUI/IMSlider.cpp b/src/slic3r/GUI/IMSlider.cpp index 81b10ebd75..78c2668fa7 100644 --- a/src/slic3r/GUI/IMSlider.cpp +++ b/src/slic3r/GUI/IMSlider.cpp @@ -1186,8 +1186,8 @@ void IMSlider::render_input_custom_gcode(std::string custom_gcode) strcpy(m_custom_gcode, custom_gcode.c_str()); } const int text_height = 6; - const ImGuiInputTextFlags flag = ImGuiInputTextFlags_Multiline; - ImGui::InputTextMultiline("##text", m_custom_gcode, sizeof(m_custom_gcode), ImVec2(-1, ImGui::GetTextLineHeight() * text_height), flag); + + ImGui::InputTextMultiline("##text", m_custom_gcode, sizeof(m_custom_gcode), ImVec2(-1, ImGui::GetTextLineHeight() * text_height)); ImGui::NewLine(); ImGui::SameLine(ImGui::GetStyle().WindowPadding.x * 14); From 210bc47173403b033ac9e42b63307f2a20308e86 Mon Sep 17 00:00:00 2001 From: Alexandre Folle de Menezes Date: Fri, 7 Nov 2025 13:32:02 -0300 Subject: [PATCH 3/7] Fix "..." at the end of "Replace with STL" menus (#11247) --- localization/i18n/OrcaSlicer.pot | 6 +++--- localization/i18n/ca/OrcaSlicer_ca.po | 8 ++++---- localization/i18n/cs/OrcaSlicer_cs.po | 8 ++++---- localization/i18n/de/OrcaSlicer_de.po | 8 ++++---- localization/i18n/en/OrcaSlicer_en.po | 6 +++--- localization/i18n/es/OrcaSlicer_es.po | 8 ++++---- localization/i18n/fr/OrcaSlicer_fr.po | 8 ++++---- localization/i18n/hu/OrcaSlicer_hu.po | 6 +++--- localization/i18n/it/OrcaSlicer_it.po | 8 ++++---- localization/i18n/ja/OrcaSlicer_ja.po | 6 +++--- localization/i18n/ko/OrcaSlicer_ko.po | 6 +++--- localization/i18n/lt/OrcaSlicer_lt.po | 8 ++++---- localization/i18n/nl/OrcaSlicer_nl.po | 6 +++--- localization/i18n/pl/OrcaSlicer_pl.po | 8 ++++---- localization/i18n/pt_BR/OrcaSlicer_pt_BR.po | 12 ++++++------ localization/i18n/ru/OrcaSlicer_ru.po | 6 +++--- localization/i18n/sv/OrcaSlicer_sv.po | 8 ++++---- localization/i18n/tr/OrcaSlicer_tr.po | 6 +++--- localization/i18n/uk/OrcaSlicer_uk.po | 8 ++++---- localization/i18n/vi/OrcaSlicer_vi.po | 8 ++++---- localization/i18n/zh_CN/OrcaSlicer_zh_CN.po | 6 +++--- localization/i18n/zh_TW/OrcaSlicer_zh_TW.po | 6 +++--- src/slic3r/GUI/BedShapeDialog.cpp | 2 +- src/slic3r/GUI/GUI_Factories.cpp | 4 ++-- 24 files changed, 83 insertions(+), 83 deletions(-) diff --git a/localization/i18n/OrcaSlicer.pot b/localization/i18n/OrcaSlicer.pot index 0a817c0309..2b4846b0c6 100644 --- a/localization/i18n/OrcaSlicer.pot +++ b/localization/i18n/OrcaSlicer.pot @@ -1949,13 +1949,13 @@ msgstr "" msgid "Replace with STL" msgstr "" -msgid "Replace the selected part with new STL" +msgid "Replace the selected part with new STL." msgstr "" msgid "Replace all with STL" msgstr "" -msgid "Replace all selected parts with STL from folder" +msgid "Replace all selected parts with STL from folder." msgstr "" msgid "Change filament" @@ -3564,7 +3564,7 @@ msgstr "" msgid "Circular" msgstr "" -msgid "Load shape from STL..." +msgid "Load shape from STL ..." msgstr "" msgid "Settings" diff --git a/localization/i18n/ca/OrcaSlicer_ca.po b/localization/i18n/ca/OrcaSlicer_ca.po index ea9c87f574..e4db74eb39 100644 --- a/localization/i18n/ca/OrcaSlicer_ca.po +++ b/localization/i18n/ca/OrcaSlicer_ca.po @@ -2039,13 +2039,13 @@ msgstr "Tornar a carregar les parts seleccionades des del disc" msgid "Replace with STL" msgstr "Substitueix per STL" -msgid "Replace the selected part with new STL" +msgid "Replace the selected part with new STL." msgstr "Substituir la peça seleccionada per un nou STL" msgid "Replace all with STL" msgstr "" -msgid "Replace all selected parts with STL from folder" +msgid "Replace all selected parts with STL from folder." msgstr "" msgid "Change filament" @@ -3783,8 +3783,8 @@ msgstr "Rectangular" msgid "Circular" msgstr "Circular" -msgid "Load shape from STL..." -msgstr "Carregar forma des de l'STL..." +msgid "Load shape from STL ..." +msgstr "Carregar forma des de l'STL ..." msgid "Settings" msgstr "Configuració" diff --git a/localization/i18n/cs/OrcaSlicer_cs.po b/localization/i18n/cs/OrcaSlicer_cs.po index 9d1f24f272..9e65e57048 100644 --- a/localization/i18n/cs/OrcaSlicer_cs.po +++ b/localization/i18n/cs/OrcaSlicer_cs.po @@ -2020,13 +2020,13 @@ msgstr "Znovu načíst vybrané části z disku" msgid "Replace with STL" msgstr "Nahradit STL souborem" -msgid "Replace the selected part with new STL" +msgid "Replace the selected part with new STL." msgstr "Nahradit vybranou část novým STL" msgid "Replace all with STL" msgstr "" -msgid "Replace all selected parts with STL from folder" +msgid "Replace all selected parts with STL from folder." msgstr "" msgid "Change filament" @@ -3735,8 +3735,8 @@ msgstr "Obdélníkový" msgid "Circular" msgstr "Kruhový" -msgid "Load shape from STL..." -msgstr "Načíst tvar ze souboru STL…" +msgid "Load shape from STL ..." +msgstr "Načíst tvar ze souboru STL …" msgid "Settings" msgstr "Nastavení" diff --git a/localization/i18n/de/OrcaSlicer_de.po b/localization/i18n/de/OrcaSlicer_de.po index eb3c551b98..c6e5c166f9 100644 --- a/localization/i18n/de/OrcaSlicer_de.po +++ b/localization/i18n/de/OrcaSlicer_de.po @@ -2062,13 +2062,13 @@ msgstr "Die ausgewählten Teile von der Festplatte neu laden" msgid "Replace with STL" msgstr "Durch STL Datei austauschen" -msgid "Replace the selected part with new STL" +msgid "Replace the selected part with new STL." msgstr "Ausgewähltes Teil durch eine neue STL ersetzen." msgid "Replace all with STL" msgstr "Alle durch STL Dateien austauschen" -msgid "Replace all selected parts with STL from folder" +msgid "Replace all selected parts with STL from folder." msgstr "Ausgewählte Teile durch neue STL aus Ordner ersetzen." msgid "Change filament" @@ -3892,8 +3892,8 @@ msgstr "Rechteckig" msgid "Circular" msgstr "Kreisförmig" -msgid "Load shape from STL..." -msgstr "Lade Form von STL..." +msgid "Load shape from STL ..." +msgstr "Lade Form von STL ..." msgid "Settings" msgstr "Einstellungen" diff --git a/localization/i18n/en/OrcaSlicer_en.po b/localization/i18n/en/OrcaSlicer_en.po index 66b99ab9aa..d79225fa41 100644 --- a/localization/i18n/en/OrcaSlicer_en.po +++ b/localization/i18n/en/OrcaSlicer_en.po @@ -1949,13 +1949,13 @@ msgstr "" msgid "Replace with STL" msgstr "" -msgid "Replace the selected part with new STL" +msgid "Replace the selected part with new STL." msgstr "" msgid "Replace all with STL" msgstr "" -msgid "Replace all selected parts with STL from folder" +msgid "Replace all selected parts with STL from folder." msgstr "" msgid "Change filament" @@ -3595,7 +3595,7 @@ msgstr "" msgid "Circular" msgstr "" -msgid "Load shape from STL..." +msgid "Load shape from STL ..." msgstr "" msgid "Settings" diff --git a/localization/i18n/es/OrcaSlicer_es.po b/localization/i18n/es/OrcaSlicer_es.po index 9338a62099..994cf4373d 100644 --- a/localization/i18n/es/OrcaSlicer_es.po +++ b/localization/i18n/es/OrcaSlicer_es.po @@ -2044,13 +2044,13 @@ msgstr "Recargar las piezas seleccionadas desde el disco" msgid "Replace with STL" msgstr "Reemplazar con STL" -msgid "Replace the selected part with new STL" +msgid "Replace the selected part with new STL." msgstr "Reemplaza la pieza seleccionada con un nuevo STL" msgid "Replace all with STL" msgstr "" -msgid "Replace all selected parts with STL from folder" +msgid "Replace all selected parts with STL from folder." msgstr "" msgid "Change filament" @@ -3799,8 +3799,8 @@ msgstr "Rectangular" msgid "Circular" msgstr "Circular" -msgid "Load shape from STL..." -msgstr "Cargar forma desde STL..." +msgid "Load shape from STL ..." +msgstr "Cargar forma desde STL ..." msgid "Settings" msgstr "Ajustes" diff --git a/localization/i18n/fr/OrcaSlicer_fr.po b/localization/i18n/fr/OrcaSlicer_fr.po index f425b2c229..c2db4669f8 100644 --- a/localization/i18n/fr/OrcaSlicer_fr.po +++ b/localization/i18n/fr/OrcaSlicer_fr.po @@ -2058,13 +2058,13 @@ msgstr "Recharger les pièces sélectionnées à partir du disque" msgid "Replace with STL" msgstr "Remplacer par le STL" -msgid "Replace the selected part with new STL" +msgid "Replace the selected part with new STL." msgstr "Remplacer la pièce sélectionnée par un nouveau STL" msgid "Replace all with STL" msgstr "" -msgid "Replace all selected parts with STL from folder" +msgid "Replace all selected parts with STL from folder." msgstr "" msgid "Change filament" @@ -3813,8 +3813,8 @@ msgstr "Rectangle" msgid "Circular" msgstr "Circulaire" -msgid "Load shape from STL..." -msgstr "Charger une forme depuis un STL…" +msgid "Load shape from STL ..." +msgstr "Charger une forme depuis un STL …" msgid "Settings" msgstr "Réglages" diff --git a/localization/i18n/hu/OrcaSlicer_hu.po b/localization/i18n/hu/OrcaSlicer_hu.po index 4f76543a81..85d9dcd8b2 100644 --- a/localization/i18n/hu/OrcaSlicer_hu.po +++ b/localization/i18n/hu/OrcaSlicer_hu.po @@ -1967,13 +1967,13 @@ msgstr "A kiválasztott tárgyak újratöltése a lemezről" msgid "Replace with STL" msgstr "Lecserélés STL-lel" -msgid "Replace the selected part with new STL" +msgid "Replace the selected part with new STL." msgstr "Lecseréli a kijelölt tárgyat egy új STL-lel" msgid "Replace all with STL" msgstr "" -msgid "Replace all selected parts with STL from folder" +msgid "Replace all selected parts with STL from folder." msgstr "" msgid "Change filament" @@ -3676,7 +3676,7 @@ msgstr "Téglalap" msgid "Circular" msgstr "Kör" -msgid "Load shape from STL..." +msgid "Load shape from STL ..." msgstr "Forma betöltése STL-ből..." msgid "Settings" diff --git a/localization/i18n/it/OrcaSlicer_it.po b/localization/i18n/it/OrcaSlicer_it.po index 7e01da6de3..7381c8036a 100644 --- a/localization/i18n/it/OrcaSlicer_it.po +++ b/localization/i18n/it/OrcaSlicer_it.po @@ -2049,13 +2049,13 @@ msgstr "Ricarica le parti selezionate da disco" msgid "Replace with STL" msgstr "Sostituisci con STL" -msgid "Replace the selected part with new STL" +msgid "Replace the selected part with new STL." msgstr "Sostituisci la parte selezionata con un nuovo STL" msgid "Replace all with STL" msgstr "" -msgid "Replace all selected parts with STL from folder" +msgid "Replace all selected parts with STL from folder." msgstr "" msgid "Change filament" @@ -3809,8 +3809,8 @@ msgstr "Rettangolare" msgid "Circular" msgstr "Circolare" -msgid "Load shape from STL..." -msgstr "Carica forma da STL..." +msgid "Load shape from STL ..." +msgstr "Carica forma da STL ..." msgid "Settings" msgstr "Impostazioni" diff --git a/localization/i18n/ja/OrcaSlicer_ja.po b/localization/i18n/ja/OrcaSlicer_ja.po index 393df25e06..be2c021a99 100644 --- a/localization/i18n/ja/OrcaSlicer_ja.po +++ b/localization/i18n/ja/OrcaSlicer_ja.po @@ -1978,13 +1978,13 @@ msgstr "選択したパーツをディスクから再読込み" msgid "Replace with STL" msgstr "STLに置き換え" -msgid "Replace the selected part with new STL" +msgid "Replace the selected part with new STL." msgstr "選択したパーツを新しいSTLに置換え" msgid "Replace all with STL" msgstr "" -msgid "Replace all selected parts with STL from folder" +msgid "Replace all selected parts with STL from folder." msgstr "" msgid "Change filament" @@ -3634,7 +3634,7 @@ msgstr "長方形" msgid "Circular" msgstr "円形" -msgid "Load shape from STL..." +msgid "Load shape from STL ..." msgstr "STLからシェープデータを読込む" msgid "Settings" diff --git a/localization/i18n/ko/OrcaSlicer_ko.po b/localization/i18n/ko/OrcaSlicer_ko.po index 5c7a67a79e..55f97a6ef3 100644 --- a/localization/i18n/ko/OrcaSlicer_ko.po +++ b/localization/i18n/ko/OrcaSlicer_ko.po @@ -2006,13 +2006,13 @@ msgstr "선택한 부품을 디스크에서 다시 불러오기" msgid "Replace with STL" msgstr "STL 파일로 교체" -msgid "Replace the selected part with new STL" +msgid "Replace the selected part with new STL." msgstr "선택한 부품을 새 STL 파일로 교체" msgid "Replace all with STL" msgstr "" -msgid "Replace all selected parts with STL from folder" +msgid "Replace all selected parts with STL from folder." msgstr "" msgid "Change filament" @@ -3697,7 +3697,7 @@ msgstr "직사각형" msgid "Circular" msgstr "원형" -msgid "Load shape from STL..." +msgid "Load shape from STL ..." msgstr "STL에서 모양 불러오기..." msgid "Settings" diff --git a/localization/i18n/lt/OrcaSlicer_lt.po b/localization/i18n/lt/OrcaSlicer_lt.po index 2c601de3cd..ddcf18caba 100644 --- a/localization/i18n/lt/OrcaSlicer_lt.po +++ b/localization/i18n/lt/OrcaSlicer_lt.po @@ -2031,13 +2031,13 @@ msgstr "Iš naujo įkelti pasirinktas dalis iš disko" msgid "Replace with STL" msgstr "Pakeisti STL" -msgid "Replace the selected part with new STL" +msgid "Replace the selected part with new STL." msgstr "Pakeisti pasirinktą dalį į naują STL" msgid "Replace all with STL" msgstr "" -msgid "Replace all selected parts with STL from folder" +msgid "Replace all selected parts with STL from folder." msgstr "" msgid "Change filament" @@ -3772,8 +3772,8 @@ msgstr "Stačiakampis" msgid "Circular" msgstr "Apvalus" -msgid "Load shape from STL..." -msgstr "Įkelti formą iš STL..." +msgid "Load shape from STL ..." +msgstr "Įkelti formą iš STL ..." msgid "Settings" msgstr "Nustatymai" diff --git a/localization/i18n/nl/OrcaSlicer_nl.po b/localization/i18n/nl/OrcaSlicer_nl.po index 1537bc7306..6073869fb1 100644 --- a/localization/i18n/nl/OrcaSlicer_nl.po +++ b/localization/i18n/nl/OrcaSlicer_nl.po @@ -1990,13 +1990,13 @@ msgstr "Laad de geselecteerde onderdelen opnieuw vanaf de schijf" msgid "Replace with STL" msgstr "Vervangen door STL" -msgid "Replace the selected part with new STL" +msgid "Replace the selected part with new STL." msgstr "Vervang het geselecteerde onderdeel door een nieuwe STL" msgid "Replace all with STL" msgstr "" -msgid "Replace all selected parts with STL from folder" +msgid "Replace all selected parts with STL from folder." msgstr "" msgid "Change filament" @@ -3711,7 +3711,7 @@ msgstr "Rechthoekig" msgid "Circular" msgstr "Rond" -msgid "Load shape from STL..." +msgid "Load shape from STL ..." msgstr "Vorm laden vanuit het stl. bestand..." msgid "Settings" diff --git a/localization/i18n/pl/OrcaSlicer_pl.po b/localization/i18n/pl/OrcaSlicer_pl.po index 185c74ffa3..9e7d4e7a81 100644 --- a/localization/i18n/pl/OrcaSlicer_pl.po +++ b/localization/i18n/pl/OrcaSlicer_pl.po @@ -2028,13 +2028,13 @@ msgstr "Przeładuj wybrane części z dysku" msgid "Replace with STL" msgstr "Zamień na STL" -msgid "Replace the selected part with new STL" +msgid "Replace the selected part with new STL." msgstr "Zamień wybraną część na nowy plik STL" msgid "Replace all with STL" msgstr "" -msgid "Replace all selected parts with STL from folder" +msgid "Replace all selected parts with STL from folder." msgstr "" msgid "Change filament" @@ -3777,8 +3777,8 @@ msgstr "Prostokątny" msgid "Circular" msgstr "Okrągły" -msgid "Load shape from STL..." -msgstr "Wczytaj kształt z pliku STL..." +msgid "Load shape from STL ..." +msgstr "Wczytaj kształt z pliku STL ..." msgid "Settings" msgstr "Ustawienia" diff --git a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po index 3daafc2d48..6b34939284 100644 --- a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po +++ b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po @@ -2035,14 +2035,14 @@ msgstr "Recarregar as peças selecionadas do disco" msgid "Replace with STL" msgstr "Substituir por STL" -msgid "Replace the selected part with new STL" -msgstr "Substituir a peça selecionada por novo STL" +msgid "Replace the selected part with new STL." +msgstr "Substituir a peça selecionada por novo STL." msgid "Replace all with STL" msgstr "" -msgid "Replace all selected parts with STL from folder" -msgstr "" +msgid "Replace all selected parts with STL from folder." +msgstr "Substituir todas peças selecionadas com STL da pasta." msgid "Change filament" msgstr "Alterar filamento" @@ -3778,8 +3778,8 @@ msgstr "Retangular" msgid "Circular" msgstr "Circular" -msgid "Load shape from STL..." -msgstr "Carregar forma de STL…" +msgid "Load shape from STL ..." +msgstr "Carregar forma de STL …" msgid "Settings" msgstr "Configurações" diff --git a/localization/i18n/ru/OrcaSlicer_ru.po b/localization/i18n/ru/OrcaSlicer_ru.po index 32e78f5a06..e0b5b637b8 100644 --- a/localization/i18n/ru/OrcaSlicer_ru.po +++ b/localization/i18n/ru/OrcaSlicer_ru.po @@ -2037,13 +2037,13 @@ msgstr "Перезагрузить выбранные модели с диска msgid "Replace with STL" msgstr "Заменить на другую модель" -msgid "Replace the selected part with new STL" +msgid "Replace the selected part with new STL." msgstr "Заменить выбранную модель другой" msgid "Replace all with STL" msgstr "" -msgid "Replace all selected parts with STL from folder" +msgid "Replace all selected parts with STL from folder." msgstr "" msgid "Change filament" @@ -3805,7 +3805,7 @@ msgstr "Прямоугольная" msgid "Circular" msgstr "Круглая" -msgid "Load shape from STL..." +msgid "Load shape from STL ..." msgstr "Загрузка формы стола из STL файла..." msgid "Settings" diff --git a/localization/i18n/sv/OrcaSlicer_sv.po b/localization/i18n/sv/OrcaSlicer_sv.po index cd64d34aa7..40a47c6385 100644 --- a/localization/i18n/sv/OrcaSlicer_sv.po +++ b/localization/i18n/sv/OrcaSlicer_sv.po @@ -1963,13 +1963,13 @@ msgstr "Ladda om de valda delarna från disken" msgid "Replace with STL" msgstr "Ersätt med STL" -msgid "Replace the selected part with new STL" +msgid "Replace the selected part with new STL." msgstr "Ersätt den valda delen med ny STL" msgid "Replace all with STL" msgstr "" -msgid "Replace all selected parts with STL from folder" +msgid "Replace all selected parts with STL from folder." msgstr "" msgid "Change filament" @@ -3674,8 +3674,8 @@ msgstr "Rektangulär" msgid "Circular" msgstr "Cirkulär" -msgid "Load shape from STL..." -msgstr "Ladda form ifrån STL..." +msgid "Load shape from STL ..." +msgstr "Ladda form ifrån STL ..." msgid "Settings" msgstr "Inställningar" diff --git a/localization/i18n/tr/OrcaSlicer_tr.po b/localization/i18n/tr/OrcaSlicer_tr.po index c21e95255e..e50da443bc 100644 --- a/localization/i18n/tr/OrcaSlicer_tr.po +++ b/localization/i18n/tr/OrcaSlicer_tr.po @@ -2021,13 +2021,13 @@ msgstr "Seçilen parçaları diskten yeniden yükle" msgid "Replace with STL" msgstr "STL ile değiştirin" -msgid "Replace the selected part with new STL" +msgid "Replace the selected part with new STL." msgstr "Seçilen parçayı yeni STL ile değiştirin" msgid "Replace all with STL" msgstr "" -msgid "Replace all selected parts with STL from folder" +msgid "Replace all selected parts with STL from folder." msgstr "" msgid "Change filament" @@ -3746,7 +3746,7 @@ msgstr "Dikdörtgen" msgid "Circular" msgstr "Dairesel" -msgid "Load shape from STL..." +msgid "Load shape from STL ..." msgstr "Şekli STL'den yükle..." msgid "Settings" diff --git a/localization/i18n/uk/OrcaSlicer_uk.po b/localization/i18n/uk/OrcaSlicer_uk.po index 88d5d36da8..6d9d232e93 100644 --- a/localization/i18n/uk/OrcaSlicer_uk.po +++ b/localization/i18n/uk/OrcaSlicer_uk.po @@ -2030,13 +2030,13 @@ msgstr "Перезавантажте вибрані частини з диска msgid "Replace with STL" msgstr "Замінити на STL" -msgid "Replace the selected part with new STL" +msgid "Replace the selected part with new STL." msgstr "Замініть вибрану частину новим STL" msgid "Replace all with STL" msgstr "" -msgid "Replace all selected parts with STL from folder" +msgid "Replace all selected parts with STL from folder." msgstr "" msgid "Change filament" @@ -3778,8 +3778,8 @@ msgstr "Прямокутний" msgid "Circular" msgstr "Округлий" -msgid "Load shape from STL..." -msgstr "Завантажити форму з STL..." +msgid "Load shape from STL ..." +msgstr "Завантажити форму з STL ..." msgid "Settings" msgstr "Налаштування" diff --git a/localization/i18n/vi/OrcaSlicer_vi.po b/localization/i18n/vi/OrcaSlicer_vi.po index 134b432794..22365219f6 100644 --- a/localization/i18n/vi/OrcaSlicer_vi.po +++ b/localization/i18n/vi/OrcaSlicer_vi.po @@ -2000,13 +2000,13 @@ msgstr "Tải lại các phần đã chọn từ ổ đĩa" msgid "Replace with STL" msgstr "Thay thế bằng STL" -msgid "Replace the selected part with new STL" +msgid "Replace the selected part with new STL." msgstr "Thay thế phần đã chọn bằng STL mới" msgid "Replace all with STL" msgstr "" -msgid "Replace all selected parts with STL from folder" +msgid "Replace all selected parts with STL from folder." msgstr "" msgid "Change filament" @@ -3701,8 +3701,8 @@ msgstr "Hình chữ nhật" msgid "Circular" msgstr "Hình tròn" -msgid "Load shape from STL..." -msgstr "Tải hình dạng từ STL..." +msgid "Load shape from STL ..." +msgstr "Tải hình dạng từ STL ..." msgid "Settings" msgstr "Cài đặt" diff --git a/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po b/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po index aaab7237d5..8fba082d6d 100644 --- a/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po +++ b/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po @@ -1980,13 +1980,13 @@ msgstr "从磁盘重新加载选中的零件" msgid "Replace with STL" msgstr "替换为STL" -msgid "Replace the selected part with new STL" +msgid "Replace the selected part with new STL." msgstr "用新的STL替换选中的零件" msgid "Replace all with STL" msgstr "" -msgid "Replace all selected parts with STL from folder" +msgid "Replace all selected parts with STL from folder." msgstr "" msgid "Change filament" @@ -3629,7 +3629,7 @@ msgstr "矩形" msgid "Circular" msgstr "圆" -msgid "Load shape from STL..." +msgid "Load shape from STL ..." msgstr "从STL文件加载形状..." msgid "Settings" diff --git a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po index c8f0bfb51f..5d6bcb7541 100644 --- a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po +++ b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po @@ -1981,13 +1981,13 @@ msgstr "從硬碟重新載入選中的零件" msgid "Replace with STL" msgstr "替換為 STL" -msgid "Replace the selected part with new STL" +msgid "Replace the selected part with new STL." msgstr "用新的 STL 替換選中的零件" msgid "Replace all with STL" msgstr "" -msgid "Replace all selected parts with STL from folder" +msgid "Replace all selected parts with STL from folder." msgstr "" msgid "Change filament" @@ -3634,7 +3634,7 @@ msgstr "矩形" msgid "Circular" msgstr "圓" -msgid "Load shape from STL..." +msgid "Load shape from STL ..." msgstr "從 STL 檔案載入形狀..." msgid "Settings" diff --git a/src/slic3r/GUI/BedShapeDialog.cpp b/src/slic3r/GUI/BedShapeDialog.cpp index ff2697558b..5271c2e38b 100644 --- a/src/slic3r/GUI/BedShapeDialog.cpp +++ b/src/slic3r/GUI/BedShapeDialog.cpp @@ -229,7 +229,7 @@ void BedShapePanel::build_panel(const Pointfs& default_pt, const std::string& cu Line line{ "", "" }; line.full_width = 1; line.widget = [this](wxWindow* parent) { - Button* shape_btn = new Button(parent, _L("Load shape from STL...")); + Button* shape_btn = new Button(parent, _L("Load shape from STL ...")); shape_btn->SetStyle(ButtonStyle::Regular, ButtonType::Expanded); wxSizer* shape_sizer = new wxBoxSizer(wxHORIZONTAL); diff --git a/src/slic3r/GUI/GUI_Factories.cpp b/src/slic3r/GUI/GUI_Factories.cpp index a8133315d3..9cb755ffb7 100644 --- a/src/slic3r/GUI/GUI_Factories.cpp +++ b/src/slic3r/GUI/GUI_Factories.cpp @@ -864,14 +864,14 @@ void MenuFactory::append_menu_item_reload_from_disk(wxMenu* menu) void MenuFactory::append_menu_item_replace_with_stl(wxMenu *menu) { - append_menu_item(menu, wxID_ANY, _L("Replace with STL"), _L("Replace the selected part with new STL"), + append_menu_item(menu, wxID_ANY, _L("Replace with STL") + dots, _L("Replace the selected part with new STL."), [](wxCommandEvent &) { plater()->replace_with_stl(); }, "", menu, []() { return plater()->can_replace_with_stl(); }, m_parent); } void MenuFactory::append_menu_item_replace_all_with_stl(wxMenu *menu) { - append_menu_item(menu, wxID_ANY, _L("Replace all with STL"), _L("Replace all selected parts with STL from folder"), + append_menu_item(menu, wxID_ANY, _L("Replace all with STL") + dots, _L("Replace all selected parts with STL from folder."), [](wxCommandEvent &) { plater()->replace_all_with_stl(); }, "", menu, []() { return plater()->can_replace_all_with_stl(); }, m_parent); } From c3e03a0955d947ae14abc78312dd6a3879de9cce Mon Sep 17 00:00:00 2001 From: Alexandre Folle de Menezes Date: Fri, 7 Nov 2025 13:53:56 -0300 Subject: [PATCH 4/7] Remove markers from strings that don't need translation (#11234) * Remove markers from strings that don't need translation --- localization/i18n/OrcaSlicer.pot | 18 ------------------ localization/i18n/ca/OrcaSlicer_ca.po | 18 ------------------ localization/i18n/cs/OrcaSlicer_cs.po | 18 ------------------ localization/i18n/de/OrcaSlicer_de.po | 18 ------------------ localization/i18n/en/OrcaSlicer_en.po | 18 ------------------ localization/i18n/es/OrcaSlicer_es.po | 18 ------------------ localization/i18n/fr/OrcaSlicer_fr.po | 18 ------------------ localization/i18n/hu/OrcaSlicer_hu.po | 18 ------------------ localization/i18n/it/OrcaSlicer_it.po | 18 ------------------ localization/i18n/ja/OrcaSlicer_ja.po | 18 ------------------ localization/i18n/ko/OrcaSlicer_ko.po | 18 ------------------ localization/i18n/lt/OrcaSlicer_lt.po | 19 +------------------ localization/i18n/nl/OrcaSlicer_nl.po | 18 ------------------ localization/i18n/pl/OrcaSlicer_pl.po | 18 ------------------ localization/i18n/pt_BR/OrcaSlicer_pt_BR.po | 18 ------------------ localization/i18n/ru/OrcaSlicer_ru.po | 18 ------------------ localization/i18n/sv/OrcaSlicer_sv.po | 18 ------------------ localization/i18n/tr/OrcaSlicer_tr.po | 18 ------------------ localization/i18n/uk/OrcaSlicer_uk.po | 18 ------------------ localization/i18n/vi/OrcaSlicer_vi.po | 18 ------------------ localization/i18n/zh_CN/OrcaSlicer_zh_CN.po | 18 ------------------ localization/i18n/zh_TW/OrcaSlicer_zh_TW.po | 18 ------------------ .../GUI/DeviceTab/uiAmsHumidityPopup.cpp | 2 +- src/slic3r/GUI/ObjColorDialog.cpp | 2 +- src/slic3r/GUI/PartSkipDialog.cpp | 6 +++--- src/slic3r/GUI/StatusPanel.cpp | 2 +- 26 files changed, 7 insertions(+), 402 deletions(-) diff --git a/localization/i18n/OrcaSlicer.pot b/localization/i18n/OrcaSlicer.pot index 2b4846b0c6..8d95e1a529 100644 --- a/localization/i18n/OrcaSlicer.pot +++ b/localization/i18n/OrcaSlicer.pot @@ -5820,10 +5820,6 @@ msgstr "" msgid "Layer: %d/%d" msgstr "" -#, possible-c-format, possible-boost-format -msgid "(%d)" -msgstr "" - msgid "" "Please heat the nozzle to above 170°C before loading or unloading filament." msgstr "" @@ -9203,9 +9199,6 @@ msgid "" " to continue or manually adjust it." msgstr "" -msgid "—> " -msgstr "" - msgid "" "Synchronizing AMS filaments will discard your modified but unsaved filament " "presets.\n" @@ -17989,9 +17982,6 @@ msgstr "" msgid "Zoom Out" msgstr "" -msgid "100 %" -msgstr "" - msgid "Zoom In" msgstr "" @@ -18001,14 +17991,6 @@ msgstr "" msgid "Loading ..." msgstr "" -#, possible-c-format, possible-boost-format -msgid "%d%%" -msgstr "" - -#, possible-c-format, possible-boost-format -msgid "%d" -msgstr "" - #, possible-c-format, possible-boost-format msgid "/%d Selected" msgstr "" diff --git a/localization/i18n/ca/OrcaSlicer_ca.po b/localization/i18n/ca/OrcaSlicer_ca.po index e4db74eb39..4d92c32bec 100644 --- a/localization/i18n/ca/OrcaSlicer_ca.po +++ b/localization/i18n/ca/OrcaSlicer_ca.po @@ -6168,10 +6168,6 @@ msgstr "Capa: %s" msgid "Layer: %d/%d" msgstr "Capa: %d/%d" -#, c-format, boost-format -msgid "(%d)" -msgstr "" - msgid "" "Please heat the nozzle to above 170°C before loading or unloading filament." msgstr "" @@ -9855,9 +9851,6 @@ msgid "" " to continue or manually adjust it." msgstr "" -msgid "—> " -msgstr "" - msgid "" "Synchronizing AMS filaments will discard your modified but unsaved filament " "presets.\n" @@ -20575,9 +20568,6 @@ msgstr "Seleccioneu un sol objecte." msgid "Zoom Out" msgstr "" -msgid "100 %" -msgstr "" - msgid "Zoom In" msgstr "" @@ -20587,14 +20577,6 @@ msgstr "" msgid "Loading ..." msgstr "" -#, c-format, boost-format -msgid "%d%%" -msgstr "" - -#, c-format, boost-format -msgid "%d" -msgstr "" - #, c-format, boost-format msgid "/%d Selected" msgstr "" diff --git a/localization/i18n/cs/OrcaSlicer_cs.po b/localization/i18n/cs/OrcaSlicer_cs.po index 9e65e57048..b4b53b23f3 100644 --- a/localization/i18n/cs/OrcaSlicer_cs.po +++ b/localization/i18n/cs/OrcaSlicer_cs.po @@ -6078,10 +6078,6 @@ msgstr "Vrstva: %s" msgid "Layer: %d/%d" msgstr "Vrstva: %d/%d" -#, c-format, boost-format -msgid "(%d)" -msgstr "" - msgid "" "Please heat the nozzle to above 170°C before loading or unloading filament." msgstr "" @@ -9659,9 +9655,6 @@ msgid "" " to continue or manually adjust it." msgstr "" -msgid "—> " -msgstr "" - msgid "" "Synchronizing AMS filaments will discard your modified but unsaved filament " "presets.\n" @@ -19231,9 +19224,6 @@ msgstr "" msgid "Zoom Out" msgstr "" -msgid "100 %" -msgstr "" - msgid "Zoom In" msgstr "" @@ -19243,14 +19233,6 @@ msgstr "" msgid "Loading ..." msgstr "" -#, c-format, boost-format -msgid "%d%%" -msgstr "" - -#, c-format, boost-format -msgid "%d" -msgstr "" - #, c-format, boost-format msgid "/%d Selected" msgstr "" diff --git a/localization/i18n/de/OrcaSlicer_de.po b/localization/i18n/de/OrcaSlicer_de.po index c6e5c166f9..183b2376b2 100644 --- a/localization/i18n/de/OrcaSlicer_de.po +++ b/localization/i18n/de/OrcaSlicer_de.po @@ -6385,10 +6385,6 @@ msgstr "Schicht: %s" msgid "Layer: %d/%d" msgstr "Schicht: %d/%d" -#, c-format, boost-format -msgid "(%d)" -msgstr "(%d)" - msgid "" "Please heat the nozzle to above 170°C before loading or unloading filament." msgstr "" @@ -10306,9 +10302,6 @@ msgstr "" "Die Farbe wurde ausgewählt, Sie können OK wählen \n" "um fortzufahren oder sie manuell anzupassen." -msgid "—> " -msgstr "—> " - msgid "" "Synchronizing AMS filaments will discard your modified but unsaved filament " "presets.\n" @@ -21515,9 +21508,6 @@ msgstr "Bitte wählen Sie ein einzelnes Objekt aus." msgid "Zoom Out" msgstr "Vergrößern" -msgid "100 %" -msgstr "100 %" - msgid "Zoom In" msgstr "Verkleinern" @@ -21529,14 +21519,6 @@ msgstr "" msgid "Loading ..." msgstr "Wird geladen ..." -#, c-format, boost-format -msgid "%d%%" -msgstr "%d%%" - -#, c-format, boost-format -msgid "%d" -msgstr "%d" - #, c-format, boost-format msgid "/%d Selected" msgstr "/%d ausgewählt" diff --git a/localization/i18n/en/OrcaSlicer_en.po b/localization/i18n/en/OrcaSlicer_en.po index d79225fa41..b1bbf191be 100644 --- a/localization/i18n/en/OrcaSlicer_en.po +++ b/localization/i18n/en/OrcaSlicer_en.po @@ -5888,10 +5888,6 @@ msgstr "" msgid "Layer: %d/%d" msgstr "" -#, c-format, boost-format -msgid "(%d)" -msgstr "" - msgid "" "Please heat the nozzle to above 170°C before loading or unloading filament." msgstr "" @@ -9353,9 +9349,6 @@ msgid "" " to continue or manually adjust it." msgstr "" -msgid "—> " -msgstr "" - msgid "" "Synchronizing AMS filaments will discard your modified but unsaved filament " "presets.\n" @@ -18442,9 +18435,6 @@ msgstr "" msgid "Zoom Out" msgstr "" -msgid "100 %" -msgstr "" - msgid "Zoom In" msgstr "" @@ -18454,14 +18444,6 @@ msgstr "" msgid "Loading ..." msgstr "" -#, c-format, boost-format -msgid "%d%%" -msgstr "" - -#, c-format, boost-format -msgid "%d" -msgstr "" - #, c-format, boost-format msgid "/%d Selected" msgstr "" diff --git a/localization/i18n/es/OrcaSlicer_es.po b/localization/i18n/es/OrcaSlicer_es.po index 994cf4373d..653c137fd9 100644 --- a/localization/i18n/es/OrcaSlicer_es.po +++ b/localization/i18n/es/OrcaSlicer_es.po @@ -6183,10 +6183,6 @@ msgstr "Capa: %s" msgid "Layer: %d/%d" msgstr "Capa: %d/%d" -#, c-format, boost-format -msgid "(%d)" -msgstr "" - msgid "" "Please heat the nozzle to above 170°C before loading or unloading filament." msgstr "" @@ -9880,9 +9876,6 @@ msgid "" " to continue or manually adjust it." msgstr "" -msgid "—> " -msgstr "" - msgid "" "Synchronizing AMS filaments will discard your modified but unsaved filament " "presets.\n" @@ -20445,9 +20438,6 @@ msgstr "" msgid "Zoom Out" msgstr "" -msgid "100 %" -msgstr "" - msgid "Zoom In" msgstr "" @@ -20457,14 +20447,6 @@ msgstr "" msgid "Loading ..." msgstr "" -#, c-format, boost-format -msgid "%d%%" -msgstr "" - -#, c-format, boost-format -msgid "%d" -msgstr "" - #, c-format, boost-format msgid "/%d Selected" msgstr "" diff --git a/localization/i18n/fr/OrcaSlicer_fr.po b/localization/i18n/fr/OrcaSlicer_fr.po index c2db4669f8..6ab8155718 100644 --- a/localization/i18n/fr/OrcaSlicer_fr.po +++ b/localization/i18n/fr/OrcaSlicer_fr.po @@ -6200,10 +6200,6 @@ msgstr "Couche : %s" msgid "Layer: %d/%d" msgstr "Couche : %d/%d" -#, c-format, boost-format -msgid "(%d)" -msgstr "" - msgid "" "Please heat the nozzle to above 170°C before loading or unloading filament." msgstr "" @@ -9955,9 +9951,6 @@ msgid "" " to continue or manually adjust it." msgstr "" -msgid "—> " -msgstr "" - msgid "" "Synchronizing AMS filaments will discard your modified but unsaved filament " "presets.\n" @@ -20814,9 +20807,6 @@ msgstr "" msgid "Zoom Out" msgstr "" -msgid "100 %" -msgstr "" - msgid "Zoom In" msgstr "" @@ -20826,14 +20816,6 @@ msgstr "" msgid "Loading ..." msgstr "" -#, c-format, boost-format -msgid "%d%%" -msgstr "" - -#, c-format, boost-format -msgid "%d" -msgstr "" - #, c-format, boost-format msgid "/%d Selected" msgstr "" diff --git a/localization/i18n/hu/OrcaSlicer_hu.po b/localization/i18n/hu/OrcaSlicer_hu.po index 85d9dcd8b2..6b55f6e50e 100644 --- a/localization/i18n/hu/OrcaSlicer_hu.po +++ b/localization/i18n/hu/OrcaSlicer_hu.po @@ -6005,10 +6005,6 @@ msgstr "" msgid "Layer: %d/%d" msgstr "" -#, c-format, boost-format -msgid "(%d)" -msgstr "" - #, fuzzy msgid "" "Please heat the nozzle to above 170°C before loading or unloading filament." @@ -9557,9 +9553,6 @@ msgid "" " to continue or manually adjust it." msgstr "" -msgid "—> " -msgstr "" - msgid "" "Synchronizing AMS filaments will discard your modified but unsaved filament " "presets.\n" @@ -18920,9 +18913,6 @@ msgstr "" msgid "Zoom Out" msgstr "" -msgid "100 %" -msgstr "" - msgid "Zoom In" msgstr "" @@ -18932,14 +18922,6 @@ msgstr "" msgid "Loading ..." msgstr "" -#, c-format, boost-format -msgid "%d%%" -msgstr "" - -#, c-format, boost-format -msgid "%d" -msgstr "" - #, c-format, boost-format msgid "/%d Selected" msgstr "" diff --git a/localization/i18n/it/OrcaSlicer_it.po b/localization/i18n/it/OrcaSlicer_it.po index 7381c8036a..43af44689b 100644 --- a/localization/i18n/it/OrcaSlicer_it.po +++ b/localization/i18n/it/OrcaSlicer_it.po @@ -6186,10 +6186,6 @@ msgstr "Strato: %s" msgid "Layer: %d/%d" msgstr "Strato: %d/%d" -#, c-format, boost-format -msgid "(%d)" -msgstr "" - msgid "" "Please heat the nozzle to above 170°C before loading or unloading filament." msgstr "" @@ -9886,9 +9882,6 @@ msgid "" " to continue or manually adjust it." msgstr "" -msgid "—> " -msgstr "" - msgid "" "Synchronizing AMS filaments will discard your modified but unsaved filament " "presets.\n" @@ -20708,9 +20701,6 @@ msgstr "Seleziona un singolo oggetto." msgid "Zoom Out" msgstr "" -msgid "100 %" -msgstr "" - msgid "Zoom In" msgstr "" @@ -20720,14 +20710,6 @@ msgstr "" msgid "Loading ..." msgstr "" -#, c-format, boost-format -msgid "%d%%" -msgstr "" - -#, c-format, boost-format -msgid "%d" -msgstr "" - #, c-format, boost-format msgid "/%d Selected" msgstr "" diff --git a/localization/i18n/ja/OrcaSlicer_ja.po b/localization/i18n/ja/OrcaSlicer_ja.po index be2c021a99..841ef0eb2f 100644 --- a/localization/i18n/ja/OrcaSlicer_ja.po +++ b/localization/i18n/ja/OrcaSlicer_ja.po @@ -5924,10 +5924,6 @@ msgstr "" msgid "Layer: %d/%d" msgstr "" -#, c-format, boost-format -msgid "(%d)" -msgstr "" - msgid "" "Please heat the nozzle to above 170°C before loading or unloading filament." msgstr "" @@ -9379,9 +9375,6 @@ msgid "" " to continue or manually adjust it." msgstr "" -msgid "—> " -msgstr "" - msgid "" "Synchronizing AMS filaments will discard your modified but unsaved filament " "presets.\n" @@ -18527,9 +18520,6 @@ msgstr "単一のオブジェクトを選択してください" msgid "Zoom Out" msgstr "" -msgid "100 %" -msgstr "" - msgid "Zoom In" msgstr "" @@ -18539,14 +18529,6 @@ msgstr "" msgid "Loading ..." msgstr "" -#, c-format, boost-format -msgid "%d%%" -msgstr "" - -#, c-format, boost-format -msgid "%d" -msgstr "" - #, c-format, boost-format msgid "/%d Selected" msgstr "" diff --git a/localization/i18n/ko/OrcaSlicer_ko.po b/localization/i18n/ko/OrcaSlicer_ko.po index 55f97a6ef3..a199ab1b91 100644 --- a/localization/i18n/ko/OrcaSlicer_ko.po +++ b/localization/i18n/ko/OrcaSlicer_ko.po @@ -6032,10 +6032,6 @@ msgstr "레이어: %s" msgid "Layer: %d/%d" msgstr "레이어: %d/%d" -#, c-format, boost-format -msgid "(%d)" -msgstr "" - #, fuzzy msgid "" "Please heat the nozzle to above 170°C before loading or unloading filament." @@ -9612,9 +9608,6 @@ msgid "" " to continue or manually adjust it." msgstr "" -msgid "—> " -msgstr "" - msgid "" "Synchronizing AMS filaments will discard your modified but unsaved filament " "presets.\n" @@ -19739,9 +19732,6 @@ msgstr "단일 객체를 선택하세요." msgid "Zoom Out" msgstr "" -msgid "100 %" -msgstr "" - msgid "Zoom In" msgstr "" @@ -19751,14 +19741,6 @@ msgstr "" msgid "Loading ..." msgstr "" -#, c-format, boost-format -msgid "%d%%" -msgstr "" - -#, c-format, boost-format -msgid "%d" -msgstr "" - #, c-format, boost-format msgid "/%d Selected" msgstr "" diff --git a/localization/i18n/lt/OrcaSlicer_lt.po b/localization/i18n/lt/OrcaSlicer_lt.po index ddcf18caba..c1afd6daf4 100644 --- a/localization/i18n/lt/OrcaSlicer_lt.po +++ b/localization/i18n/lt/OrcaSlicer_lt.po @@ -6162,10 +6162,7 @@ msgstr "Sluoksnis: %s" msgid "Layer: %d/%d" msgstr "Sluoksnis: %d/%d" -#, c-format, boost-format -msgid "(%d)" -msgstr "" - +#, fuzzy msgid "" "Please heat the nozzle to above 170°C before loading or unloading filament." msgstr "" @@ -9877,9 +9874,6 @@ msgid "" " to continue or manually adjust it." msgstr "" -msgid "—> " -msgstr "" - msgid "" "Synchronizing AMS filaments will discard your modified but unsaved filament " "presets.\n" @@ -20615,9 +20609,6 @@ msgstr "Pasirinkite vieną objektą." msgid "Zoom Out" msgstr "" -msgid "100 %" -msgstr "" - msgid "Zoom In" msgstr "" @@ -20627,14 +20618,6 @@ msgstr "" msgid "Loading ..." msgstr "" -#, c-format, boost-format -msgid "%d%%" -msgstr "" - -#, c-format, boost-format -msgid "%d" -msgstr "" - #, c-format, boost-format msgid "/%d Selected" msgstr "" diff --git a/localization/i18n/nl/OrcaSlicer_nl.po b/localization/i18n/nl/OrcaSlicer_nl.po index 6073869fb1..8f113ea6cf 100644 --- a/localization/i18n/nl/OrcaSlicer_nl.po +++ b/localization/i18n/nl/OrcaSlicer_nl.po @@ -6047,10 +6047,6 @@ msgstr "" msgid "Layer: %d/%d" msgstr "" -#, c-format, boost-format -msgid "(%d)" -msgstr "" - msgid "" "Please heat the nozzle to above 170°C before loading or unloading filament." msgstr "" @@ -9680,9 +9676,6 @@ msgid "" " to continue or manually adjust it." msgstr "" -msgid "—> " -msgstr "" - msgid "" "Synchronizing AMS filaments will discard your modified but unsaved filament " "presets.\n" @@ -19160,9 +19153,6 @@ msgstr "Selecteer een enkel object." msgid "Zoom Out" msgstr "" -msgid "100 %" -msgstr "" - msgid "Zoom In" msgstr "" @@ -19172,14 +19162,6 @@ msgstr "" msgid "Loading ..." msgstr "" -#, c-format, boost-format -msgid "%d%%" -msgstr "" - -#, c-format, boost-format -msgid "%d" -msgstr "" - #, c-format, boost-format msgid "/%d Selected" msgstr "" diff --git a/localization/i18n/pl/OrcaSlicer_pl.po b/localization/i18n/pl/OrcaSlicer_pl.po index 9e7d4e7a81..377d169a0c 100644 --- a/localization/i18n/pl/OrcaSlicer_pl.po +++ b/localization/i18n/pl/OrcaSlicer_pl.po @@ -6155,10 +6155,6 @@ msgstr "Warstwa: %s" msgid "Layer: %d/%d" msgstr "Warstwa: %d/%d" -#, c-format, boost-format -msgid "(%d)" -msgstr "" - msgid "" "Please heat the nozzle to above 170°C before loading or unloading filament." msgstr "" @@ -9819,9 +9815,6 @@ msgid "" " to continue or manually adjust it." msgstr "" -msgid "—> " -msgstr "" - msgid "" "Synchronizing AMS filaments will discard your modified but unsaved filament " "presets.\n" @@ -20454,9 +20447,6 @@ msgstr "Proszę wybrać pojedynczy obiekt." msgid "Zoom Out" msgstr "" -msgid "100 %" -msgstr "" - msgid "Zoom In" msgstr "" @@ -20466,14 +20456,6 @@ msgstr "" msgid "Loading ..." msgstr "" -#, c-format, boost-format -msgid "%d%%" -msgstr "" - -#, c-format, boost-format -msgid "%d" -msgstr "" - #, c-format, boost-format msgid "/%d Selected" msgstr "" diff --git a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po index 6b34939284..9c95c61285 100644 --- a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po +++ b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po @@ -6171,10 +6171,6 @@ msgstr "Camada: %s" msgid "Layer: %d/%d" msgstr "Camada: %d/%d" -#, c-format, boost-format -msgid "(%d)" -msgstr "" - msgid "" "Please heat the nozzle to above 170°C before loading or unloading filament." msgstr "" @@ -9894,9 +9890,6 @@ msgid "" " to continue or manually adjust it." msgstr "" -msgid "—> " -msgstr "" - msgid "" "Synchronizing AMS filaments will discard your modified but unsaved filament " "presets.\n" @@ -20735,9 +20728,6 @@ msgstr "Por favor selecione um único objeto." msgid "Zoom Out" msgstr "" -msgid "100 %" -msgstr "" - msgid "Zoom In" msgstr "" @@ -20747,14 +20737,6 @@ msgstr "" msgid "Loading ..." msgstr "" -#, c-format, boost-format -msgid "%d%%" -msgstr "" - -#, c-format, boost-format -msgid "%d" -msgstr "" - #, c-format, boost-format msgid "/%d Selected" msgstr "" diff --git a/localization/i18n/ru/OrcaSlicer_ru.po b/localization/i18n/ru/OrcaSlicer_ru.po index e0b5b637b8..fb3d5e3ab1 100644 --- a/localization/i18n/ru/OrcaSlicer_ru.po +++ b/localization/i18n/ru/OrcaSlicer_ru.po @@ -6222,10 +6222,6 @@ msgstr "Слой: %s" msgid "Layer: %d/%d" msgstr "Слой: %d/%d" -#, c-format, boost-format -msgid "(%d)" -msgstr "" - msgid "" "Please heat the nozzle to above 170°C before loading or unloading filament." msgstr "" @@ -9951,9 +9947,6 @@ msgid "" " to continue or manually adjust it." msgstr "" -msgid "—> " -msgstr "" - msgid "" "Synchronizing AMS filaments will discard your modified but unsaved filament " "presets.\n" @@ -20964,9 +20957,6 @@ msgstr "Пожалуйста, выберите один объект." msgid "Zoom Out" msgstr "" -msgid "100 %" -msgstr "" - msgid "Zoom In" msgstr "" @@ -20976,14 +20966,6 @@ msgstr "" msgid "Loading ..." msgstr "" -#, c-format, boost-format -msgid "%d%%" -msgstr "" - -#, c-format, boost-format -msgid "%d" -msgstr "" - #, c-format, boost-format msgid "/%d Selected" msgstr "" diff --git a/localization/i18n/sv/OrcaSlicer_sv.po b/localization/i18n/sv/OrcaSlicer_sv.po index 40a47c6385..0496e60877 100644 --- a/localization/i18n/sv/OrcaSlicer_sv.po +++ b/localization/i18n/sv/OrcaSlicer_sv.po @@ -5998,10 +5998,6 @@ msgstr "Lager: %s" msgid "Layer: %d/%d" msgstr "Lager: %d/%d" -#, c-format, boost-format -msgid "(%d)" -msgstr "" - msgid "" "Please heat the nozzle to above 170°C before loading or unloading filament." msgstr "Värm nozzeln till över 170°C innan du laddar eller matar ut filament." @@ -9559,9 +9555,6 @@ msgid "" " to continue or manually adjust it." msgstr "" -msgid "—> " -msgstr "" - msgid "" "Synchronizing AMS filaments will discard your modified but unsaved filament " "presets.\n" @@ -18834,9 +18827,6 @@ msgstr "" msgid "Zoom Out" msgstr "" -msgid "100 %" -msgstr "" - msgid "Zoom In" msgstr "" @@ -18846,14 +18836,6 @@ msgstr "" msgid "Loading ..." msgstr "" -#, c-format, boost-format -msgid "%d%%" -msgstr "" - -#, c-format, boost-format -msgid "%d" -msgstr "" - #, c-format, boost-format msgid "/%d Selected" msgstr "" diff --git a/localization/i18n/tr/OrcaSlicer_tr.po b/localization/i18n/tr/OrcaSlicer_tr.po index e50da443bc..30ef59f17e 100644 --- a/localization/i18n/tr/OrcaSlicer_tr.po +++ b/localization/i18n/tr/OrcaSlicer_tr.po @@ -6126,10 +6126,6 @@ msgstr "Katman: %s" msgid "Layer: %d/%d" msgstr "Katman: %d/%d" -#, c-format, boost-format -msgid "(%d)" -msgstr "" - msgid "" "Please heat the nozzle to above 170°C before loading or unloading filament." msgstr "" @@ -9803,9 +9799,6 @@ msgid "" " to continue or manually adjust it." msgstr "" -msgid "—> " -msgstr "" - msgid "" "Synchronizing AMS filaments will discard your modified but unsaved filament " "presets.\n" @@ -20507,9 +20500,6 @@ msgstr "Lütfen tek bir nesne seçin." msgid "Zoom Out" msgstr "" -msgid "100 %" -msgstr "" - msgid "Zoom In" msgstr "" @@ -20519,14 +20509,6 @@ msgstr "" msgid "Loading ..." msgstr "" -#, c-format, boost-format -msgid "%d%%" -msgstr "" - -#, c-format, boost-format -msgid "%d" -msgstr "" - #, c-format, boost-format msgid "/%d Selected" msgstr "" diff --git a/localization/i18n/uk/OrcaSlicer_uk.po b/localization/i18n/uk/OrcaSlicer_uk.po index 6d9d232e93..79a4c84e38 100644 --- a/localization/i18n/uk/OrcaSlicer_uk.po +++ b/localization/i18n/uk/OrcaSlicer_uk.po @@ -6166,10 +6166,6 @@ msgstr "Шар: %s" msgid "Layer: %d/%d" msgstr "Шар: %d/%d" -#, c-format, boost-format -msgid "(%d)" -msgstr "" - #, fuzzy msgid "" "Please heat the nozzle to above 170°C before loading or unloading filament." @@ -9845,9 +9841,6 @@ msgid "" " to continue or manually adjust it." msgstr "" -msgid "—> " -msgstr "" - msgid "" "Synchronizing AMS filaments will discard your modified but unsaved filament " "presets.\n" @@ -20418,9 +20411,6 @@ msgstr "Будь ласка, виберіть один об’єкт." msgid "Zoom Out" msgstr "" -msgid "100 %" -msgstr "" - msgid "Zoom In" msgstr "" @@ -20430,14 +20420,6 @@ msgstr "" msgid "Loading ..." msgstr "" -#, c-format, boost-format -msgid "%d%%" -msgstr "" - -#, c-format, boost-format -msgid "%d" -msgstr "" - #, c-format, boost-format msgid "/%d Selected" msgstr "" diff --git a/localization/i18n/vi/OrcaSlicer_vi.po b/localization/i18n/vi/OrcaSlicer_vi.po index 22365219f6..dffd0d2964 100644 --- a/localization/i18n/vi/OrcaSlicer_vi.po +++ b/localization/i18n/vi/OrcaSlicer_vi.po @@ -6059,10 +6059,6 @@ msgstr "Lớp: %s" msgid "Layer: %d/%d" msgstr "Lớp: %d/%d" -#, c-format, boost-format -msgid "(%d)" -msgstr "" - msgid "" "Please heat the nozzle to above 170°C before loading or unloading filament." msgstr "" @@ -9681,9 +9677,6 @@ msgid "" " to continue or manually adjust it." msgstr "" -msgid "—> " -msgstr "" - msgid "" "Synchronizing AMS filaments will discard your modified but unsaved filament " "presets.\n" @@ -20140,9 +20133,6 @@ msgstr "Vui lòng chọn một đối tượng duy nhất." msgid "Zoom Out" msgstr "" -msgid "100 %" -msgstr "" - msgid "Zoom In" msgstr "" @@ -20152,14 +20142,6 @@ msgstr "" msgid "Loading ..." msgstr "" -#, c-format, boost-format -msgid "%d%%" -msgstr "" - -#, c-format, boost-format -msgid "%d" -msgstr "" - #, c-format, boost-format msgid "/%d Selected" msgstr "" diff --git a/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po b/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po index 8fba082d6d..9071dd59b4 100644 --- a/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po +++ b/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po @@ -5953,10 +5953,6 @@ msgstr "层： %s" msgid "Layer: %d/%d" msgstr "层： %d/%d" -#, c-format, boost-format -msgid "(%d)" -msgstr "" - msgid "" "Please heat the nozzle to above 170°C before loading or unloading filament." msgstr "请在进料或退料前把喷嘴升温到170℃以上。" @@ -9441,9 +9437,6 @@ msgid "" " to continue or manually adjust it." msgstr "" -msgid "—> " -msgstr "" - msgid "" "Synchronizing AMS filaments will discard your modified but unsaved filament " "presets.\n" @@ -18945,9 +18938,6 @@ msgstr "请选中单个对象。" msgid "Zoom Out" msgstr "" -msgid "100 %" -msgstr "" - msgid "Zoom In" msgstr "" @@ -18957,14 +18947,6 @@ msgstr "" msgid "Loading ..." msgstr "" -#, c-format, boost-format -msgid "%d%%" -msgstr "" - -#, c-format, boost-format -msgid "%d" -msgstr "" - #, c-format, boost-format msgid "/%d Selected" msgstr "" diff --git a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po index 5d6bcb7541..7086f4388b 100644 --- a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po +++ b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po @@ -5960,10 +5960,6 @@ msgstr "%s 層" msgid "Layer: %d/%d" msgstr "%d/%d 層" -#, c-format, boost-format -msgid "(%d)" -msgstr "" - #, fuzzy msgid "" "Please heat the nozzle to above 170°C before loading or unloading filament." @@ -9461,9 +9457,6 @@ msgid "" " to continue or manually adjust it." msgstr "" -msgid "—> " -msgstr "" - msgid "" "Synchronizing AMS filaments will discard your modified but unsaved filament " "presets.\n" @@ -19120,9 +19113,6 @@ msgstr "請選擇一個物件。" msgid "Zoom Out" msgstr "" -msgid "100 %" -msgstr "" - msgid "Zoom In" msgstr "" @@ -19132,14 +19122,6 @@ msgstr "" msgid "Loading ..." msgstr "" -#, c-format, boost-format -msgid "%d%%" -msgstr "" - -#, c-format, boost-format -msgid "%d" -msgstr "" - #, c-format, boost-format msgid "/%d Selected" msgstr "" diff --git a/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp b/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp index e88c19fd3e..1b32e7234d 100644 --- a/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp +++ b/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp @@ -147,7 +147,7 @@ void uiAmsPercentHumidityDryPopup::UpdateContents() // table grid const wxString& humidity_str = wxString::Format("%d%%", m_humidity_percent); m_humidity_label->SetLabel(humidity_str); - const wxString& temp_str = wxString::Format(_L("%d \u2103"), (int)std::round(m_current_temperature)); + const wxString& temp_str = wxString::Format(u8"%d\u2103" /* °C */, (int)std::round(m_current_temperature)); m_temperature_label->SetLabel(temp_str); if (m_left_dry_time > 0) diff --git a/src/slic3r/GUI/ObjColorDialog.cpp b/src/slic3r/GUI/ObjColorDialog.cpp index e72459af62..1f75e61469 100644 --- a/src/slic3r/GUI/ObjColorDialog.cpp +++ b/src/slic3r/GUI/ObjColorDialog.cpp @@ -1029,7 +1029,7 @@ wxBoxSizer *ObjColorPanel::create_color_icon_map_rgba_sizer(wxWindow *parent, in icon_sizer->Add(icon, 0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, 0); // wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM icon_sizer->AddSpacer(FromDIP(10)); - wxStaticText *map_text = new wxStaticText(parent, wxID_ANY, _L("—> ")); + wxStaticText *map_text = new wxStaticText(parent, wxID_ANY, u8"—> "); map_text->SetFont(Label::Head_12); icon_sizer->Add(map_text, 0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, 0); diff --git a/src/slic3r/GUI/PartSkipDialog.cpp b/src/slic3r/GUI/PartSkipDialog.cpp index 0956bf9fe1..efc8c7b60e 100644 --- a/src/slic3r/GUI/PartSkipDialog.cpp +++ b/src/slic3r/GUI/PartSkipDialog.cpp @@ -110,7 +110,7 @@ PartSkipDialog::PartSkipDialog(wxWindow *parent) : DPIDialog(parent, wxID_ANY, _ m_zoom_out_btn->SetCornerRadius(0); m_zoom_out_btn->SetMinSize(wxSize(FromDIP(56), FromDIP(28))); - m_percent_label = new Button(m_book_third_panel, _L("100 %")); + m_percent_label = new Button(m_book_third_panel, "100%"); m_percent_label->SetBackgroundColor(percent_bg); m_percent_label->SetBorderColor(wxColour(238, 238, 238)); m_percent_label->SetMinSize(wxSize(FromDIP(56), FromDIP(28))); @@ -664,7 +664,7 @@ void PartSkipDialog::UpdatePartsStateFromCanvas(wxCommandEvent &event) UpdateDialogUI(); } -void PartSkipDialog::UpdateZoomPercent() { m_percent_label->SetLabel(wxString::Format(_L("%d%%"), m_zoom_percent)); } +void PartSkipDialog::UpdateZoomPercent() { m_percent_label->SetLabel(wxString::Format("%d%%", m_zoom_percent)); } void PartSkipDialog::UpdateCountLabel() { @@ -674,7 +674,7 @@ void PartSkipDialog::UpdateCountLabel() if (part_state == PartState::psChecked) check_cnt++; if (part_state != PartState::psSkipped) tot_cnt++; } - m_cnt_label->SetLabel(wxString::Format(_L("%d"), check_cnt)); + m_cnt_label->SetLabel(wxString::Format("%d", check_cnt)); m_cnt_label->Fit(); m_tot_label->SetLabel(wxString::Format(_L("/%d Selected"), tot_cnt)); m_tot_label->Fit(); diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index 688882f969..c1533e7ded 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -3820,7 +3820,7 @@ void StatusPanel::update_partskip_subtask(MachineObject *obj){ BOOST_LOG_TRIVIAL(info) << "part skip: recv printer normal data."; } if (part_cnt > 0) - partskip_button->SetLabel(wxString::Format(_L("(%d)"), part_cnt)); + partskip_button->SetLabel(wxString::Format("(%d)", part_cnt)); else partskip_button->SetLabel(""); } From b88aee4c0b84f093a006da66e0f5705b9eba9e75 Mon Sep 17 00:00:00 2001 From: innovatiQ Date: Fri, 7 Nov 2025 18:00:32 +0100 Subject: [PATCH 5/7] 3 new machine files added to both TiQ2 and TiQ8 machines (#11297) * Added InnovatiQ Vendor Files * Cover image corrected * Corrected Texture Image * Support Interface Pattern modified * Fix file name casing * Added new filament(PETG) * changed three parameters * Added 6 new printer files 0.25, 0.6, 0.8 printer profiles are added to TiQ2 and TiQ8 * Added 6 new machines in machine list * 6 new machines added in machine list --------- Co-authored-by: MohanS Co-authored-by: Noisyfox Co-authored-by: Ashidsha Jaleel Co-authored-by: SoftFever --- resources/profiles/iQ.json | 57 +++++-- .../iQ/machine/iQ TiQ2 0.25 nozzle.json | 133 +++++++++++++++++ .../iQ/machine/iQ TiQ2 0.6 nozzle.json | 133 +++++++++++++++++ .../iQ/machine/iQ TiQ2 0.8 nozzle.json | 133 +++++++++++++++++ .../iQ/machine/iQ TiQ8 0.25 nozzle.json | 141 ++++++++++++++++++ .../iQ/machine/iQ TiQ8 0.6 nozzle.json | 141 ++++++++++++++++++ .../iQ/machine/iQ TiQ8 0.8 nozzle.json | 141 ++++++++++++++++++ 7 files changed, 867 insertions(+), 12 deletions(-) create mode 100644 resources/profiles/iQ/machine/iQ TiQ2 0.25 nozzle.json create mode 100644 resources/profiles/iQ/machine/iQ TiQ2 0.6 nozzle.json create mode 100644 resources/profiles/iQ/machine/iQ TiQ2 0.8 nozzle.json create mode 100644 resources/profiles/iQ/machine/iQ TiQ8 0.25 nozzle.json create mode 100644 resources/profiles/iQ/machine/iQ TiQ8 0.6 nozzle.json create mode 100644 resources/profiles/iQ/machine/iQ TiQ8 0.8 nozzle.json diff --git a/resources/profiles/iQ.json b/resources/profiles/iQ.json index cd63d72964..1876c4f6a1 100644 --- a/resources/profiles/iQ.json +++ b/resources/profiles/iQ.json @@ -15,17 +15,50 @@ ], "machine_list": [ { - "name": "fdm_tiq_common", - "sub_path": "machine/fdm_tiq_common.json" - }, - { - "name": "iQ TiQ2 0.4 Nozzle", - "sub_path": "machine/iQ TiQ2 0.4 nozzle.json" - }, - { - "name": "iQ TiQ8 0.4 Nozzle", - "sub_path": "machine/iQ TiQ8 0.4 nozzle.json" - } + "name": "fdm_tiq_common", + "sub_path": "machine/fdm_tiq_common.json" + }, + + { + "name": "iQ TiQ2 0.4 Nozzle", + "sub_path": "machine/iQ TiQ2 0.4 nozzle.json" + }, + + { + "name": "iQ TiQ2 0.25 Nozzle", + "sub_path": "machine/iQ TiQ2 0.25 nozzle.json" + }, + + { + "name": "iQ TiQ2 0.6 Nozzle", + "sub_path": "machine/iQ TiQ2 0.6 nozzle.json" + }, + + { + "name": "iQ TiQ2 0.8 Nozzle", + "sub_path": "machine/iQ TiQ2 0.8 nozzle.json" + }, + + { + "name": "iQ TiQ8 0.4 Nozzle", + "sub_path": "machine/iQ TiQ8 0.4 nozzle.json" + }, + + { + "name": "iQ TiQ8 0.25 Nozzle", + "sub_path": "machine/iQ TiQ8 0.25 nozzle.json" + }, + + { + "name": "iQ TiQ8 0.6 Nozzle", + "sub_path": "machine/iQ TiQ8 0.6 nozzle.json" + }, + + { + "name": "iQ TiQ8 0.8 Nozzle", + "sub_path": "machine/iQ TiQ8 0.8 nozzle.json" + } + ], "process_list": [ { @@ -63,4 +96,4 @@ "sub_path": "filament/Polymaker PETG Polymax black P1 @iQ TiQ2 0.4 Nozzle.json" } ] -} \ No newline at end of file +} diff --git a/resources/profiles/iQ/machine/iQ TiQ2 0.25 nozzle.json b/resources/profiles/iQ/machine/iQ TiQ2 0.25 nozzle.json new file mode 100644 index 0000000000..b29938c55d --- /dev/null +++ b/resources/profiles/iQ/machine/iQ TiQ2 0.25 nozzle.json @@ -0,0 +1,133 @@ +{ + "type": "machine", + "name": "iQ TiQ2 0.25 Nozzle", + "inherits": "fdm_tiq_common", + "from": "system", + "instantiation": "true", + "printer_settings_id": "iQ TiQ2 0.25 Nozzle", + "printer_model": "TiQ2", + "printer_variant": "0.25", + "printer_notes": "Machine file version 1.0 20251106", + "change_filament_gcode": "G1 Z{layer_z+2} F900 ; safe distance while tool change\nG1 X32 Y3 F3000\nM109 S{nozzle_temperature[next_extruder]} T[next_extruder] ; set new tool temperature so it can start heating while changing\n", + "deretraction_speed": [ + "30", + "30" + ], + "disable_m73": "1", + "emit_machine_limits_to_gcode": "0", + "enable_filament_ramming": "0", + "extruder_colour": [ + "#FCE94F", + "#FCE94F" + ], + "extruder_offset": [ + "0x0", + "0x0" + ], + "gcode_flavor": "marlin", + "host_type": "simplyprint", + "long_retractions_when_cut": [ + "0", + "0" + ], + "machine_end_gcode": "G1 X-19 F3000 ; home X axis\nG1 Y1 F3000 ; home Y axis\nM104 S0 T0 ; turn off extruder\nM104 S0 T1 ; turn off extruder\nM104 S0 T2 ; turn off extruder\nM140 S0 ; turn off bed\nM106 S0 ; turn off fan\nM806 S0 ; turn of housing fan\nM84 ; disable motor\n", + "machine_max_speed_z": [ + "15", + "12" + ], + "machine_pause_gcode": "M10710 S0", + "machine_start_gcode": "T[initial_extruder]\nM109 S{nozzle_temperature_initial_layer[current_extruder]}\nG1 Z15 F900\nG1 X-19 Y1 F9000\nG1 X-19 Y45 F9000\nG1 Y1 F9000\nG1 Y45 F9000\nG1 Y1 F9000\nG1 Y45 F9000\nG1 X0", + "max_layer_height": [ + "0.2", + "0.2" + ], + "min_layer_height": [ + "0.08", + "0.08" + ], + "nozzle_diameter": [ + "0.25", + "0.25" + ], + "print_host": "https://simplyprint.io/panel", + "printable_area": [ + "0x0", + "330x0", + "330x330", + "0x330" + ], + "printable_height":"300", + "retract_before_wipe": [ + "70%", + "70%" + ], + "retract_length_toolchange": [ + "10", + "12" + ], + "retract_lift_above": [ + "0", + "0" + ], + "retract_lift_below": [ + "0", + "0" + ], + "retract_lift_enforce": [ + "All Surfaces", + "All Surfaces" + ], + "retract_on_top_layer": [ + "1", + "1" + ], + "retract_restart_extra": [ + "0", + "0" + ], + "retract_restart_extra_toolchange": [ + "-0.2", + "-0.2" + ], + "retract_when_changing_layer": [ + "1", + "1" + ], + "retraction_distances_when_cut": [ + "18", + "18" + ], + "retraction_length": [ + "0.8", + "0.9" + ], + "retraction_minimum_travel": [ + "1", + "1" + ], + "retraction_speed": [ + "30", + "30" + ], + "thumbnails": "", + "travel_slope": [ + "3", + "3" + ], + "wipe": [ + "1", + "1" + ], + "wipe_distance": [ + "1", + "1" + ], + "z_hop": [ + "0.25", + "0.25" + ], + "z_hop_types": [ + "Normal Lift", + "Normal Lift" + ] +} diff --git a/resources/profiles/iQ/machine/iQ TiQ2 0.6 nozzle.json b/resources/profiles/iQ/machine/iQ TiQ2 0.6 nozzle.json new file mode 100644 index 0000000000..64b38501b1 --- /dev/null +++ b/resources/profiles/iQ/machine/iQ TiQ2 0.6 nozzle.json @@ -0,0 +1,133 @@ +{ + "type": "machine", + "name": "iQ TiQ2 0.6 Nozzle", + "inherits": "fdm_tiq_common", + "from": "system", + "instantiation": "true", + "printer_settings_id": "iQ TiQ2 0.6 Nozzle", + "printer_model": "TiQ2", + "printer_variant": "0.6", + "printer_notes": "Machine file version 1.0 20251106", + "change_filament_gcode": "G1 Z{layer_z+2} F900 ; safe distance while tool change\nG1 X32 Y3 F3000\nM109 S{nozzle_temperature[next_extruder]} T[next_extruder] ; set new tool temperature so it can start heating while changing\n", + "deretraction_speed": [ + "30", + "30" + ], + "disable_m73": "1", + "emit_machine_limits_to_gcode": "0", + "enable_filament_ramming": "0", + "extruder_colour": [ + "#FCE94F", + "#FCE94F" + ], + "extruder_offset": [ + "0x0", + "0x0" + ], + "gcode_flavor": "marlin", + "host_type": "simplyprint", + "long_retractions_when_cut": [ + "0", + "0" + ], + "machine_end_gcode": "G1 X-19 F3000 ; home X axis\nG1 Y1 F3000 ; home Y axis\nM104 S0 T0 ; turn off extruder\nM104 S0 T1 ; turn off extruder\nM104 S0 T2 ; turn off extruder\nM140 S0 ; turn off bed\nM106 S0 ; turn off fan\nM806 S0 ; turn of housing fan\nM84 ; disable motor\n", + "machine_max_speed_z": [ + "15", + "12" + ], + "machine_pause_gcode": "M10710 S0", + "machine_start_gcode": "T[initial_extruder]\nM109 S{nozzle_temperature_initial_layer[current_extruder]}\nG1 Z15 F900\nG1 X-19 Y1 F9000\nG1 X-19 Y45 F9000\nG1 Y1 F9000\nG1 Y45 F9000\nG1 Y1 F9000\nG1 Y45 F9000\nG1 X0", + "max_layer_height": [ + "0.6", + "0.6" + ], + "min_layer_height": [ + "0.08", + "0.08" + ], + "nozzle_diameter": [ + "0.6", + "0.6" + ], + "print_host": "https://simplyprint.io/panel", + "printable_area": [ + "0x0", + "330x0", + "330x330", + "0x330" + ], + "printable_height":"300", + "retract_before_wipe": [ + "70%", + "70%" + ], + "retract_length_toolchange": [ + "10", + "12" + ], + "retract_lift_above": [ + "0", + "0" + ], + "retract_lift_below": [ + "0", + "0" + ], + "retract_lift_enforce": [ + "All Surfaces", + "All Surfaces" + ], + "retract_on_top_layer": [ + "1", + "1" + ], + "retract_restart_extra": [ + "0", + "0" + ], + "retract_restart_extra_toolchange": [ + "-0.2", + "-0.2" + ], + "retract_when_changing_layer": [ + "1", + "1" + ], + "retraction_distances_when_cut": [ + "18", + "18" + ], + "retraction_length": [ + "0.8", + "0.9" + ], + "retraction_minimum_travel": [ + "1", + "1" + ], + "retraction_speed": [ + "30", + "30" + ], + "thumbnails": "", + "travel_slope": [ + "3", + "3" + ], + "wipe": [ + "1", + "1" + ], + "wipe_distance": [ + "1", + "1" + ], + "z_hop": [ + "0.6", + "0.6" + ], + "z_hop_types": [ + "Normal Lift", + "Normal Lift" + ] +} diff --git a/resources/profiles/iQ/machine/iQ TiQ2 0.8 nozzle.json b/resources/profiles/iQ/machine/iQ TiQ2 0.8 nozzle.json new file mode 100644 index 0000000000..c94d0f1765 --- /dev/null +++ b/resources/profiles/iQ/machine/iQ TiQ2 0.8 nozzle.json @@ -0,0 +1,133 @@ +{ + "type": "machine", + "name": "iQ TiQ2 0.8 Nozzle", + "inherits": "fdm_tiq_common", + "from": "system", + "instantiation": "true", + "printer_settings_id": "iQ TiQ2 0.8 Nozzle", + "printer_model": "TiQ2", + "printer_variant": "0.8", + "printer_notes": "Machine file version 1.0 20251106", + "change_filament_gcode": "G1 Z{layer_z+2} F900 ; safe distance while tool change\nG1 X32 Y3 F3000\nM109 S{nozzle_temperature[next_extruder]} T[next_extruder] ; set new tool temperature so it can start heating while changing\n", + "deretraction_speed": [ + "30", + "30" + ], + "disable_m73": "1", + "emit_machine_limits_to_gcode": "0", + "enable_filament_ramming": "0", + "extruder_colour": [ + "#FCE94F", + "#FCE94F" + ], + "extruder_offset": [ + "0x0", + "0x0" + ], + "gcode_flavor": "marlin", + "host_type": "simplyprint", + "long_retractions_when_cut": [ + "0", + "0" + ], + "machine_end_gcode": "G1 X-19 F3000 ; home X axis\nG1 Y1 F3000 ; home Y axis\nM104 S0 T0 ; turn off extruder\nM104 S0 T1 ; turn off extruder\nM104 S0 T2 ; turn off extruder\nM140 S0 ; turn off bed\nM106 S0 ; turn off fan\nM806 S0 ; turn of housing fan\nM84 ; disable motor\n", + "machine_max_speed_z": [ + "15", + "12" + ], + "machine_pause_gcode": "M10710 S0", + "machine_start_gcode": "T[initial_extruder]\nM109 S{nozzle_temperature_initial_layer[current_extruder]}\nG1 Z15 F900\nG1 X-19 Y1 F9000\nG1 X-19 Y45 F9000\nG1 Y1 F9000\nG1 Y45 F9000\nG1 Y1 F9000\nG1 Y45 F9000\nG1 X0", + "max_layer_height": [ + "0.8", + "0.8" + ], + "min_layer_height": [ + "0.08", + "0.08" + ], + "nozzle_diameter": [ + "0.8", + "0.8" + ], + "print_host": "https://simplyprint.io/panel", + "printable_area": [ + "0x0", + "330x0", + "330x330", + "0x330" + ], + "printable_height":"300", + "retract_before_wipe": [ + "70%", + "70%" + ], + "retract_length_toolchange": [ + "10", + "12" + ], + "retract_lift_above": [ + "0", + "0" + ], + "retract_lift_below": [ + "0", + "0" + ], + "retract_lift_enforce": [ + "All Surfaces", + "All Surfaces" + ], + "retract_on_top_layer": [ + "1", + "1" + ], + "retract_restart_extra": [ + "0", + "0" + ], + "retract_restart_extra_toolchange": [ + "-0.2", + "-0.2" + ], + "retract_when_changing_layer": [ + "1", + "1" + ], + "retraction_distances_when_cut": [ + "18", + "18" + ], + "retraction_length": [ + "0.8", + "0.9" + ], + "retraction_minimum_travel": [ + "1", + "1" + ], + "retraction_speed": [ + "30", + "30" + ], + "thumbnails": "", + "travel_slope": [ + "3", + "3" + ], + "wipe": [ + "1", + "1" + ], + "wipe_distance": [ + "1", + "1" + ], + "z_hop": [ + "0.8", + "0.8" + ], + "z_hop_types": [ + "Normal Lift", + "Normal Lift" + ] +} diff --git a/resources/profiles/iQ/machine/iQ TiQ8 0.25 nozzle.json b/resources/profiles/iQ/machine/iQ TiQ8 0.25 nozzle.json new file mode 100644 index 0000000000..62851cddb9 --- /dev/null +++ b/resources/profiles/iQ/machine/iQ TiQ8 0.25 nozzle.json @@ -0,0 +1,141 @@ +{ + "type": "machine", + "name": "iQ TiQ8 0.25 Nozzle", + "inherits": "fdm_tiq_common", + "from": "system", + "instantiation": "true", + "printer_settings_id": "iQ TiQ8 0.25 Nozzle", + "printer_model": "TiQ8", + "printer_variant": "0.25", + "change_filament_gcode": "G1 Z{layer_z+2} F900 ; safe distance while tool change\n{if next_extruder==0}G1 X30 Y-12 F9000{endif}\nM109 S{nozzle_temperature[next_extruder]} T[next_extruder] ; set new tool temperature so it can start heating while changing", + "deretraction_speed": [ + "30", + "30" + ], + "disable_m73": "1", + "emit_machine_limits_to_gcode": "0", + "enable_filament_ramming": "0", + "extruder_colour": [ + "#FCE94F", + "#FCE94F" + ], + "extruder_offset": [ + "0x0", + "0x0" + ], + "gcode_flavor": "marlin", + "host_type": "simplyprint", + "long_retractions_when_cut": [ + "0", + "0" + ], + "machine_end_gcode": "G1 X10 F3000 ; home X axis\nG1 Y10 F3000 ; home Y axis\nM104 S0 T0 ; turn off extruder\nM104 S0 T1 ; turn off extruder\nM104 S0 T2 ; turn off extruder\nM140 S0 ; turn off bed\n{if nozzle_temperature_initial_layer[current_extruder]>350}M140 S80{endif} ; Keep bed hot for easy part removal from PEI sheet\nM106 S0 ; turn off fan\nM806 S0 ; turn of housing fan\nM84 ; disable motor\n", + "machine_max_speed_z": [ + "15", + "12" + ], + "machine_pause_gcode": "M10710 S0", + "machine_start_gcode": "T[initial_extruder]\nM109 S{nozzle_temperature_initial_layer[current_extruder]}\n", + "max_layer_height": [ + "0.25", + "0.25" + ], + "min_layer_height": [ + "0.08", + "0.08" + ], + "nozzle_diameter": [ + "0.25", + "0.25" + ], + "print_host": "https://simplyprint.io/panel", + "printable_area": [ + "0x0", + "500x0", + "500x400", + "0x400" + ], + "printable_height": "450", + "retract_before_wipe": [ + "70%", + "70%" + ], + "retract_length_toolchange": [ + "15", + "15" + ], + "retract_lift_above": [ + "0", + "0" + ], + "retract_lift_below": [ + "0", + "0" + ], + "retract_lift_enforce": [ + "All Surfaces", + "All Surfaces" + ], + "retract_on_top_layer": [ + "1", + "1" + ], + "retract_restart_extra": [ + "0", + "0" + ], + "retract_restart_extra_toolchange": [ + "-0.2", + "-0.2" + ], + "retract_when_changing_layer": [ + "1", + "1" + ], + "retraction_distances_when_cut": [ + "18", + "18" + ], + "retraction_length": [ + "0.8", + "0.9" + ], + "retraction_minimum_travel": [ + "1", + "1" + ], + "retraction_speed": [ + "30", + "30" + ], + "thumbnails": "", + "travel_slope": [ + "3", + "3" + ], + "wipe": [ + "1", + "1" + ], + "wipe_distance": [ + "1", + "1" + ], + "z_hop": [ + "0.25", + "0.25" + ], + "z_hop_types": [ + "Normal Lift", + "Normal Lift" + ], + "machine_max_acceleration_x": [ + "1500", + "1500" + ], + "machine_max_acceleration_y": [ + "1500", + "1500" + ], + "printer_notes": "Machine file version 1.0 20251106" +} \ No newline at end of file diff --git a/resources/profiles/iQ/machine/iQ TiQ8 0.6 nozzle.json b/resources/profiles/iQ/machine/iQ TiQ8 0.6 nozzle.json new file mode 100644 index 0000000000..e01379ec0e --- /dev/null +++ b/resources/profiles/iQ/machine/iQ TiQ8 0.6 nozzle.json @@ -0,0 +1,141 @@ +{ + "type": "machine", + "name": "iQ TiQ8 0.6 Nozzle", + "inherits": "fdm_tiq_common", + "from": "system", + "instantiation": "true", + "printer_settings_id": "iQ TiQ8 0.6 Nozzle", + "printer_model": "TiQ8", + "printer_variant": "0.6", + "change_filament_gcode": "G1 Z{layer_z+2} F900 ; safe distance while tool change\n{if next_extruder==0}G1 X30 Y-12 F9000{endif}\nM109 S{nozzle_temperature[next_extruder]} T[next_extruder] ; set new tool temperature so it can start heating while changing", + "deretraction_speed": [ + "30", + "30" + ], + "disable_m73": "1", + "emit_machine_limits_to_gcode": "0", + "enable_filament_ramming": "0", + "extruder_colour": [ + "#FCE94F", + "#FCE94F" + ], + "extruder_offset": [ + "0x0", + "0x0" + ], + "gcode_flavor": "marlin", + "host_type": "simplyprint", + "long_retractions_when_cut": [ + "0", + "0" + ], + "machine_end_gcode": "G1 X10 F3000 ; home X axis\nG1 Y10 F3000 ; home Y axis\nM104 S0 T0 ; turn off extruder\nM104 S0 T1 ; turn off extruder\nM104 S0 T2 ; turn off extruder\nM140 S0 ; turn off bed\n{if nozzle_temperature_initial_layer[current_extruder]>350}M140 S80{endif} ; Keep bed hot for easy part removal from PEI sheet\nM106 S0 ; turn off fan\nM806 S0 ; turn of housing fan\nM84 ; disable motor\n", + "machine_max_speed_z": [ + "15", + "12" + ], + "machine_pause_gcode": "M10710 S0", + "machine_start_gcode": "T[initial_extruder]\nM109 S{nozzle_temperature_initial_layer[current_extruder]}\n", + "max_layer_height": [ + "0.6", + "0.6" + ], + "min_layer_height": [ + "0.08", + "0.08" + ], + "nozzle_diameter": [ + "0.6", + "0.6" + ], + "print_host": "https://simplyprint.io/panel", + "printable_area": [ + "0x0", + "500x0", + "500x400", + "0x400" + ], + "printable_height": "450", + "retract_before_wipe": [ + "70%", + "70%" + ], + "retract_length_toolchange": [ + "15", + "15" + ], + "retract_lift_above": [ + "0", + "0" + ], + "retract_lift_below": [ + "0", + "0" + ], + "retract_lift_enforce": [ + "All Surfaces", + "All Surfaces" + ], + "retract_on_top_layer": [ + "1", + "1" + ], + "retract_restart_extra": [ + "0", + "0" + ], + "retract_restart_extra_toolchange": [ + "-0.2", + "-0.2" + ], + "retract_when_changing_layer": [ + "1", + "1" + ], + "retraction_distances_when_cut": [ + "18", + "18" + ], + "retraction_length": [ + "0.8", + "0.9" + ], + "retraction_minimum_travel": [ + "1", + "1" + ], + "retraction_speed": [ + "30", + "30" + ], + "thumbnails": "", + "travel_slope": [ + "3", + "3" + ], + "wipe": [ + "1", + "1" + ], + "wipe_distance": [ + "1", + "1" + ], + "z_hop": [ + "0.6", + "0.6" + ], + "z_hop_types": [ + "Normal Lift", + "Normal Lift" + ], + "machine_max_acceleration_x": [ + "1500", + "1500" + ], + "machine_max_acceleration_y": [ + "1500", + "1500" + ], + "printer_notes": "Machine file version 1.0 20251106" +} \ No newline at end of file diff --git a/resources/profiles/iQ/machine/iQ TiQ8 0.8 nozzle.json b/resources/profiles/iQ/machine/iQ TiQ8 0.8 nozzle.json new file mode 100644 index 0000000000..aa92217874 --- /dev/null +++ b/resources/profiles/iQ/machine/iQ TiQ8 0.8 nozzle.json @@ -0,0 +1,141 @@ +{ + "type": "machine", + "name": "iQ TiQ8 0.8 Nozzle", + "inherits": "fdm_tiq_common", + "from": "system", + "instantiation": "true", + "printer_settings_id": "iQ TiQ8 0.8 Nozzle", + "printer_model": "TiQ8", + "printer_variant": "0.8", + "change_filament_gcode": "G1 Z{layer_z+2} F900 ; safe distance while tool change\n{if next_extruder==0}G1 X30 Y-12 F9000{endif}\nM109 S{nozzle_temperature[next_extruder]} T[next_extruder] ; set new tool temperature so it can start heating while changing", + "deretraction_speed": [ + "30", + "30" + ], + "disable_m73": "1", + "emit_machine_limits_to_gcode": "0", + "enable_filament_ramming": "0", + "extruder_colour": [ + "#FCE94F", + "#FCE94F" + ], + "extruder_offset": [ + "0x0", + "0x0" + ], + "gcode_flavor": "marlin", + "host_type": "simplyprint", + "long_retractions_when_cut": [ + "0", + "0" + ], + "machine_end_gcode": "G1 X10 F3000 ; home X axis\nG1 Y10 F3000 ; home Y axis\nM104 S0 T0 ; turn off extruder\nM104 S0 T1 ; turn off extruder\nM104 S0 T2 ; turn off extruder\nM140 S0 ; turn off bed\n{if nozzle_temperature_initial_layer[current_extruder]>350}M140 S80{endif} ; Keep bed hot for easy part removal from PEI sheet\nM106 S0 ; turn off fan\nM806 S0 ; turn of housing fan\nM84 ; disable motor\n", + "machine_max_speed_z": [ + "15", + "12" + ], + "machine_pause_gcode": "M10710 S0", + "machine_start_gcode": "T[initial_extruder]\nM109 S{nozzle_temperature_initial_layer[current_extruder]}\n", + "max_layer_height": [ + "0.8", + "0.8" + ], + "min_layer_height": [ + "0.08", + "0.08" + ], + "nozzle_diameter": [ + "0.8", + "0.8" + ], + "print_host": "https://simplyprint.io/panel", + "printable_area": [ + "0x0", + "500x0", + "500x400", + "0x400" + ], + "printable_height": "450", + "retract_before_wipe": [ + "70%", + "70%" + ], + "retract_length_toolchange": [ + "15", + "15" + ], + "retract_lift_above": [ + "0", + "0" + ], + "retract_lift_below": [ + "0", + "0" + ], + "retract_lift_enforce": [ + "All Surfaces", + "All Surfaces" + ], + "retract_on_top_layer": [ + "1", + "1" + ], + "retract_restart_extra": [ + "0", + "0" + ], + "retract_restart_extra_toolchange": [ + "-0.2", + "-0.2" + ], + "retract_when_changing_layer": [ + "1", + "1" + ], + "retraction_distances_when_cut": [ + "18", + "18" + ], + "retraction_length": [ + "0.8", + "0.9" + ], + "retraction_minimum_travel": [ + "1", + "1" + ], + "retraction_speed": [ + "30", + "30" + ], + "thumbnails": "", + "travel_slope": [ + "3", + "3" + ], + "wipe": [ + "1", + "1" + ], + "wipe_distance": [ + "1", + "1" + ], + "z_hop": [ + "0.8", + "0.8" + ], + "z_hop_types": [ + "Normal Lift", + "Normal Lift" + ], + "machine_max_acceleration_x": [ + "1500", + "1500" + ], + "machine_max_acceleration_y": [ + "1500", + "1500" + ], + "printer_notes": "Machine file version 1.0 20251106" +} \ No newline at end of file From 8fce6c68b86b2e2266e8839ea81c7f2838731805 Mon Sep 17 00:00:00 2001 From: Mister Anderson <50129983+MisterAnderson91@users.noreply.github.com> Date: Sat, 8 Nov 2025 03:21:56 +1000 Subject: [PATCH 6/7] Flash forge ad5m gcode filename update (#11278) * Update 0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle.json Change filename_format to include material and print time * Update filename format in Flashforge profile * Update 0.40mm Standard @Flashforge AD5M Pro 0.8 Nozzle.json * Update filename format in Flashforge profile * Update filename format in Flashforge profile * Update filename format in Flashforge profile * Update filename format in Flashforge profile * Update filename format in Flashforge profile * Update filename format in Flashforge profile * Update filename format in Flashforge profile * Update filename format in Flashforge profile * Update filename format in Flashforge profile * Update filename format in Flashforge profile * Update filename format in Flashforge profile * Update filename format in Flashforge profile * Update filename format in Flashforge profile * Update filename format in Flashforge profile * Update filename format in Flashforge profile * Update filename format in Flashforge profile * Update filename format in Flashforge profile * Update filename format in Flashforge profile * Update filename format in Flashforge profile * Update filename format in Flashforge profile * Update filename format in Flashforge profile * Update filename format in Flashforge profile * Update filename format in Flashforge profile * Update filename format in Flashforge profile * Update filename format in Flashforge profile --- .../process/0.06mm Standard @Flashforge AD5M 0.25 Nozzle.json | 4 ++-- .../0.06mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json | 4 ++-- .../process/0.08mm Standard @Flashforge AD5M 0.25 Nozzle.json | 4 ++-- .../0.08mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json | 4 ++-- .../process/0.10mm Standard @Flashforge AD5M 0.25 Nozzle.json | 4 ++-- .../0.10mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json | 4 ++-- .../process/0.12mm Fine @Flashforge AD5M 0.4 Nozzle.json | 4 ++-- .../process/0.12mm Fine @Flashforge AD5M Pro 0.4 Nozzle.json | 4 ++-- .../process/0.12mm Standard @Flashforge AD5M 0.25 Nozzle.json | 4 ++-- .../0.12mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json | 4 ++-- .../process/0.14mm Standard @Flashforge AD5M 0.25 Nozzle.json | 4 ++-- .../0.14mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json | 4 ++-- .../process/0.18mm Fine @Flashforge AD5M 0.6 Nozzle.json | 4 ++-- .../process/0.18mm Fine @Flashforge AD5M Pro 0.6 Nozzle.json | 4 ++-- .../process/0.20mm Standard @Flashforge AD5M 0.4 Nozzle.json | 4 ++-- .../0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle.json | 4 ++-- .../process/0.24mm Draft @Flashforge AD5M 0.4 Nozzle.json | 4 ++-- .../process/0.24mm Draft @Flashforge AD5M Pro 0.4 Nozzle.json | 4 ++-- .../process/0.24mm Fine @Flashforge AD5M 0.8 Nozzle.json | 4 ++-- .../process/0.24mm Fine @Flashforge AD5M Pro 0.8 Nozzle.json | 4 ++-- .../process/0.30mm Standard @Flashforge AD5M 0.6 Nozzle.json | 4 ++-- .../0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle.json | 4 ++-- .../process/0.40mm Standard @Flashforge AD5M 0.8 Nozzle.json | 4 ++-- .../0.40mm Standard @Flashforge AD5M Pro 0.8 Nozzle.json | 4 ++-- .../process/0.42mm Draft @Flashforge AD5M 0.6 Nozzle.json | 4 ++-- .../process/0.42mm Draft @Flashforge AD5M Pro 0.6 Nozzle.json | 4 ++-- .../process/0.56mm Draft @Flashforge AD5M 0.8 Nozzle.json | 4 ++-- .../process/0.56mm Draft @Flashforge AD5M Pro 0.8 Nozzle.json | 4 ++-- 28 files changed, 56 insertions(+), 56 deletions(-) diff --git a/resources/profiles/Flashforge/process/0.06mm Standard @Flashforge AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/process/0.06mm Standard @Flashforge AD5M 0.25 Nozzle.json index 37819fd4a6..bb937659d6 100644 --- a/resources/profiles/Flashforge/process/0.06mm Standard @Flashforge AD5M 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.06mm Standard @Flashforge AD5M 0.25 Nozzle.json @@ -8,10 +8,10 @@ "compatible_printers": [ "Flashforge Adventurer 5M 0.25 Nozzle" ], - "filename_format": "{input_filename_base}.gcode", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "post_process": "", "layer_height": "0.06", "print_settings_id": "0.06mm Standard @Flashforge AD5M 0.25 Nozzle", "support_bottom_z_distance": "0.08", "support_top_z_distance": "0.08" -} \ No newline at end of file +} diff --git a/resources/profiles/Flashforge/process/0.06mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json b/resources/profiles/Flashforge/process/0.06mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json index bd124a3628..c3c1110c83 100644 --- a/resources/profiles/Flashforge/process/0.06mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.06mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json @@ -8,10 +8,10 @@ "compatible_printers": [ "Flashforge Adventurer 5M Pro 0.25 Nozzle" ], - "filename_format": "{input_filename_base}.gcode", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "post_process": "", "layer_height": "0.06", "print_settings_id": "0.06mm Standard @Flashforge AD5M Pro 0.25 Nozzle", "support_bottom_z_distance": "0.08", "support_top_z_distance": "0.08" -} \ No newline at end of file +} diff --git a/resources/profiles/Flashforge/process/0.08mm Standard @Flashforge AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/process/0.08mm Standard @Flashforge AD5M 0.25 Nozzle.json index e58c5ec09e..fac66fab5c 100644 --- a/resources/profiles/Flashforge/process/0.08mm Standard @Flashforge AD5M 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.08mm Standard @Flashforge AD5M 0.25 Nozzle.json @@ -8,10 +8,10 @@ "compatible_printers": [ "Flashforge Adventurer 5M 0.25 Nozzle" ], - "filename_format": "{input_filename_base}.gcode", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "post_process": "", "layer_height": "0.08", "print_settings_id": "0.08mm Standard @Flashforge AD5M 0.25 Nozzle", "support_bottom_z_distance": "0.1", "support_top_z_distance": "0.1" -} \ No newline at end of file +} diff --git a/resources/profiles/Flashforge/process/0.08mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json b/resources/profiles/Flashforge/process/0.08mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json index 2701c056ec..16c99fa494 100644 --- a/resources/profiles/Flashforge/process/0.08mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.08mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json @@ -8,10 +8,10 @@ "compatible_printers": [ "Flashforge Adventurer 5M Pro 0.25 Nozzle" ], - "filename_format": "{input_filename_base}.gcode", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "post_process": "", "layer_height": "0.08", "print_settings_id": "0.08mm Standard @Flashforge AD5M Pro 0.25 Nozzle", "support_bottom_z_distance": "0.1", "support_top_z_distance": "0.1" -} \ No newline at end of file +} diff --git a/resources/profiles/Flashforge/process/0.10mm Standard @Flashforge AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/process/0.10mm Standard @Flashforge AD5M 0.25 Nozzle.json index 04b2c19bde..e5fe9534c5 100644 --- a/resources/profiles/Flashforge/process/0.10mm Standard @Flashforge AD5M 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.10mm Standard @Flashforge AD5M 0.25 Nozzle.json @@ -8,10 +8,10 @@ "compatible_printers": [ "Flashforge Adventurer 5M 0.25 Nozzle" ], - "filename_format": "{input_filename_base}.gcode", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "post_process": "", "layer_height": "0.1", "print_settings_id": "0.10mm Standard @Flashforge AD5M 0.25 Nozzle", "support_bottom_z_distance": "0.1", "support_top_z_distance": "0.1" -} \ No newline at end of file +} diff --git a/resources/profiles/Flashforge/process/0.10mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json b/resources/profiles/Flashforge/process/0.10mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json index b262619d0d..7c29397d47 100644 --- a/resources/profiles/Flashforge/process/0.10mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.10mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json @@ -8,10 +8,10 @@ "compatible_printers": [ "Flashforge Adventurer 5M Pro 0.25 Nozzle" ], - "filename_format": "{input_filename_base}.gcode", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "post_process": "", "layer_height": "0.1", "print_settings_id": "0.10mm Standard @Flashforge AD5M Pro 0.25 Nozzle", "support_bottom_z_distance": "0.1", "support_top_z_distance": "0.1" -} \ No newline at end of file +} diff --git a/resources/profiles/Flashforge/process/0.12mm Fine @Flashforge AD5M 0.4 Nozzle.json b/resources/profiles/Flashforge/process/0.12mm Fine @Flashforge AD5M 0.4 Nozzle.json index fdb58d50d1..5b3f7ed9a2 100644 --- a/resources/profiles/Flashforge/process/0.12mm Fine @Flashforge AD5M 0.4 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.12mm Fine @Flashforge AD5M 0.4 Nozzle.json @@ -7,7 +7,7 @@ "compatible_printers": [ "Flashforge Adventurer 5M 0.4 Nozzle" ], - "filename_format": "{input_filename_base}.gcode", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "post_process": "", "layer_height": "0.12", "initial_layer_print_height": "0.3", @@ -21,4 +21,4 @@ "support_speed": "100", "support_top_z_distance": "0.15", "skirt_loops": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/Flashforge/process/0.12mm Fine @Flashforge AD5M Pro 0.4 Nozzle.json b/resources/profiles/Flashforge/process/0.12mm Fine @Flashforge AD5M Pro 0.4 Nozzle.json index 730fb220ad..6e030cc5ee 100644 --- a/resources/profiles/Flashforge/process/0.12mm Fine @Flashforge AD5M Pro 0.4 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.12mm Fine @Flashforge AD5M Pro 0.4 Nozzle.json @@ -7,7 +7,7 @@ "compatible_printers": [ "Flashforge Adventurer 5M Pro 0.4 Nozzle" ], - "filename_format": "{input_filename_base}.gcode", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "post_process": "", "layer_height": "0.12", "bridge_flow": "0.95", @@ -21,4 +21,4 @@ "support_line_width": "0.4", "support_top_z_distance": "0.15", "skirt_loops": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/Flashforge/process/0.12mm Standard @Flashforge AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/process/0.12mm Standard @Flashforge AD5M 0.25 Nozzle.json index d535596c61..a4415353d5 100644 --- a/resources/profiles/Flashforge/process/0.12mm Standard @Flashforge AD5M 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.12mm Standard @Flashforge AD5M 0.25 Nozzle.json @@ -8,7 +8,7 @@ "compatible_printers": [ "Flashforge Adventurer 5M 0.25 Nozzle" ], - "filename_format": "{input_filename_base}.gcode", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "post_process": "", "print_settings_id": "0.12mm Standard @Flashforge AD5M 0.25 Nozzle", "bottom_shell_layers": "4", @@ -43,4 +43,4 @@ "top_surface_speed": "150", "tree_support_tip_diameter": "1.2", "wipe_speed": "80%" -} \ No newline at end of file +} diff --git a/resources/profiles/Flashforge/process/0.12mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json b/resources/profiles/Flashforge/process/0.12mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json index f820b424fa..a074293575 100644 --- a/resources/profiles/Flashforge/process/0.12mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.12mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json @@ -8,7 +8,7 @@ "compatible_printers": [ "Flashforge Adventurer 5M Pro 0.25 Nozzle" ], - "filename_format": "{input_filename_base}.gcode", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "post_process": "", "print_settings_id": "0.12mm Standard @Flashforge AD5M Pro 0.25 Nozzle", "bottom_shell_layers": "4", @@ -43,4 +43,4 @@ "top_surface_speed": "150", "tree_support_tip_diameter": "1.2", "wipe_speed": "80%" -} \ No newline at end of file +} diff --git a/resources/profiles/Flashforge/process/0.14mm Standard @Flashforge AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/process/0.14mm Standard @Flashforge AD5M 0.25 Nozzle.json index e01b31f013..48f48d1fbb 100644 --- a/resources/profiles/Flashforge/process/0.14mm Standard @Flashforge AD5M 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.14mm Standard @Flashforge AD5M 0.25 Nozzle.json @@ -8,10 +8,10 @@ "compatible_printers": [ "Flashforge Adventurer 5M 0.25 Nozzle" ], - "filename_format": "{input_filename_base}.gcode", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "post_process": "", "layer_height": "0.14", "print_settings_id": "0.14mm Standard @Flashforge AD5M 0.25 Nozzle", "support_bottom_z_distance": "0.14", "support_top_z_distance": "0.14" -} \ No newline at end of file +} diff --git a/resources/profiles/Flashforge/process/0.14mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json b/resources/profiles/Flashforge/process/0.14mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json index 5e3d087a4a..a7ce3b618d 100644 --- a/resources/profiles/Flashforge/process/0.14mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.14mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json @@ -8,10 +8,10 @@ "compatible_printers": [ "Flashforge Adventurer 5M Pro 0.25 Nozzle" ], - "filename_format": "{input_filename_base}.gcode", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "post_process": "", "layer_height": "0.14", "print_settings_id": "0.14mm Standard @Flashforge AD5M Pro 0.25 Nozzle", "support_bottom_z_distance": "0.14", "support_top_z_distance": "0.14" -} \ No newline at end of file +} diff --git a/resources/profiles/Flashforge/process/0.18mm Fine @Flashforge AD5M 0.6 Nozzle.json b/resources/profiles/Flashforge/process/0.18mm Fine @Flashforge AD5M 0.6 Nozzle.json index 419e9d2137..0f1c96a124 100644 --- a/resources/profiles/Flashforge/process/0.18mm Fine @Flashforge AD5M 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.18mm Fine @Flashforge AD5M 0.6 Nozzle.json @@ -7,7 +7,7 @@ "compatible_printers": [ "Flashforge Adventurer 5M 0.6 Nozzle" ], - "filename_format": "{input_filename_base}.gcode", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "post_process": "", "layer_height": "0.18", "infill_wall_overlap": "40%", @@ -18,4 +18,4 @@ "support_speed": "100", "support_top_z_distance": "0.2", "skirt_loops": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/Flashforge/process/0.18mm Fine @Flashforge AD5M Pro 0.6 Nozzle.json b/resources/profiles/Flashforge/process/0.18mm Fine @Flashforge AD5M Pro 0.6 Nozzle.json index f86f1574f2..12b8d223fd 100644 --- a/resources/profiles/Flashforge/process/0.18mm Fine @Flashforge AD5M Pro 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.18mm Fine @Flashforge AD5M Pro 0.6 Nozzle.json @@ -7,7 +7,7 @@ "compatible_printers": [ "Flashforge Adventurer 5M Pro 0.6 Nozzle" ], - "filename_format": "{input_filename_base}.gcode", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "post_process": "", "layer_height": "0.18", "infill_wall_overlap": "40%", @@ -21,4 +21,4 @@ "support_object_xy_distance": "0.4", "support_speed": "100", "skirt_loops": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M 0.4 Nozzle.json b/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M 0.4 Nozzle.json index 52c1c2b565..6b6e97a90b 100644 --- a/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M 0.4 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M 0.4 Nozzle.json @@ -8,10 +8,10 @@ "compatible_printers": [ "Flashforge Adventurer 5M 0.4 Nozzle" ], - "filename_format": "{input_filename_base}.gcode", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "post_process": "", "only_one_wall_top": "0", "infill_wall_overlap": "50%", "print_settings_id": "0.20mm Standard @Flashforge AD5M 0.4 Nozzle", "skirt_loops": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle.json b/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle.json index 6e7695ddbb..e2532fbb27 100644 --- a/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle.json @@ -8,10 +8,10 @@ "compatible_printers": [ "Flashforge Adventurer 5M Pro 0.4 Nozzle" ], - "filename_format": "{input_filename_base}.gcode", + "filename_format": "{input_filename_base}_{filament_type[0]}_{print_time}.gcode", "post_process": "", "only_one_wall_top": "0", "infill_wall_overlap": "50%", "print_settings_id": "0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle", "skirt_loops": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/Flashforge/process/0.24mm Draft @Flashforge AD5M 0.4 Nozzle.json b/resources/profiles/Flashforge/process/0.24mm Draft @Flashforge AD5M 0.4 Nozzle.json index 9072734d17..b4f7bcb9b4 100644 --- a/resources/profiles/Flashforge/process/0.24mm Draft @Flashforge AD5M 0.4 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.24mm Draft @Flashforge AD5M 0.4 Nozzle.json @@ -18,7 +18,7 @@ "compatible_printers": [ "Flashforge Adventurer 5M 0.4 Nozzle" ], - "filename_format": "{input_filename_base}.gcode", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "post_process": "", "skirt_loops": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/Flashforge/process/0.24mm Draft @Flashforge AD5M Pro 0.4 Nozzle.json b/resources/profiles/Flashforge/process/0.24mm Draft @Flashforge AD5M Pro 0.4 Nozzle.json index a9c1977ba8..2c0a7a791a 100644 --- a/resources/profiles/Flashforge/process/0.24mm Draft @Flashforge AD5M Pro 0.4 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.24mm Draft @Flashforge AD5M Pro 0.4 Nozzle.json @@ -19,7 +19,7 @@ "compatible_printers": [ "Flashforge Adventurer 5M Pro 0.4 Nozzle" ], - "filename_format": "{input_filename_base}.gcode", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "post_process": "", "skirt_loops": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/Flashforge/process/0.24mm Fine @Flashforge AD5M 0.8 Nozzle.json b/resources/profiles/Flashforge/process/0.24mm Fine @Flashforge AD5M 0.8 Nozzle.json index cf0187c202..803fd54463 100644 --- a/resources/profiles/Flashforge/process/0.24mm Fine @Flashforge AD5M 0.8 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.24mm Fine @Flashforge AD5M 0.8 Nozzle.json @@ -8,7 +8,7 @@ "compatible_printers": [ "Flashforge Adventurer 5M 0.8 Nozzle" ], - "filename_format": "{input_filename_base}.gcode", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "post_process": "", "bottom_shell_layers": "2", "bridge_flow": "0.96", @@ -43,4 +43,4 @@ "top_surface_acceleration": "1000", "top_surface_line_width": "0.82", "top_surface_speed": "100" -} \ No newline at end of file +} diff --git a/resources/profiles/Flashforge/process/0.24mm Fine @Flashforge AD5M Pro 0.8 Nozzle.json b/resources/profiles/Flashforge/process/0.24mm Fine @Flashforge AD5M Pro 0.8 Nozzle.json index 0880a91bf8..72d22a75c6 100644 --- a/resources/profiles/Flashforge/process/0.24mm Fine @Flashforge AD5M Pro 0.8 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.24mm Fine @Flashforge AD5M Pro 0.8 Nozzle.json @@ -8,7 +8,7 @@ "compatible_printers": [ "Flashforge Adventurer 5M Pro 0.8 Nozzle" ], - "filename_format": "{input_filename_base}.gcode", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "post_process": "", "bottom_shell_layers": "2", "bridge_flow": "0.96", @@ -43,4 +43,4 @@ "top_surface_acceleration": "1000", "top_surface_line_width": "0.82", "top_surface_speed": "100" -} \ No newline at end of file +} diff --git a/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD5M 0.6 Nozzle.json b/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD5M 0.6 Nozzle.json index 52b3e76e13..35e9569867 100644 --- a/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD5M 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD5M 0.6 Nozzle.json @@ -8,10 +8,10 @@ "compatible_printers": [ "Flashforge Adventurer 5M 0.6 Nozzle" ], - "filename_format": "{input_filename_base}.gcode", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "post_process": "", "only_one_wall_top": "0", "infill_wall_overlap": "50%", "print_settings_id": "0.30mm Standard @Flashforge AD5M 0.6 Nozzle", "skirt_loops": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle.json b/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle.json index 26b840f489..2707904267 100644 --- a/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle.json @@ -8,10 +8,10 @@ "compatible_printers": [ "Flashforge Adventurer 5M Pro 0.6 Nozzle" ], - "filename_format": "{input_filename_base}.gcode", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "post_process": "", "only_one_wall_top": "0", "infill_wall_overlap": "50%", "print_settings_id": "0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle", "skirt_loops": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/Flashforge/process/0.40mm Standard @Flashforge AD5M 0.8 Nozzle.json b/resources/profiles/Flashforge/process/0.40mm Standard @Flashforge AD5M 0.8 Nozzle.json index 837a605d72..df29b4ffcd 100644 --- a/resources/profiles/Flashforge/process/0.40mm Standard @Flashforge AD5M 0.8 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.40mm Standard @Flashforge AD5M 0.8 Nozzle.json @@ -8,7 +8,7 @@ "compatible_printers": [ "Flashforge Adventurer 5M 0.8 Nozzle" ], - "filename_format": "{input_filename_base}.gcode", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "post_process": "", "print_settings_id": "0.40mm Standard @Flashforge AD5M 0.8 Nozzle", "elefant_foot_compensation": "0", @@ -34,4 +34,4 @@ "top_surface_line_width": "0.82", "tree_support_tip_diameter": "1.2", "wipe_speed": "60%" -} \ No newline at end of file +} diff --git a/resources/profiles/Flashforge/process/0.40mm Standard @Flashforge AD5M Pro 0.8 Nozzle.json b/resources/profiles/Flashforge/process/0.40mm Standard @Flashforge AD5M Pro 0.8 Nozzle.json index 18900592b7..7584df4a2d 100644 --- a/resources/profiles/Flashforge/process/0.40mm Standard @Flashforge AD5M Pro 0.8 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.40mm Standard @Flashforge AD5M Pro 0.8 Nozzle.json @@ -8,7 +8,7 @@ "compatible_printers": [ "Flashforge Adventurer 5M Pro 0.8 Nozzle" ], - "filename_format": "{input_filename_base}.gcode", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "post_process": "", "print_settings_id": "0.40mm Standard @Flashforge AD5M Pro 0.8 Nozzle", "elefant_foot_compensation": "0", @@ -34,4 +34,4 @@ "top_surface_line_width": "0.82", "tree_support_tip_diameter": "1.2", "wipe_speed": "60%" -} \ No newline at end of file +} diff --git a/resources/profiles/Flashforge/process/0.42mm Draft @Flashforge AD5M 0.6 Nozzle.json b/resources/profiles/Flashforge/process/0.42mm Draft @Flashforge AD5M 0.6 Nozzle.json index 579324e290..b1abc4af15 100644 --- a/resources/profiles/Flashforge/process/0.42mm Draft @Flashforge AD5M 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.42mm Draft @Flashforge AD5M 0.6 Nozzle.json @@ -8,7 +8,7 @@ "compatible_printers": [ "Flashforge Adventurer 5M 0.6 Nozzle" ], - "filename_format": "{input_filename_base}.gcode", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "post_process": "", "infill_wall_overlap": "40%", "initial_layer_line_width": "0.7", @@ -26,4 +26,4 @@ "support_top_z_distance": "0.22", "top_surface_line_width": "0.6", "skirt_loops": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/Flashforge/process/0.42mm Draft @Flashforge AD5M Pro 0.6 Nozzle.json b/resources/profiles/Flashforge/process/0.42mm Draft @Flashforge AD5M Pro 0.6 Nozzle.json index 5ade8b2e8b..7f661d68ee 100644 --- a/resources/profiles/Flashforge/process/0.42mm Draft @Flashforge AD5M Pro 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.42mm Draft @Flashforge AD5M Pro 0.6 Nozzle.json @@ -8,7 +8,7 @@ "compatible_printers": [ "Flashforge Adventurer 5M Pro 0.6 Nozzle" ], - "filename_format": "{input_filename_base}.gcode", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "post_process": "", "bridge_flow": "0.96", "infill_wall_overlap": "40%", @@ -28,4 +28,4 @@ "support_top_z_distance": "0.22", "top_surface_line_width": "0.6", "skirt_loops": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/Flashforge/process/0.56mm Draft @Flashforge AD5M 0.8 Nozzle.json b/resources/profiles/Flashforge/process/0.56mm Draft @Flashforge AD5M 0.8 Nozzle.json index 67c115bf70..ba9949110d 100644 --- a/resources/profiles/Flashforge/process/0.56mm Draft @Flashforge AD5M 0.8 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.56mm Draft @Flashforge AD5M 0.8 Nozzle.json @@ -8,7 +8,7 @@ "compatible_printers": [ "Flashforge Adventurer 5M 0.8 Nozzle" ], - "filename_format": "{input_filename_base}.gcode", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "post_process": "", "bottom_shell_layers": "2", "bridge_flow": "0.96", @@ -44,4 +44,4 @@ "top_surface_acceleration": "1000", "top_surface_line_width": "0.82", "top_surface_speed": "100" -} \ No newline at end of file +} diff --git a/resources/profiles/Flashforge/process/0.56mm Draft @Flashforge AD5M Pro 0.8 Nozzle.json b/resources/profiles/Flashforge/process/0.56mm Draft @Flashforge AD5M Pro 0.8 Nozzle.json index 9309cbdb96..a419c89fbb 100644 --- a/resources/profiles/Flashforge/process/0.56mm Draft @Flashforge AD5M Pro 0.8 Nozzle.json +++ b/resources/profiles/Flashforge/process/0.56mm Draft @Flashforge AD5M Pro 0.8 Nozzle.json @@ -8,7 +8,7 @@ "compatible_printers": [ "Flashforge Adventurer 5M Pro 0.8 Nozzle" ], - "filename_format": "{input_filename_base}.gcode", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "post_process": "", "bottom_shell_layers": "2", "bridge_flow": "0.96", @@ -43,4 +43,4 @@ "top_surface_acceleration": "1000", "top_surface_line_width": "0.82", "top_surface_speed": "100" -} \ No newline at end of file +} From 0b2778e67091bdc3fad081699ddca144e7628da9 Mon Sep 17 00:00:00 2001 From: Noisyfox Date: Sat, 8 Nov 2025 01:27:15 +0800 Subject: [PATCH 7/7] Fix `max_bridge_length` for organic tree (#11295) * Remove outdated duplicated support code * Orgainc tree no longer use `bridge_no_support` since #8212 --- src/libslic3r/Support/SupportCommon.cpp | 80 ----------------------- src/libslic3r/Support/SupportCommon.hpp | 9 --- src/libslic3r/Support/SupportMaterial.cpp | 1 - src/libslic3r/Support/TreeSupport3D.cpp | 12 ++-- src/slic3r/GUI/ConfigManipulation.cpp | 6 +- 5 files changed, 9 insertions(+), 99 deletions(-) diff --git a/src/libslic3r/Support/SupportCommon.cpp b/src/libslic3r/Support/SupportCommon.cpp index 0de4067770..9159de617f 100644 --- a/src/libslic3r/Support/SupportCommon.cpp +++ b/src/libslic3r/Support/SupportCommon.cpp @@ -42,86 +42,6 @@ namespace Slic3r { //#define SUPPORT_SURFACES_OFFSET_PARAMETERS ClipperLib::jtMiter, 1.5 #define SUPPORT_SURFACES_OFFSET_PARAMETERS ClipperLib::jtSquare, 0. -void remove_bridges_from_contacts( - const PrintConfig &print_config, - const Layer &lower_layer, - const LayerRegion &layerm, - float fw, - Polygons &contact_polygons) -{ - // compute the area of bridging perimeters - Polygons bridges; - { - // Surface supporting this layer, expanded by 0.5 * nozzle_diameter, as we consider this kind of overhang to be sufficiently supported. - Polygons lower_grown_slices = expand(lower_layer.lslices, - //FIXME to mimic the decision in the perimeter generator, we should use half the external perimeter width. - 0.5f * float(scale_(print_config.nozzle_diameter.get_at(layerm.region().config().wall_filament - 1))), - SUPPORT_SURFACES_OFFSET_PARAMETERS); - // Collect perimeters of this layer. - //FIXME split_at_first_point() could split a bridge mid-way - #if 0 - Polylines overhang_perimeters = layerm.perimeters.as_polylines(); - // workaround for Clipper bug, see Slic3r::Polygon::clip_as_polyline() - for (Polyline &polyline : overhang_perimeters) - polyline.points[0].x += 1; - // Trim the perimeters of this layer by the lower layer to get the unsupported pieces of perimeters. - overhang_perimeters = diff_pl(overhang_perimeters, lower_grown_slices); - #else - Polylines overhang_perimeters = diff_pl(layerm.perimeters.as_polylines(), lower_grown_slices); - #endif - - // only consider straight overhangs - // only consider overhangs having endpoints inside layer's slices - // convert bridging polylines into polygons by inflating them with their thickness - // since we're dealing with bridges, we can't assume width is larger than spacing, - // so we take the largest value and also apply safety offset to be ensure no gaps - // are left in between - Flow perimeter_bridge_flow = layerm.bridging_flow(frPerimeter); - //FIXME one may want to use a maximum of bridging flow width and normal flow width, as the perimeters are calculated using the normal flow - // and then turned to bridging flow, thus their centerlines are derived from non-bridging flow and expanding them by a bridging flow - // may not expand them to the edge of their respective islands. - const float w = float(0.5 * std::max(perimeter_bridge_flow.scaled_width(), perimeter_bridge_flow.scaled_spacing())) + scaled(0.001); - for (Polyline &polyline : overhang_perimeters) - if (polyline.is_straight()) { - // This is a bridge - polyline.extend_start(fw); - polyline.extend_end(fw); - // Is the straight perimeter segment supported at both sides? - Point pts[2] = { polyline.first_point(), polyline.last_point() }; - bool supported[2] = { false, false }; - for (size_t i = 0; i < lower_layer.lslices.size() && ! (supported[0] && supported[1]); ++ i) - for (int j = 0; j < 2; ++ j) - if (! supported[j] && lower_layer.lslices_bboxes[i].contains(pts[j]) && lower_layer.lslices[i].contains(pts[j])) - supported[j] = true; - if (supported[0] && supported[1]) - // Offset a polyline into a thick line. - polygons_append(bridges, offset(polyline, w)); - } - bridges = union_(bridges); - } - // remove the entire bridges and only support the unsupported edges - //FIXME the brided regions are already collected as layerm.bridged. Use it? - for (const Surface &surface : layerm.fill_surfaces.surfaces) - if (surface.surface_type == stBottomBridge && surface.bridge_angle >= 0.0) - polygons_append(bridges, surface.expolygon); - //FIXME add the gap filled areas. Extrude the gaps with a bridge flow? - // Remove the unsupported ends of the bridges from the bridged areas. - //FIXME add supports at regular intervals to support long bridges! - bridges = diff(bridges, - // Offset unsupported edges into polygons. - offset(layerm.unsupported_bridge_edges, scale_(SUPPORT_MATERIAL_MARGIN), SUPPORT_SURFACES_OFFSET_PARAMETERS)); - // Remove bridged areas from the supported areas. - contact_polygons = diff(contact_polygons, bridges, ApplySafetyOffset::Yes); - - #ifdef SLIC3R_DEBUG - static int iRun = 0; - SVG::export_expolygons(debug_out_path("support-top-contacts-remove-bridges-run%d.svg", iRun ++), - { { { union_ex(offset(layerm.unsupported_bridge_edges(), scale_(SUPPORT_MATERIAL_MARGIN), SUPPORT_SURFACES_OFFSET_PARAMETERS)) }, { "unsupported_bridge_edges", "orange", 0.5f } }, - { { union_ex(contact_polygons) }, { "contact_polygons", "blue", 0.5f } }, - { { union_ex(bridges) }, { "bridges", "red", "black", "", scaled(0.1f), 0.5f } } }); - #endif /* SLIC3R_DEBUG */ -} - // Convert some of the intermediate layers into top/bottom interface layers as well as base interface layers. std::pair generate_interface_layers( const PrintObjectConfig &config, diff --git a/src/libslic3r/Support/SupportCommon.hpp b/src/libslic3r/Support/SupportCommon.hpp index 6f5894fc1d..531daaa0a8 100644 --- a/src/libslic3r/Support/SupportCommon.hpp +++ b/src/libslic3r/Support/SupportCommon.hpp @@ -12,15 +12,6 @@ namespace Slic3r { class PrintObject; class SupportLayer; -// Remove bridges from support contact areas. -// To be called if PrintObjectConfig::dont_support_bridges. -void remove_bridges_from_contacts( - const PrintConfig &print_config, - const Layer &lower_layer, - const LayerRegion &layerm, - float fw, - Polygons &contact_polygons); - // Turn some of the base layers into base interface layers. // For soluble interfaces with non-soluble bases, print maximum two first interface layers with the base // extruder to improve adhesion of the soluble filament to the base. diff --git a/src/libslic3r/Support/SupportMaterial.cpp b/src/libslic3r/Support/SupportMaterial.cpp index 7580976ac9..d1fa5d8627 100644 --- a/src/libslic3r/Support/SupportMaterial.cpp +++ b/src/libslic3r/Support/SupportMaterial.cpp @@ -1390,7 +1390,6 @@ static inline ExPolygons detect_overhangs( double thresh_angle = object_config.support_threshold_angle.value > 0 ? object_config.support_threshold_angle.value + 1 : 0; thresh_angle = std::min(thresh_angle, 89.); // BBS should be smaller than 90 const double threshold_rad = Geometry::deg2rad(thresh_angle); - const coordf_t max_bridge_length = scale_(object_config.max_bridge_length.value); const bool bridge_no_support = object_config.bridge_no_support.value; const coordf_t xy_expansion = scale_(object_config.support_expansion.value); float lower_layer_offset = 0; diff --git a/src/libslic3r/Support/TreeSupport3D.cpp b/src/libslic3r/Support/TreeSupport3D.cpp index 9b613bae61..7cf7d3bb03 100644 --- a/src/libslic3r/Support/TreeSupport3D.cpp +++ b/src/libslic3r/Support/TreeSupport3D.cpp @@ -188,7 +188,6 @@ static std::vector>> group_me } return ret; } -#endif [[nodiscard]] static const std::vector generate_overhangs(const TreeSupportSettings &settings, PrintObject &print_object, std::function throw_on_cancel) { @@ -262,11 +261,11 @@ static std::vector>> group_me } if (! (enforced_layer || blockers_layers.empty() || blockers_layers[layer_id].empty())) overhangs = diff(overhangs, offset_ex(union_(blockers_layers[layer_id]), scale_(radius_sample_resolution)), ApplySafetyOffset::Yes); - if (config.bridge_no_support) { - for (const LayerRegion *layerm : current_layer.regions()) - remove_bridges_from_contacts(print_config, lower_layer, *layerm, - float(layerm->flow(frExternalPerimeter).scaled_width()), overhangs); - } + //if (config.bridge_no_support) { + // for (const LayerRegion *layerm : current_layer.regions()) + // remove_bridges_from_contacts(print_config, lower_layer, *layerm, + // float(layerm->flow(frExternalPerimeter).scaled_width()), overhangs); + //} } //check_self_intersections(overhangs, "generate_overhangs1"); if (! enforcers_layers.empty() && ! enforcers_layers[layer_id].empty()) { @@ -331,6 +330,7 @@ static std::vector>> group_me return out; } +#endif /*! * \brief Precalculates all avoidances, that could be required. diff --git a/src/slic3r/GUI/ConfigManipulation.cpp b/src/slic3r/GUI/ConfigManipulation.cpp index 34f72db408..c28fd4b0f2 100644 --- a/src/slic3r/GUI/ConfigManipulation.cpp +++ b/src/slic3r/GUI/ConfigManipulation.cpp @@ -745,9 +745,9 @@ void ConfigManipulation::toggle_print_fff_options(DynamicPrintConfig *config, co toggle_line(el, support_is_organic); toggle_field("tree_support_brim_width", support_is_tree && !config->opt_bool("tree_support_auto_brim")); - // non-organic tree support use max_bridge_length instead of bridge_no_support - toggle_line("max_bridge_length", support_is_normal_tree); - toggle_line("bridge_no_support", !support_is_normal_tree); + // tree support use max_bridge_length instead of bridge_no_support + toggle_line("max_bridge_length", support_is_tree); + toggle_line("bridge_no_support", !support_is_tree); toggle_line("support_critical_regions_only", is_auto(support_type) && support_is_tree); for (auto el : { "support_interface_filament",