Ghostkeeper 7df4c01814 Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown ... Conflicts: cura/Settings/MachineManager.py -> rowCount vs. count resources/qml/ExtruderIcon.qml -> Someone changed stuff that I had overwritten. resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml -> Someone changed stuff that I had removed. resources/qml/Toolbar.qml -> Git was wrong, not a conflict. resources/themes/cura-light/theme.json -> Git was wrong, not a conflict.		2018-12-03 11:45:05 +01:00
..
API	Switch Ultimaker Account OAuth2 client	2018-11-20 19:18:48 +01:00
Arranging	Fix code-style	2018-07-03 12:06:06 +02:00
Backups	Don't fail the samefile check if second file didn't exist	2018-11-26 09:40:14 +01:00
Machines	Gracefully handle the case where machine definition is no in the map	2018-11-28 11:42:54 +01:00
OAuth2	Merge branch 'ui_rework_4_0' into cura4.0_header	2018-11-02 13:36:47 +01:00
Operations	Add missing super init call - CURA-4525	2018-01-04 10:59:44 +01:00
PrinterOutput	Some more refactoring, splitting up methods	2018-11-19 10:44:24 +01:00
ReaderWriters	Create module cura.ReaderWriters	2018-04-05 15:14:15 +02:00
Scene	Add missing typing	2018-11-28 11:52:30 +01:00
Settings	Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown	2018-12-03 11:45:05 +01:00
Stages	Set the height of the stage menu in the theme instead of hardcoded.	2018-10-18 16:33:13 +02:00
TaskManagement	Fix code style	2018-07-13 09:21:35 +02:00
Utils	CURA-5035 Remove uncessary VersionTools	2018-04-26 13:17:00 +02:00
__init__.py	T466: Revert the previous commit since it messed up the file rights.	2016-12-23 15:53:15 -05:00
AutoSave.py	Merge branch 'master' into WIP_improve_initialization	2018-05-25 09:40:42 +02:00
BuildVolume.py	Prevent an error during start up	2018-11-14 14:20:42 +01:00
CameraAnimation.py	Merge pull request #905 from Ultimaker/snappier_camera_animation	2017-10-24 10:36:55 +02:00
CrashHandler.py	Move factory reset to Uranium	2018-03-28 08:43:46 +02:00
CuraActions.py	Fix typing	2018-11-27 17:54:53 +01:00
CuraApplication.py	Switch to the preview stage before to switch to simulation view	2018-11-27 16:06:37 +01:00
CuraPackageManager.py	Added error checking, added typing, renamed function. CURA-5389	2018-07-12 14:06:34 +02:00
CuraSplashScreen.py	Fix size of "beta" classifier on splash screen for HiDPI (windows) screens	2017-10-16 14:51:59 +02:00
CuraVersion.py.in	Fix typo in label ID	2018-11-09 11:41:43 +01:00
CuraView.py	Add CuraView, which does something similar to CuraStage	2018-10-29 16:21:16 +01:00
Layer.py	CURA-4526 Delete LayerView plugin because it will be replaced with the	2017-11-21 10:47:29 +01:00
LayerData.py	Changing AGPLv3 to LGPLv3	2017-09-28 13:00:43 +02:00
LayerDataBuilder.py	CURA-4526 Delete LayerView plugin because it will be replaced with the	2017-11-21 10:47:29 +01:00
LayerDataDecorator.py	T466: Revert the previous commit since it messed up the file rights.	2016-12-23 15:53:15 -05:00
LayerPolygon.py	Remove trailing whitespace	2018-08-24 15:24:00 +02:00
MachineAction.py	Add typing for MachineAction	2018-10-19 09:58:06 +02:00
MachineActionManager.py	Fix typing in MachineActionManager	2018-10-19 09:58:06 +02:00
MultiplyObjectsJob.py	FindNodePlacement should find a placement for the node, but not creating	2018-06-13 11:28:20 +02:00
ObjectsModel.py	Convert name check to defaultdict	2018-08-29 17:43:22 -04:00
OneAtATimeIterator.py	Fix code style.	2018-08-15 09:14:37 +02:00
PickingPass.py	Fix some more code-style	2018-07-03 13:09:05 +02:00
PlatformPhysics.py	Do not move locked nodes	2018-06-11 14:45:46 +02:00
PreviewPass.py	Add types for ShaderPrograms	2018-06-15 11:34:35 +02:00
PrinterOutputDevice.py	Use QStringList instead of QVariantList since the return value is a list of strings.	2018-11-26 10:55:32 +01:00
PrintInformation.py	Merge branch 'master' of github.com:Ultimaker/Cura into ui_rework_4_0	2018-11-27 17:55:13 +01:00
PrintJobPreviewImageProvider.py	Add typings and fix code style	2018-09-06 16:57:45 +02:00
SingleInstance.py	Fix code-styling	2018-07-03 17:57:30 +02:00
Snapshot.py	Add non-thumbnail-visible flag for creating previews	2018-05-23 16:32:38 +02:00