Merge branch 'master' into SoftFever

SoftFever · Aug 11, 2022 · 159ff85 · 159ff85
2 parents 1f95ac1 + 7dee2d8
commit 159ff85
Show file tree

Hide file tree

Showing 256 changed files with 14,971 additions and 4,350 deletions.
diff --git a/bbl/i18n/BambuStudio.pot b/bbl/i18n/BambuStudio.pot
diff --git a/bbl/i18n/de/BambuStudio_de.po b/bbl/i18n/de/BambuStudio_de.po
diff --git a/bbl/i18n/en/BambuStudio_en.po b/bbl/i18n/en/BambuStudio_en.po
diff --git a/bbl/i18n/es/BambuStudio_es.po b/bbl/i18n/es/BambuStudio_es.po
diff --git a/bbl/i18n/fr/BambuStudio_fr.po b/bbl/i18n/fr/BambuStudio_fr.po
diff --git a/bbl/i18n/hu/BambuStudio_hu.po b/bbl/i18n/hu/BambuStudio_hu.po
diff --git a/bbl/i18n/list.txt b/bbl/i18n/list.txt
@@ -10,7 +10,8 @@ src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp
 src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp
 src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
 src/slic3r/GUI/Gizmos/GLGizmoFaceDetector.cpp
-src/slic3r/GUI/Gizmos/GLGizmoModifier.cpp
+src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp
+src/slic3r/GUI/Gizmos/GLGizmoSeam.hpp
 src/slic3r/GUI/GUI.cpp
 src/slic3r/GUI/GUI_App.cpp
 src/slic3r/GUI/GUI_Init.cpp
@@ -36,6 +37,7 @@ src/slic3r/GUI/Jobs/PrintJob.cpp
 src/slic3r/GUI/Jobs/UpgradeNetworkJob.cpp
 src/slic3r/GUI/AboutDialog.cpp
 src/slic3r/GUI/AMSMaterialsSetting.cpp
+src/slic3r/GUI/AMSMappingPopup.cpp
 src/slic3r/GUI/AMSSetting.cpp
 src/slic3r/GUI/BBLTopbar.cpp
 src/slic3r/GUI/DownloadProgressDialog.cpp
@@ -63,6 +65,7 @@ src/slic3r/GUI/NotificationManager.cpp
 src/slic3r/GUI/ObjectDataViewModel.cpp
 src/slic3r/GUI/OpenGLManager.cpp
 src/slic3r/GUI/OptionsGroup.cpp
+src/slic3r/GUI/PrintOptionsDialog.cpp
 src/slic3r/GUI/ParamsPanel.cpp
 src/slic3r/GUI/PartPlate.cpp
 src/slic3r/GUI/Plater.cpp