Cura/plugins/3MFReader
Ghostkeeper 9140b71b19
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.
2021-12-14 11:48:58 +01:00
..
__init__.py Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
plugin.json Now unused API field only took integers originally. 2021-06-17 11:15:33 +02:00
ThreeMFReader.py Add cura: namespace before setting keys, and store the rest in um_node.metadata 2021-02-08 17:37:38 +01:00
ThreeMFWorkspaceReader.py Merge branch 'libArachne_rebased' 2021-12-14 11:48:58 +01:00
UpdatableMachinesModel.py Revert "Revert "Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7"" 2020-08-20 16:35:52 +02:00
WorkspaceDialog.py Revert "Revert "Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7"" 2020-08-20 16:35:52 +02:00
WorkspaceDialog.qml Unrevert new icon set for all of Cura's interface 2021-06-28 17:16:56 +02:00