Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/4.13' into mb-testing
Browse files Browse the repository at this point in the history
  • Loading branch information
burtoogle committed Jan 11, 2022
2 parents 5fb4d78 + 020b8f7 commit 2ab4ce3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
5 changes: 4 additions & 1 deletion cura_app.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python3

# Copyright (c) 2020 Ultimaker B.V.
# Copyright (c) 2022 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.

# Remove the working directory from sys.path.
Expand All @@ -17,6 +17,9 @@
import argparse
import faulthandler
import os
if sys.platform != "linux": # Turns out the Linux build _does_ use this, but we're not making an Enterprise release for that system anyway.
os.environ["QT_PLUGIN_PATH"] = "" # Security workaround: Don't need it, and introduces an attack vector, so set to nul.
os.environ["QML2_IMPORT_PATH"] = "" # Security workaround: Don't need it, and introduces an attack vector, so set to nul.

# Workaround for a race condition on certain systems where there
# is a race condition between Arcus and PyQt. Importing Arcus
Expand Down
3 changes: 2 additions & 1 deletion resources/texts/change_log.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[4.13]
[4.13.0]
<i>For an overview of the new features in Cura 4.13, please watch <a href="https://youtu.be/chvAuI6Eqto">our video</a>.</i>

* Sync material profiles
Expand Down Expand Up @@ -56,6 +56,7 @@ We’ve streamlined the user login authentication by removing any restrictions,
- Fixed a bug where support blockers were included in the bounding box after loading a project file
- Fixed a bug where grouped models become unslicable if the first extruder was disabled
- Fixed a bug in Tree Support where the Z Distance was too big
- Prevented QT plug-ins from being loaded from an insecure directory if an environment variable is set

* Printer definitions, profiles and materials:
- Add Eazao Zero printer definition, contributed by Hogan-Polaris
Expand Down

0 comments on commit 2ab4ce3

Please sign in to comment.