Merge branch 'master' into CURA-8378_improve_checkbox_visibility

6 files changed, 33 insertions, 19 deletions

diff --git a/.gitignore b/.gitignore
index 7fed42af69..51b98e330e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,8 @@ resources/i18n/en_7S
 resources/i18n/x-test
 resources/firmware
 resources/materials
+resources/images/whats_new
+resources/texts/whats_new
 CuraEngine.exe
 LC_MESSAGES
 .cache
@@ -37,6 +39,7 @@ cura.desktop
 
 #Externally located plug-ins commonly installed by our devs.
 plugins/cura-big-flame-graph
+plugins/cura-camera-position
 plugins/cura-god-mode-plugin
 plugins/cura-siemensnx-plugin
 plugins/CuraBlenderPlugin
diff --git a/docker/build.sh b/docker/build.sh
index 9fec21ac50..1092ba4852 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -7,9 +7,9 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 PROJECT_DIR="$( cd "${SCRIPT_DIR}/.." && pwd )"
 
 # Make sure that environment variables are set properly
-source /opt/rh/devtoolset-8/enable
 export PATH="${CURA_BUILD_ENV_PATH}/bin:${PATH}"
 export PKG_CONFIG_PATH="${CURA_BUILD_ENV_PATH}/lib/pkgconfig:${PKG_CONFIG_PATH}"
+export LD_LIBRARY_PATH="${CURA_BUILD_ENV_PATH}/lib:${LD_LIBRARY_PATH}"
 
 cd "${PROJECT_DIR}"
 
@@ -60,7 +60,7 @@ export PYTHONPATH="${PROJECT_DIR}/Uranium:.:${PYTHONPATH}"
 
 mkdir build
 cd build
-cmake3 \
+cmake \
     -DCMAKE_BUILD_TYPE=Debug \
     -DCMAKE_PREFIX_PATH="${CURA_BUILD_ENV_PATH}" \
     -DURANIUM_DIR="${PROJECT_DIR}/Uranium" \
diff --git a/docker/test.sh b/docker/test.sh
index 9284fede20..bae2bf785e 100755
--- a/docker/test.sh
+++ b/docker/test.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 cd build
-ctest3 -j4 --output-on-failure -T Test
+ctest -j4 --output-on-failure -T Test
diff --git a/requirements.txt b/requirements.txt
index 860c8dbc8a..dc14e2e041 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,35 +3,33 @@ certifi==2019.11.28
 cffi==1.14.1
 chardet==3.0.4
 colorlog
-comtypes==1.1.7
 cryptography==3.4.8
 decorator==4.4.0
 idna==2.8
-importlib-metadata==3.7.2
+importlib-metadata==4.10.0
 keyring==23.0.1
-lxml==4.6.3
+lxml==4.7.1
 mypy==0.740
 netifaces==0.10.9
 networkx==2.6.2
-numpy==1.20.2
+numpy==1.21.5
 numpy-stl==2.10.1
 packaging==18.0
+pyclipper==1.3.0.post2
 pycollada==0.6
 pycparser==2.20
 pyparsing==2.4.2
-PyQt5==5.15.2
-PyQt5-sip==12.8.1
+PyQt5==5.15.6
+PyQt5-sip==12.9.0
 pyserial==3.4
 pytest
 python-dateutil==2.8.0
 python-utils==2.3.0
-pywin32==301
-requests==2.22.0
-scipy==1.6.2
+pywin32==303
+scipy==1.8.0rc2
 sentry-sdk==0.13.5
-shapely[vectorized]==1.8.0
 six==1.12.0
-trimesh==3.2.33
+trimesh==3.9.36
 twisted==21.2.0
 typing
 urllib3==1.25.9
diff --git a/resources/images/whats_new/1.png b/resources/images/whats_new/1.png
deleted file mode 100644
index f1213a6b5a..0000000000
--- a/resources/images/whats_new/1.png
+++ /dev/null
diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml
index ad6e36d9f6..6b20e48bc0 100644
--- a/resources/qml/Preferences/GeneralPage.qml
+++ b/resources/qml/Preferences/GeneralPage.qml
@@ -167,13 +167,11 @@ UM.PreferencesPage
                         append({ text: "Čeština", code: "cs_CZ" })
                         append({ text: "Deutsch", code: "de_DE" })
                         append({ text: "Español", code: "es_ES" })
-                        //Finnish is disabled for being incomplete: append({ text: "Suomi", code: "fi_FI" })
                         append({ text: "Français", code: "fr_FR" })
                         append({ text: "Italiano", code: "it_IT" })
                         append({ text: "日本語", code: "ja_JP" })
                         append({ text: "한국어", code: "ko_KR" })
                         append({ text: "Nederlands", code: "nl_NL" })
-                        //Polish is disabled for being incomplete: append({ text: "Polski", code: "pl_PL" })
                         append({ text: "Português do Brasil", code: "pt_BR" })
                         append({ text: "Português", code: "pt_PT" })
                         append({ text: "Русский", code: "ru_RU" })
@@ -186,6 +184,12 @@ UM.PreferencesPage
                         {
                             append({ text: "Pirate", code: "en_7S" })
                         }
+
+                        // incomplete and/or abandoned
+                        append({ text: catalog.i18nc("@heading", "-- incomplete --"), code: "" })
+                        append({ text: "Magyar", code: "hu_HU" })
+                        append({ text: "Suomi", code: "fi_FI" })
+                        append({ text: "Polski", code: "pl_PL" })
                     }
                 }
 
@@ -197,8 +201,7 @@ UM.PreferencesPage
                     model: languageList
                     Layout.fillWidth: true
 
-                    currentIndex:
-                    {
+                    function setCurrentIndex() {
                         var code = UM.Preferences.getValue("general/language");
                         for(var i = 0; i < languageList.count; ++i)
                         {
@@ -208,7 +211,17 @@ UM.PreferencesPage
                             }
                         }
                     }
-                    onActivated: UM.Preferences.setValue("general/language", model.get(index).code)
+
+                    currentIndex: setCurrentIndex()
+
+                    onActivated: if (model.get(index).code != "")
+                        {
+                            UM.Preferences.setValue("general/language", model.get(index).code);
+                        }
+                        else
+                        {
+                            currentIndex = setCurrentIndex();
+                        }
                 }
 
                 Label