Ghostkeeper 9ea418c0a1 Revert "Revert "Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7"" ... This reverts commit 28f4d8513d. The original revert was to revert an accidental merge from master to 4.7. This now reverts the revert on Master, so that we still have those changes on Master.		2020-08-20 16:35:52 +02:00
..
Cloud	Revert "Revert "Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7""	2020-08-20 16:35:52 +02:00
Messages	Change cloud labels in UM3NetworkPrinting plugin	2020-07-27 12:00:27 +02:00
Models	Merge remote-tracking branch 'origin/master' into CURA-7437_no_internet_cloud_bugs	2020-06-09 10:47:53 +02:00
Network	Remove trailing whitespace from Python files	2020-05-29 14:30:33 +02:00
__init__.py	Fix running automated tests on Python 3.6	2019-02-08 09:50:20 +01:00
ClusterOutputController.py	Fix copyright year to 2019	2019-08-02 15:09:37 +02:00
ExportFileJob.py	Convert doxygen to rst for UM3NetworkPrinting	2020-05-15 15:05:38 +02:00
MeshFormatHandler.py	Remove trailing whitespace from Python files	2020-05-29 14:30:33 +02:00
UltimakerNetworkedPrinterAction.py	Remove trailing whitespace from Python files	2020-05-29 14:30:33 +02:00
UltimakerNetworkedPrinterOutputDevice.py	Remove trailing whitespace from Python files	2020-05-29 14:30:33 +02:00
UM3OutputDevicePlugin.py	Remove trailing whitespace from Python files	2020-05-29 14:30:33 +02:00
Utils.py	Fix copyright year to 2019	2019-08-02 15:09:37 +02:00