4679 Commits

Author SHA1 Message Date
Jaime van Kessel
c254737e25 Simplified the pause code
Now always follow the states of the remote (instead of using states that can get out of sync)

CURA-2060
2016-09-09 14:41:30 +02:00
Jaime van Kessel
f6c1a46d22 Remove commented out code
CURA-2234
2016-09-09 13:28:12 +02:00
Jaime van Kessel
c2341f7cd2 Upgrade profile function now returns empty list if something went wrong.
Fixes CURA-1493
2016-09-09 13:23:22 +02:00
Jaime van Kessel
f81a5fe301 Removed very annoying message spam
CURA-2159
2016-09-09 13:09:15 +02:00
Jaime van Kessel
677d6556fb Refuse to slice when material is mismatched
CURA-2271
2016-09-09 13:02:19 +02:00
Jaime van Kessel
2441275f29 Added message when incompatbile material is selected
CURA-2271
2016-09-09 12:57:50 +02:00
Jaime van Kessel
ec587eb0dd If a combination material does not like the setup, we now mark it in red.
CURA-2271
2016-09-09 11:59:55 +02:00
Jaime van Kessel
d68f6a4e9a Instead of discarding a profile if it's not compatible, we mark it as such.
The old approach was far to naive. We actually have 3 states;
- Supported (we have a profile)
- Not supported (Don't have a profile)
- Don't do this, lest you awaken the Old Gods (Error)

In case 1 and 3 we now do have a profile.

CURA-2271
2016-09-09 11:57:34 +02:00
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
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
fieldOfView
0828d4f1ca Fix dirty flag of incompatible_materials 2016-09-08 21:11:08 +02: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
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
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
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
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
30e08da8aa Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-07 17:19:49 +02:00
Jaime van Kessel
9a84deb14e If buildplate has errors, slicing is not possible
CURA-2234
2016-09-07 17:19:20 +02:00
Jaime van Kessel
35168ddd5a Prime tower disallowed area is now drawn seperate from others if it colissions with others
CURA-2234
2016-09-07 16:54:52 +02:00
fieldOfView
dc282dc263 Fix Per Model Settings crash when switching to multiextrusion printer
CURA-2228
2016-09-07 16:51:03 +02:00
fieldOfView
be0e010fd1 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-07 16:07:21 +02:00
fieldOfView
cab5f4d823 Fix "Reset all model transformations" for groups
CURA-2291
2016-09-07 16:06:42 +02:00
Ghostkeeper
b7c2a77277
Code style: Use double quotes for strings
Contributes to issue CURA-2252.
2016-09-07 15:59:14 +02:00
fieldOfView
15101ec53d Fix showing material options for 3rd party printers
CURA-2287
2016-09-07 15:52:44 +02:00
Jaime van Kessel
402f1cb8f9 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-07 15:46:30 +02:00
Jaime van Kessel
ee55e03911 Added max size to prime tower
CURA-2234
2016-09-07 15:46:12 +02:00
fieldOfView
20c9cb2547 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-07 15:38:39 +02:00
fieldOfView
a998d59693 Fix setting heated bed upgrade option
A new variant was created, but the property was set on the old variant.

CURA-2253
2016-09-07 15:38:27 +02:00