diff options
| author | Ghostkeeper <rubend@tutanota.com> | 2021-12-14 13:48:58 +0300 |
|---|---|---|
| committer | Ghostkeeper <rubend@tutanota.com> | 2021-12-14 13:48:58 +0300 |
| commit | 9140b71b1998d75d51ae556bbb63059de6016c9c (patch) | |
| tree | 6bc49869a84820770d325d5c0300ed9f1e42bdec /plugins/SimulationView | |
| parent | 64dec9ecc10eb81b68aecc4dcf586e80c03dec01 (diff) | |
| parent | 2000f8143a1392ea1d198b485ba17e84dba33594 (diff) | |
Merge branch 'libArachne_rebased'
Conflicts:
plugins/SimulationView/SimulationPass.py -> Reverted layer view optimisation in Master while some whitespace changed in Arachne.
resources/definitions -> Bunch of conflicts with profile updates.
resources/quality -> Bunch of conflicts with profile updates.
resources/texts/change_log.txt -> Removed the Arachne change log (as they are internal versions). It'll have to be re-added when we release this version as stable.
Diffstat (limited to 'plugins/SimulationView')
| -rw-r--r-- | plugins/SimulationView/SimulationPass.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/SimulationView/SimulationPass.py b/plugins/SimulationView/SimulationPass.py index 2754fb5d94..1294b37db4 100644 --- a/plugins/SimulationView/SimulationPass.py +++ b/plugins/SimulationView/SimulationPass.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from UM.Math.Color import Color |