Ghostkeeper bcf7e0459b Merge branch 'master' of github.com:Ultimaker/Cura ...

Conflicts:
	cura/MachineManagerModel.py

2016-06-06 16:41:34 +02:00

..

Preferences

Fix removing custom (quality) profiles

2016-06-06 15:09:21 +02:00

Settings

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

2016-06-06 16:41:34 +02:00

WizardPages

Remove extruder drive upgrade option

2016-05-23 17:19:18 +02:00

AboutDialog.qml

Add width, height in addition to minimumWidth, minumumHeight to fix retina issue on OSX

2016-04-07 18:06:38 +02:00

Actions.qml

Updating non-readonly profiles is now possible again

2016-06-03 13:03:56 +02:00

AddMachineDialog.qml

Moved addMachine to machineManager

2016-05-12 15:18:13 +02:00

AddMachineWizard.qml

Use resolvedUrl since that does give the right path for qml files

2015-09-03 10:13:47 -07:00

Cura.qml

Fix exclusiveGroup for machine selection in the menu

2016-06-04 21:22:21 +02:00

EngineLog.qml

Code style & switch to translation catalog

2015-08-27 16:04:02 +02:00

GeneralPage.qml

Fix debug code introduced in f5fce512380209c1a05687ef83c4d2bf0f8b0bec

2016-05-27 17:46:53 +02:00

JobSpecs.qml

Fix creating a jobname after loading a file

2016-06-02 16:38:06 +02:00

MachinesPage.qml

Fix highlighting the currently active (printer|quality|material) on their management pages

2016-06-01 10:47:04 +02:00

ProfileSetup.qml

Filter material/quality by machine only when we should filter

2016-06-02 08:10:55 +02:00

SaveButton.qml

Fix creating a jobname after loading a file

2016-06-02 16:38:06 +02:00

Sidebar.qml

Rearrange sidebar top

2016-05-26 09:42:04 +02:00

SidebarAdvanced.qml

Use the local SettingView in SidebarAdvanced

2016-05-10 17:31:32 +02:00

SidebarHeader.qml

Move creating extruder manager logic to ExtruderManager

2016-06-06 15:15:33 +02:00

SidebarSimple.qml

Remove stray debug print

2016-06-02 11:12:37 +02:00

SidebarTooltip.qml

Improve positioning of tooltips in advanced mode

2016-05-11 17:19:31 +02:00

Toolbar.qml

Instantiate models instead of using the Models object

2016-05-11 17:19:31 +02:00

ViewPage.qml

Merge branch '2.1'

2016-01-28 15:25:18 +01:00