Commit graph

3098 commits

Author SHA1 Message Date
Lipu Fei
a0f841e8eb Prevent MachineSettings dialog go beyond the top of screen 2017-03-23 13:46:01 +01:00
Lipu Fei
fa7dc3a708 Use onActivated for profile override combobox 2017-03-22 16:01:50 +01:00
Jack Ha
33d16f8601 Added Not Supported profiles when second extruder is a 0.8 nozzle. CURA-3555 2017-03-22 14:51:53 +01:00
Jack Ha
79ea09d616 Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5 2017-03-22 13:24:21 +01:00
Jack Ha
6dcd4d13e4 Removed quality profile aa0.8 PLA Not Supported. CURA-3555 2017-03-22 13:24:13 +01:00
Lipu Fei
f9e377ec43 Enable/disable Keep/Discard buttons according to selection 2017-03-22 13:07:58 +01:00
Jack Ha
40a7d2fecc Added not supported quality profiles. CURA-3555 2017-03-22 09:33:17 +01:00
Jaime van Kessel
0752c4440c Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5 2017-03-21 14:43:30 +01:00
Jaime van Kessel
5489fc8caf Added number of missing quality profiles
CURA-3555
2017-03-21 14:43:01 +01:00
Lipu Fei
8dbb1d47e1 Shrink the widht of profile override combobox 2017-03-21 11:14:55 +01:00
Lipu Fei
8f3e7c6fa5 More spacing for override profile combobox 2017-03-21 11:05:37 +01:00
Lipu Fei
555cd58f5e Save with code names for profile override preference
CURA-3561
2017-03-21 09:09:17 +01:00
Lipu Fei
8d6ea7bb97 Adjust Discard/Keep Profile Dialog size for high DPI 2017-03-20 11:30:05 +01:00
Tim Kuipers
35516ccc45 JSON fix: tetrehedral infill line distance was wrong (CURA-3474)
the infill line distance in the frontend is the average line distance, not the line distance between two lines which are equidistant
2017-03-17 15:05:01 +01:00
Jack Ha
aa691033e0 Added Not Supported profiles for incompatible materials. CURA-3510 2017-03-16 16:01:18 +01:00
Jaime van Kessel
efce0696bd Recently activated material can no longer be removed
CURA-3147
2017-03-16 13:11:51 +01:00
Jaime van Kessel
1f734d5245 Disabled the start_layers_at_same_position setting 2017-03-16 11:21:08 +01:00
Jaime van Kessel
6da6ae1b9e start_x and start_y are now settable per extruder 2017-03-16 11:19:44 +01:00
Jaime van Kessel
5bcfba0f17 Revert "removal: remove start_layers_at_same_position; it is now mandatory to start each layer near the given position (CURA-3339)"
This reverts commit 1482c27b21.
2017-03-16 11:16:55 +01:00
Jaime van Kessel
ad7752bb16 Revert "Updated version of superdraft and verydraft. CURA-3479"
This reverts commit 62de4f9ec6.
2017-03-16 11:16:02 +01:00
Jaime van Kessel
0c1829af1e Revert "Upgrade built-in instance containers"
This reverts commit b162be4df8.
2017-03-16 11:15:20 +01:00
jack
284e620da2 Merge pull request #1531 from Ultimaker/feature_version_upgrade_2.5
Version Upgrade 2.4 to 2.5
2017-03-14 16:05:43 +01:00
Jack Ha
62de4f9ec6 Updated version of superdraft and verydraft. CURA-3479 2017-03-14 13:09:07 +01:00
Lipu Fei
97b943736b Use translation for text in keep/discard profile dialog 2017-03-14 11:59:51 +01:00
Jack Ha
0a398738b7 Merge branch '2.5' into feature_version_upgrade_2.5 2017-03-14 11:18:14 +01:00
Jack Ha
d7e35fa480 Added global qualities for Superdraft and Verydraft. CURA-3510 2017-03-13 14:32:45 +01:00
Ghostkeeper
41e3336ea9
Merge branch 'feature_omp_writeGcode' into 2.5 2017-03-13 09:34:37 +01:00
Ghostkeeper
137de23221
Always prefer 0.4mm nozzles at initial loading
Otherwise we might end up with 0.8mm AA cores, and those don't have a normal quality profile so that gives all sorts of trouble.
2017-03-10 18:20:42 +01:00
Ghostkeeper
b162be4df8
Upgrade built-in instance containers
These are now upgraded to version 3, meaning that they will have to increase their version numbers and remove any start_layers_at_same_position settings they define. None of these profiles define any start_layers_at_same_position so it's just the version number then.

