Mark Burton 0237a5a386 Merge remote-tracking branch 'upstream/master' into mb-infill-line-angles ...

# Conflicts:
#	cura/CuraApplication.py

2017-02-15 08:20:45 +00:00

..

__init__.py

Change "object" to "model"

2016-08-10 17:55:51 +02:00

PerObjectCategory.qml

Restyle categories in add per object settings visibility dialog

2016-08-08 14:24:38 +02:00

PerObjectItem.qml

Allow adding multiple per object settings at once

2016-08-08 14:23:39 +02:00

PerObjectSettingsPanel.qml

Add the [int] setting type for settings that are a list of integers.

2017-01-27 15:54:19 +00:00

PerObjectSettingsTool.py

PerObject tool is now disabled when group or multiple objects are selected

2016-11-03 15:33:18 +01:00

PerObjectSettingVisibilityHandler.py

Lots of import fixes. Eliminated the import hacks such as those used inside UM/Settings/__init__.py.

2016-12-12 16:05:35 +01:00