Merge branch 'master' into ender2-pro

2026-05-18 11:02:08 +00:00 · 2021-12-10 17:08:17 -07:00
parent a6d6f9af8b c3f144c7ea
commit 2bba01f482
55 changed files with 37289 additions and 39682 deletions
--- a/resources/localization/PrusaSlicer.pot
+++ b/resources/localization/PrusaSlicer.pot
--- a/resources/localization/cs/PrusaSlicer.mo
+++ b/resources/localization/cs/PrusaSlicer.mo
--- a/resources/localization/cs/PrusaSlicer_cs.po
+++ b/resources/localization/cs/PrusaSlicer_cs.po
--- a/resources/localization/de/PrusaSlicer.mo
+++ b/resources/localization/de/PrusaSlicer.mo
--- a/resources/localization/de/PrusaSlicer_de.po
+++ b/resources/localization/de/PrusaSlicer_de.po
--- a/resources/localization/en/PrusaSlicer_en.po
+++ b/resources/localization/en/PrusaSlicer_en.po
--- a/resources/localization/es/PrusaSlicer.mo
+++ b/resources/localization/es/PrusaSlicer.mo
--- a/resources/localization/es/PrusaSlicer_es.po
+++ b/resources/localization/es/PrusaSlicer_es.po
--- a/resources/localization/fr/PrusaSlicer.mo
+++ b/resources/localization/fr/PrusaSlicer.mo
--- a/resources/localization/fr/PrusaSlicer_fr.po
+++ b/resources/localization/fr/PrusaSlicer_fr.po
--- a/resources/localization/it/PrusaSlicer.mo
+++ b/resources/localization/it/PrusaSlicer.mo
--- a/resources/localization/it/PrusaSlicer_it.po
+++ b/resources/localization/it/PrusaSlicer_it.po
--- a/resources/localization/ja/PrusaSlicer.mo
+++ b/resources/localization/ja/PrusaSlicer.mo
--- a/resources/localization/ja/PrusaSlicer_ja.po
+++ b/resources/localization/ja/PrusaSlicer_ja.po
--- a/resources/localization/ko/PrusaSlicer.mo
+++ b/resources/localization/ko/PrusaSlicer.mo
--- a/resources/localization/ko/PrusaSlicer_ko_KR.po
+++ b/resources/localization/ko/PrusaSlicer_ko_KR.po
--- a/resources/localization/ko_KR/PrusaSlicer.mo
+++ b/resources/localization/ko_KR/PrusaSlicer.mo
--- a/resources/localization/ko_KR/PrusaSlicer_ko.po
+++ b/resources/localization/ko_KR/PrusaSlicer_ko.po
--- a/resources/localization/ko_KR/PrusaSlicer_ko_KR.po
+++ b/resources/localization/ko_KR/PrusaSlicer_ko_KR.po
--- a/resources/localization/list.txt
+++ b/resources/localization/list.txt
@@ -88,8 +88,8 @@ src/libslic3r/ExtrusionEntity.cpp
 src/libslic3r/Flow.cpp
 src/libslic3r/Format/3mf.cpp
 src/libslic3r/Format/AMF.cpp
+src/libslic3r/GCode/PostProcessor.cpp
 src/libslic3r/miniz_extension.cpp
-src/libslic3r/PostProcessor.cpp
 src/libslic3r/Preset.cpp
 src/libslic3r/Print.cpp
 src/libslic3r/SLA/Pad.cpp
--- a/resources/localization/nl/PrusaSlicer.mo
+++ b/resources/localization/nl/PrusaSlicer.mo
--- a/resources/localization/nl/PrusaSlicer_nl.po
+++ b/resources/localization/nl/PrusaSlicer_nl.po
--- a/resources/localization/pl/PrusaSlicer.mo
+++ b/resources/localization/pl/PrusaSlicer.mo
--- a/resources/localization/pl/PrusaSlicer_pl.po
+++ b/resources/localization/pl/PrusaSlicer_pl.po
--- a/resources/localization/pt_BR/PrusaSlicer.mo
+++ b/resources/localization/pt_BR/PrusaSlicer.mo
--- a/resources/localization/pt_BR/PrusaSlicer_pt_BR.po
+++ b/resources/localization/pt_BR/PrusaSlicer_pt_BR.po
--- a/resources/localization/ru/PrusaSlicer.mo
+++ b/resources/localization/ru/PrusaSlicer.mo
--- a/resources/localization/ru/PrusaSlicer_ru.po
+++ b/resources/localization/ru/PrusaSlicer_ru.po
--- a/resources/localization/tr/PrusaSlicer.mo
+++ b/resources/localization/tr/PrusaSlicer.mo
--- a/resources/localization/tr/PrusaSlicer_tr.po
+++ b/resources/localization/tr/PrusaSlicer_tr.po
--- a/resources/localization/uk/PrusaSlicer.mo
+++ b/resources/localization/uk/PrusaSlicer.mo
--- a/resources/localization/uk/PrusaSlicer_uk.po
+++ b/resources/localization/uk/PrusaSlicer_uk.po
--- a/resources/localization/zh_CN/PrusaSlicer.mo
+++ b/resources/localization/zh_CN/PrusaSlicer.mo
--- a/resources/localization/zh_CN/PrusaSlicer_zh_CN.po
+++ b/resources/localization/zh_CN/PrusaSlicer_zh_CN.po
--- a/resources/localization/zh_TW/PrusaSlicer.mo
+++ b/resources/localization/zh_TW/PrusaSlicer.mo
--- a/resources/localization/zh_TW/PrusaSlicer_zh_TW.po
+++ b/resources/localization/zh_TW/PrusaSlicer_zh_TW.po
--- a/resources/profiles/Creality/ENDER2PRO_thumbnail.png
+++ b/resources/profiles/Creality/ENDER2PRO_thumbnail.png