Contributes to issue CURA-3479.
2017-03-10 16:49:57 +01:00
Tim Kuipers
5e782ae85b fix: type fix for last commit (CURA-3440) 2017-03-10 16:03:23 +01:00
Tim Kuipers
b03ac3ea78 JSON fix: skin angle for expansion is max angle; better description (CURA-3440) 2017-03-10 15:59:47 +01:00
Lipu Fei
c9d223acd4 CURA-3452 Save spool cost and weight upon change 2017-03-10 12:41:28 +01:00
Ghostkeeper
039c1b92de
Add profiles for 0.8mm nozzle sizes 2017-03-09 18:11:06 +01:00
Lipu Fei
fa71f22bf6 CURA-3480 Fix boolean values for Cartesio config files 2017-03-09 14:14:05 +01:00
Lipu Fei
e67aecb041 CURA-3221 Translate column name "Default" 2017-03-08 15:36:11 +01:00
Tim Kuipers
e20b4ef179 Merge branch 'mb-combing-retract-before-outer-wall' of https://github.com/smartavionics/Cura into smartavionics-mb-combing-retract-before-outer-wall 2017-03-08 11:35:07 +01:00
Tim Kuipers
0f5f163fdf fix: prime tower thickness has rounding (CURA-3180) 2017-03-08 11:05:37 +01:00
jack
c154ce07f8 Merge pull request #1499 from LipuFei/feature_CURA-3397-override-profile-dialog
CURA-3397 Set override profile preference option upon visibility change
2017-03-08 10:32:14 +01:00
Mark Burton
5a7812b4b7 Rename combing_retract_before_outer_wall setting to travel_retract_before_outer_wall.
The forced retraction can now occur irrespective of whether combing is in use or not.
2017-03-08 09:30:58 +00:00
jack
4a68f25769 Merge pull request #1502 from LipuFei/feature_CURA-3221-improve-override-profile-dialog
CURA-3221 improve override profile dialog
2017-03-08 09:52:32 +01:00
Lipu Fei
a20fb7a479 Fix some coding style 2017-03-07 20:18:31 +01:00
jack
07e6da71d4 Merge pull request #1501 from Ultimaker/layer_view3_layout
Layer view3 layout: Single Slider by fieldOfView
2017-03-07 16:44:29 +01:00
Tim Kuipers
3047ff26f1 fix: min warning for skin angle (CURA-3440) 2017-03-07 13:09:30 +01:00
Lipu Fei
897791b0d2 CURA-3221 Use "system" font so texts fit in rows 2017-03-07 12:53:21 +01:00
Lipu Fei
adb37de51c Code style fixes 2017-03-07 12:53:20 +01:00
Lipu Fei
85bc79bde2 CURA-3221 Smaller settings column width for override profile dialog 2017-03-07 12:53:20 +01:00
Lipu Fei
d2c03b3554 CURA-3221 Larger window size for override profile dialog 2017-03-07 12:53:20 +01:00
Lipu Fei
9c5404401a CURA-3221 Remove star image 2017-03-07 12:53:20 +01:00
Lipu Fei
79de5eebb7 CURA-3221 Use "default" theme for description text 2017-03-07 12:53:20 +01:00
jack
3b1a15e1c4 Merge pull request #1495 from fieldOfView/feature_draggable_range_slider2
Use a single draggable range slider in Layerview
2017-03-07 11:43:17 +01:00