5199 Commits

Author SHA1 Message Date
Jaime van Kessel
e0b6e31056 Added way to mark toolbutton as error aswell
CURA-2271
2016-09-09 11:48:01 +02:00
Jaime van Kessel
9770037398 If setting is false, it will still return false (instead of empty string)
CURA-2271
2016-09-09 11:44:41 +02:00
Ghostkeeper
b5eb7916c7
Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-09 10:57:51 +02:00
Jaime van Kessel
e7335d9814 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-09 10:53:21 +02:00
Jaime van Kessel
d34f54a3c7 Right type is now returned if metadata entry is not found
CURA-2242
2016-09-09 10:29:16 +02:00
Thomas Karl Pietrowski
8571087f3e CURA-1445: Using .join instead
Says in one line what I wanted to do.
2016-09-09 00:24:32 +02:00
fieldOfView
0828d4f1ca Fix dirty flag of incompatible_materials 2016-09-08 21:11:08 +02:00
fieldOfView
9252a46421 Merge branch '2.3' 2016-09-08 19:51:09 +02:00
Ghostkeeper
e35bc595b6
Fall back to different quality depending on stack
Falling back to normal.inst.cfg isn't enough. That profile may be filtered out by the machine, variant and material. We need to fall back to a different quality profile depending on the machine, variant and material.

Contributes to issue CURA-844.
2016-09-08 19:23:18 +02:00
Ghostkeeper
263105c3e7
Use translation of built-in profiles instead of constructing it
Makes the code much simpler, though some repetition is hard-coded now.

Contributes to issue CURA-844.
2016-09-08 19:23:18 +02:00
Ghostkeeper
93cd5acbad
Set quality to normal, not quality type
Even though this key says it's quality, it's not a quality profile, it's a quality type.

Contributes to issue CURA-844.
2016-09-08 19:23:18 +02:00
Ghostkeeper
761aeb1aa2
Always set type to quality_changes
Custom profiles are always quality changes. They should always say quality in the original anyway; that was an assumption we've made thousands of times.

Contributes to issue CURA-844.
2016-09-08 19:23:18 +02:00
Ghostkeeper
23180d408c
Always set quality type to normal
We don't know the actual quality type, the quality profile that this profile is based on. Maybe there isn't one, even. As a solution we always base imported custom quality profiles on normal.

Contributes to issue CURA-844.
2016-09-08 19:23:18 +02:00
Ghostkeeper
e16a32ee54
Add missing built-in profiles to _profile_translations
These profiles were not thought of as built-in. Instead, they were sorta constructed from pieces. That complex piece of code won't be necessary any more after I add this and after Cura 2.3 has proper profile inheritance again.

Contributes to issue CURA-844.
2016-09-08 19:23:18 +02:00
Apsu
b3f4b08f56 Add gantry height and extruder assembly dimensions 2016-09-08 12:22:29 -05:00
fieldOfView
40ae75f54f Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-08 18:50:53 +02:00
fieldOfView
501afc3f2e Change UM2Ex+ definition to inherit qualities from UM2+
CURA-1780
2016-09-08 18:50:39 +02:00
fieldOfView
8b7a8327e8 Allow machinedefinitions to specify another definition to inherit qualities from
CURA-1780
2016-09-08 18:49:34 +02:00
Jack Ha
ce868e2865 Merge branch '2.3' 2016-09-08 17:40:18 +02:00
Jack Ha
f4bf1809c6 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-08 17:38:16 +02:00
Jack Ha
2138a87582 Busy with CURA-2159 2016-09-08 17:37:49 +02:00
Jaime van Kessel
544941e33e Signals are now only emitted when setting changed instead of always. 2016-09-08 17:20:01 +02:00
Tim Kuipers
38c1bb1420 Merge branch '2.3' 2016-09-08 16:22:16 +02:00
Tim Kuipers
6197a5b77a feat: support_interface_skip_height (CURA-2052) 2016-09-08 16:21:34 +02:00
Tim Kuipers
84fb59a0f3 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-08 16:19:06 +02:00
Tim Kuipers
750018003d removal: made support_area_smoothing hardcoded (CURA-2296) 2016-09-08 15:39:33 +02:00
Jaime van Kessel
96a1aafb80 Zipfile is now closed when it's done loading
CURA-2252
2016-09-08 14:23:35 +02:00
Jaime van Kessel
45a841a52b Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-08 14:15:54 +02:00
Jaime van Kessel
8a8b55800b Duplicating materialContainers should now duplicate all related material containers
CURA-2242
2016-09-08 14:15:00 +02:00
fieldOfView
4de78db87a Revert "Remove "infill mesh" as a standard visible setting"
This reverts commit 46942d7cf23e32dcdf5dbf00440aa781061f4f65.

It was not my decision to make
2016-09-08 14:04:58 +02:00
fieldOfView
46942d7cf2 Remove "infill mesh" as a standard visible setting 2016-09-08 14:02:44 +02:00
fieldOfView
37862dde42 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-08 13:58:28 +02:00
fieldOfView
be6bfdd4af Add a "linked" icon to settings that have "global_inherits_stack" set 2016-09-08 13:58:13 +02:00
Ghostkeeper
064871321f
Merge branch '2.3' 2016-09-08 13:43:32 +02:00
Ghostkeeper
35e9a651a1
Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-08 13:18:41 +02:00
Ghostkeeper
557e52e514
Update outdated setting name
This setting name was changed, but apparently not everywhere.
2016-09-08 13:06:03 +02:00
Jaime van Kessel
754e0fe613 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-09-08 12:50:30 +02:00
Jaime van Kessel
73c5c34b99 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-08 12:50:19 +02:00
Jaime van Kessel
09f7d9b999 We shuffle the list of nodes so that the push free won't endlessly repeat the same 2 steps 2016-09-08 12:49:42 +02:00
fieldOfView
8b2e652011 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-08 11:56:23 +02:00
fieldOfView
bb92c0d7fa Fix units for density and diameter 2016-09-08 11:56:11 +02:00
Ghostkeeper
ea4333b802
No longer disable Nylon by default
It prints fine on most printers. Just allow people to select it. (And other secret reasons.)
2016-09-08 11:51:46 +02:00
fieldOfView
a11e2a56a6 Fix densities of Nylon, PC & TPU 2016-09-08 09:21:50 +02:00
fieldOfView
b921540703 Remove superfluous margin left by hidden settings
Each setting that was made visible, but was disabled due to the value of another setting, would leave a 1 px margin (eg settings in the support category when support was not enabled). Hidden settings now eat that margin, leaving nothing behind.
2016-09-08 08:58:40 +02:00
fieldOfView
29edcb9058 Style MessageStack making messages less likely to be overlooked
CURA-1886
2016-09-08 08:48:58 +02:00
Apsu
0f3eb7d85d Update to reorganized version 2016-09-07 23:06:16 -05:00
Apsu
3988667b69 Add Prusa i3 Mk2 definition 2016-09-07 22:54:23 -05:00
Jaime van Kessel
895cf40ab0 Only show dual category if there is more than one extruder 2016-09-07 17:31:45 +02:00
Jaime van Kessel
dfece53f3b Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-07 17:25:13 +02:00
Jaime van Kessel
5577ff03f6 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-09-07 17:20:11 +02:00