* 'master' of github.com:ultimaker/Cura: (38 commits)
Fixed profile file case-sensitivity.
Fix UMO Checkup button size
Remove debug statement and commented-out code CURA-1385
Show "ready" state when a printer is connected but jobstate is not yet set
Added deepcopy function
Made exception handling of slice info plugin way more robust
Restart timer after slicing is performed when not enabled.
Update GUID for PLA to match the GUID in the official repository
Set default extruder index to -1 (so global is default)
Ensure that the display matches with the backend active extruder data
Update UM2 Extended build volume height to value published in marketing materials
Fixed firmware upgrade for um2+
Capitalise setting label
CHeckup action now correctly resets every time you start it
Remove unused name/id when importing a profile from a gcode file
Just a little typo
BQ Hephestos2: Heat up nozzle while leveling
Saving g-code no longer crashes
Removed update firmware from extensions; This is now handled by machine actions
Changing active extruder no longer trigger re-slice
...
* 'master' of github.com:ultimaker/Cura: (76 commits)
Added UMO upgrade selection
Added stubs for UMO upgrade selection
Machine action labels are now translatable
Code style CURA-1676
Using the correct placeholder
SplashScreen: Using system-default fontfamily
USBPrinting: Let's "Print via USB"
BQ Hephestos2 - Preheating temperature fix When starting a print with the "custom" GCode by BQ, the printer resets the nozzle temperature to 210°C when printing via SD card (no matter what you set on Cura) and only preheats the nozzle to 180°C when printing via USB. So currently the printer begins to print via USB at 180°C and reaches the correct temperature eg.g while printing the brim.
Fix warning about missing color in theme
Automatically show the Print Monitor when starting a print
Fix USBPrinterOutputDevice to work with the Print Monitor
Properly prevent warning when no printer is connected.
ZOffset decorator is now correctly copied
Force focus instead of requesting it.
Fix two "critical errors" on startup
Minor check machine action GUI improvements
Prevent warning when no printer is connected.
Fix empty material/quality profiles when switching variants
Disable monitor buttons when there is no job running
Move message stack "above" the viewport overlay
...
This reverts commit 963a2092efefb62f8f8b1216f0a7d05bbebb884d.
I still say we should use "colour" for consistency, but that change should not be part of this branch.
CURA-333
I know "colour" is the more correct spelling, but Qt uses the spelling "color" and we have already adopted that spelling in a number of places.
CURA-333
This applies a setting that is currently being typed by the user. Otherwise it would take the currently being typed value along to the next tab, since it can't update a setting value while it is in focus.
Contributes to issues CURA-340 and CURA-1278.
This model is also used by the extruder selection drop-downs, and it's automatically filled already so that was double logic.
Contributes to issues CURA-340 and CURA-1278.
There were two singletons of this manager: One created by QML and managed by QML, and one created by us and managed by our own singleton pattern. That won't work! So we now manage just our own singleton type, and make it a context item for QML so it can use the manager too.
Contributes to issues CURA-340 and CURA-1278.
Only visible for multi-extrusion printers. Doesn't do anything but setting a qml property, but is to be used to change the variant/material per extruder, and to apply a filter to the advanced mode settings.
CURA-340
