Last commit made on 2016-11-04
Get this branch:
git clone -b 2.3

Branch merges

Branch information


Recent commits

472c3b0... by Ruben D on 2016-11-04

Blur focus upon changing profiles, material, variant, etc.

Otherwise the currently focussed setting gets taken along to after the switch.

d7a6173... by Ruben D on 2016-11-04

Update change log with texts from marketing

These are the texts that they came up with. And we corrected them. And they came up with factually wrong texts again. We corrected them again. Now we won't allow any changes any more. Pft.

32653c2... by Ruben D on 2016-11-01

Blur settings upon discarding current settings

Otherwise the currently selected setting doesn't get discarded.

Contributes to issue CURA-2866.

0db7cf2... by Ruben D on 2016-11-01

Revert 'Added a comment' and 'Set horizontal expansion'

This horizontal expansion messes prints with very thin parts. It was probably the wrong solution for the problem. We'll revert the change until we hear more from tests at the materials team.

Contributes to issue CURA-2845.

48b57de... by Ruben D on 2016-10-31

Filter materials on compatibility for non-machine-specific materials

This only listens to whether the 'base' XML profile is marked as compatible in its metadata, but since the machine doesn't have its own materials, the base is the only one that exists. This needs to be changed when we change the filtering on fdmprinter, hence the comment in the code.

Contributes to issue CURA-2837.

21f1b12... by Simon Edwards <email address hidden> on 2016-10-31

Internal docs.
CURA-2852 Activating customised material will not duplicate UM2+ profiles

41ed966... by Jaime van Kessel <email address hidden> on 2016-10-31

FindQUalityByName now also uses fallback generic materials if no result was found


e74953c... by Simon Edwards <email address hidden> on 2016-10-31

Internal docs.
CURA-2823 Maximum build volume not met despite disabled settings

9a8a5db... by Ruben D on 2016-10-31

Fix documentation for getAllExtruderSettings

Didn't complete it previously. Oops.

Contributes to issue CURA-2823.

8c25a91... by Simon Edwards <email address hidden> on 2016-10-31

Added a comment to help provide some kind of explaination for this magic value.
CURA-2845 Prints are slightly oversized