Arjen Hiemstra 57b2ce4f3e Merge branch 'master' of github.com:ultimaker/Cura into per_object_settings ... * 'master' of github.com:ultimaker/Cura: (49 commits) 15.10 restyling of the sidebar header 15.10 restyling of the sidebar header 15.10 restyling of the sidebar split magic_mesh)surface_mode into Normal, Surface, Both Added preference to disable automatic scale Removed unused import Added changeLog plugin Added missing ) Merging of mine and Jaimes work Removed font from rectangle JSON: git diff! removed triangles and grid top/bottom skin options (though they are available) Code style & switch to translation catalog 15.10 re-alignment of the toolbar 15.10 New Icons 15.10 restyling of the savebutton Area Added message asking about sending data to server Added exception handling for checking overlap. Fixed default button for general and view page Fixed double ID in qml Removed unused import ...		2015-09-01 15:44:19 +02:00
..
__init__.py	Move src to cura so we can use the same package for installed and source	2015-05-18 15:03:42 +02:00
BuildVolume.py	Use the active machine instance for Build Volume	2015-09-01 15:06:03 +02:00
CameraAnimation.py	Move src to cura so we can use the same package for installed and source	2015-05-18 15:03:42 +02:00
ConvexHullDecorator.py	Fix ConvexHull{Decorator,Job} to work with the new profile structure	2015-09-01 15:03:29 +02:00
ConvexHullJob.py	Fix ConvexHull{Decorator,Job} to work with the new profile structure	2015-09-01 15:03:29 +02:00
ConvexHullNode.py	Merge branch 'master' of github.com:ultimaker/Cura into per_object_settings	2015-08-21 13:29:30 +02:00
CrashHandler.py	Print backtrace on console when we are not running a py2exe/py2app build	2015-08-19 19:13:44 +02:00
CuraActions.py	Defer opening the webbrowser until the next run of the event loop	2015-06-23 11:54:22 +02:00
CuraApplication.py	Merge branch 'master' of github.com:ultimaker/Cura into per_object_settings	2015-09-01 15:44:19 +02:00
MultiMaterialDecorator.py	Added merging for multi material	2015-07-27 14:25:27 +02:00
OneAtATimeIterator.py	Fix convex hull and other bits so they use the new API	2015-08-18 18:11:32 +02:00
PlatformPhysics.py	Removed unused import	2015-08-28 16:31:47 +02:00
PlatformPhysicsOperation.py	Move src to cura so we can use the same package for installed and source	2015-05-18 15:03:42 +02:00
PrintInformation.py	Remove most of the PrintInformation code and fix the material amount to use profile	2015-09-01 15:05:31 +02:00