Commit graph

4657 commits

Author SHA1 Message Date
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 46942d7cf2.

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
Jaime van Kessel
3457b94f65 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-07 15:29:26 +02:00
Jaime van Kessel
bbb211b0f6 Saving profile to g-code with empty container no longer results in empty string 2016-09-07 15:28:58 +02:00
fieldOfView
bf394a42d5 Fix UMO-DualExtrusion prime tower location
CURA-2283
2016-09-07 15:26:51 +02:00
fieldOfView
8c2a8944e8 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-07 13:57:21 +02:00
fieldOfView
fe34938bce Update wording 2016-09-07 13:57:09 +02:00
Simon Edwards
cce94c8043 Added skin_overlap <= infill_overlap mapping.
Contributes to CURA-844 Profile converter 2.1 ==> 2.2
2016-09-07 11:32:25 +02:00
Simon Edwards
86369ce1da Profile import now supports 2.1 profiles and does any needed conversion work.
Contributes to CURA-2252 Import ini profile fails in 2.3
2016-09-07 11:13:25 +02:00
Jaime van Kessel
1bafac94bd Value functions are now correcty copied when using per-object settings
CURA-2224
2016-09-07 09:55:22 +02:00
Jaime van Kessel
17d8c1e9c1 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-07 09:21:53 +02:00
Jaime van Kessel
e010c90c43 No longer set move_vector when we don't have to 2016-09-07 09:21:19 +02:00
fieldOfView
a52bb1422b Suggest unique name when creating/duplicating profiles
CURA-2161
2016-09-06 17:46:11 +02:00
fieldOfView
68ddf90d58 Make behavior of Create Profile consistent between prefs and menu
CURA-2161
2016-09-06 15:39:44 +02:00
fieldOfView
a40476eb62 Add distinctive titles to profile rename dialogs
CURA-2161
2016-09-06 15:38:27 +02:00
fieldOfView
7a6124f221 Get the overhang angle from the proper multiextrusion stack
CURA-2289
2016-09-06 14:58:29 +02:00
fieldOfView
291406fef2 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-06 13:07:36 +02:00
fieldOfView
fc6e92e10f Fix uploading custom firmware on windows
The simple string replacement left an extraneous "/" in front of the path, which Windows can't handle. QUrl.toLocalFile() does a proper conversion.

CURA-955
2016-09-06 13:07:15 +02:00
Jaime van Kessel
1999e587b6 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-06 11:43:27 +02:00
Jaime van Kessel
75c1f12d33 If a group node is outside build area, all it's children are also marked as such
CURA-403
2016-09-06 11:42:46 +02:00
fieldOfView
dc01cdbc88 Fix displaying support interface in layerview
CURA-2049
2016-09-06 11:30:38 +02:00
fieldOfView
eb3cfd47cd Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-06 11:22:20 +02:00
Ghostkeeper
7c8e80b751
Properly hide moves and retractions in lower layers
Not the neatest solution. We might want to make a preference for this? I sorta like to see those travel moves, actually.

Contributes to issue CURA-2049.
2016-09-06 11:21:48 +02:00
fieldOfView
edd9643703 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-06 10:56:38 +02:00