Commit graph

7337 commits

Author SHA1 Message Date
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 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
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
9bd4d3c0a8 Update configuration mismatch dialog layout and wording
Also return to settings tab when not continuing with the print
CURA-2285
2016-09-08 11:26:01 +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
Thomas Karl Pietrowski
ce884b387b i18n: de: Adding translated comment
Adding german translation primary as example for CURA-570.
2016-09-08 00:36:01 +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
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
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
fieldOfView
89a83221cc Merge branch '2.3' 2016-09-07 15:51:41 +02:00
fieldOfView
c1f3d1944b Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-07 15:51:36 +02:00
fieldOfView
1737d6bb56 Fix showing material options for 3rd party printers
CURA-2287
2016-09-07 15:51:08 +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
304b958753 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-09-07 15:29:38 +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
Jaime van Kessel
7e12bcec7f Merge branch '2.3' of github.com:Ultimaker/JediWifiPrintingPlugin 2016-09-07 15:12:08 +02:00