Ghostkeeper ee9de1f11b

Merge branch '3.2' ...

Lots of conflicts due to rounding vs. flooring of text element positions for weirdness with the font aliasing.

2018-02-14 10:53:51 +01:00

..

Menus

Merge branch '3.2'

2018-01-31 09:13:29 +01:00

Preferences

Merge branch '3.2'

2018-02-14 10:53:51 +01:00

PrinterOutput

Fixed connection label state

2018-01-08 13:44:20 +01:00

Settings

Merge branch '3.2'

2018-02-14 10:53:51 +01:00

AboutDialog.qml

Streamline usage of g-code (vs. GCode, Gcode, G-code, gcode, etc.)

2018-02-13 15:50:59 +01:00

Actions.qml

CURA-4525 solved merge conflict

2018-01-04 10:24:30 +01:00

AddMachineDialog.qml

If there is no added printer, disallow closing the window

2017-12-29 14:32:43 +01:00

AskOpenAsProjectOrModelsDialog.qml

Hitting enter on project loading dialog now loads the project instead of just closing the dialog - CURA-4735

2018-01-19 11:32:55 +01:00

Cura.qml

Merge branch '3.2'

2018-02-14 10:53:51 +01:00

DiscardOrKeepProfileChangesDialog.qml

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

EngineLog.qml

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00

ExtruderButton.qml

Change Math.floor to Math.round as a last try to fix garbled fonts

2018-02-14 09:28:47 +01:00

JobSpecs.qml

Change Math.floor to Math.round as a last try to fix garbled fonts

2018-02-14 09:28:47 +01:00

MachineAction.qml

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

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

MachineSelection.qml

CURA-4234 splitted MachineSelection into a separate file and add it to PrintMonitor as well, because now it's part of the sidebar

2017-12-14 14:49:18 +01:00

MonitorButton.qml

Merge branch '3.2'

2018-02-14 10:53:51 +01:00

ObjectsList.qml

Change Math.floor to Math.round as a last try to fix garbled fonts

2018-02-14 09:28:47 +01:00

OpenFilesIncludingProjectsDialog.qml

Force use and update the job name with the loaded project file

2017-10-12 07:59:43 +02:00

PrintMonitor.qml

Merge branch '3.2'

2018-02-14 10:53:51 +01:00

SaveButton.qml

Merge branch '3.2'

2018-02-14 10:53:51 +01:00

Sidebar.qml

Merge branch '3.2'

2018-02-14 10:53:51 +01:00

SidebarAdvanced.qml

Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite

2018-01-08 10:56:12 +01:00

SidebarContents.qml

Increased the version of QtQuick

2018-02-13 11:07:14 +01:00

SidebarHeader.qml

Merge branch '3.2'

2018-02-14 10:53:51 +01:00

SidebarSimple.qml

Merge branch '3.2'

2018-02-14 10:53:51 +01:00

SidebarTooltip.qml

Change Math.floor to Math.round as a last try to fix garbled fonts

2018-02-14 09:28:47 +01:00

Toolbar.qml

Change Math.floor to Math.round as a last try to fix garbled fonts

2018-02-14 09:28:47 +01:00

Topbar.qml

Merge branch '3.2'

2018-02-14 10:53:51 +01:00

WorkspaceSummaryDialog.qml

Changing AGPLv3 to LGPLv3

2017-09-28 13:00:43 +02:00