Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels

2026-05-14 19:12:38 -07:00 · 2020-02-04 14:41:50 +01:00
parent dc393e2f0a 0da4cb29b5
commit 9f536291b0
8 changed files with 9961 additions and 0 deletions
--- a/resources/localization/cs/PrusaSlicer.mo
+++ b/resources/localization/cs/PrusaSlicer.mo
--- a/resources/localization/de/PrusaSlicer.mo
+++ b/resources/localization/de/PrusaSlicer.mo
--- a/resources/localization/ja/PrusaSlicer.mo
+++ b/resources/localization/ja/PrusaSlicer.mo
--- a/resources/localization/list.txt
+++ b/resources/localization/list.txt
@@ -47,6 +47,7 @@ src/slic3r/GUI/UpdateDialogs.cpp
 src/slic3r/GUI/WipeTowerDialog.cpp
 src/slic3r/GUI/wxExtensions.cpp
 src/slic3r/GUI/DoubleSlider.cpp
+src/slic3r/GUI/ObjectDataViewModel.cpp
 src/slic3r/GUI/ExtruderSequenceDialog.cpp
 src/slic3r/Utils/Duet.cpp
 src/slic3r/Utils/OctoPrint.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/pt_br/PrusaSlicer.mo
+++ b/resources/localization/pt_br/PrusaSlicer.mo