Jack Ha 132b6aa9d7 Merge branch '2.5'

2017-03-15 09:10:49 +01:00

..

Menus

D6: Moved file loading code

2016-12-23 15:53:16 -05:00

Preferences

CURA-3452 Save spool cost and weight upon change

2017-03-10 12:41:28 +01:00

Settings

fix: more lenient int-list validator parsing (CURA-3275)

2017-03-06 14:42:11 +01:00

AboutDialog.qml

Add libSavitar credit

2017-02-17 13:44:43 +01:00

Actions.qml

Added new project option

2017-03-10 11:02:27 +01:00

AddMachineDialog.qml

Replace "transparent" Rectangles by Items

2017-01-25 15:21:37 +01:00

Cura.qml

Added confirmation message for starting new project

2017-03-10 14:10:24 +01:00

DiscardOrKeepProfileChangesDialog.qml

Use translation for text in keep/discard profile dialog

2017-03-14 11:59:51 +01:00

EngineLog.qml

T466: Revert the previous commit since it messed up the file rights.

2016-12-23 15:53:15 -05:00

JobSpecs.qml

Refactor properties that start with 'get' to avoid confusion between slots & properties

2017-02-17 13:35:01 +01:00

MachineAction.qml

T466: Revert the previous commit since it messed up the file rights.

2016-12-23 15:53:15 -05:00

MonitorButton.qml

Refactor properties that start with 'get' to avoid confusion between slots & properties

2017-02-17 13:35:01 +01:00

MultiplyObjectOptions.qml

No longer cast ObjectId to int

2016-11-21 13:42:08 +01:00

PrintMonitor.qml

Align tooltips better

2017-02-16 15:02:48 +01:00

SaveButton.qml

Solved merge conflicts. CURA-3214

2017-02-21 11:01:20 +01:00

Sidebar.qml

Merge branch 'master' into feature_auto_slice

2017-02-15 12:42:09 +01:00

SidebarAdvanced.qml

T466: Revert the previous commit since it messed up the file rights.

2016-12-23 15:53:15 -05:00

SidebarContents.qml

T466: Revert the previous commit since it messed up the file rights.

2016-12-23 15:53:15 -05:00

SidebarHeader.qml

Replace "transparent" Rectangles by Items

2017-01-25 15:21:37 +01:00

SidebarSimple.qml

Recommended settings now shows correct status for adhesion when None was selected

2017-02-20 17:32:20 +01:00

SidebarTooltip.qml

T466: Revert the previous commit since it messed up the file rights.

2016-12-23 15:53:15 -05:00

Toolbar.qml

T466: Revert the previous commit since it messed up the file rights.

2016-12-23 15:53:15 -05:00

WorkspaceSummaryDialog.qml

Workspace & load image dialog can now be resized

2017-01-23 15:08:37 +01:00