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
f321417d9e
Merge branch '2.5'
2017-03-10 16:03:38 +01:00
Tim Kuipers
5e782ae85b
fix: type fix for last commit (CURA-3440)
2017-03-10 16:03:23 +01:00
Tim Kuipers
0f6c47f467
Merge branch '2.5'
2017-03-10 16:00:57 +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
Jaime van Kessel
370f90db68
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-10 14:24:05 +01:00
Jaime van Kessel
1d7bf51152
Added confirmation message for starting new project
...
CURA-3494
2017-03-10 14:10:24 +01:00
Lipu Fei
c9d223acd4
CURA-3452 Save spool cost and weight upon change
2017-03-10 12:41:28 +01:00
Jaime van Kessel
66afc2a391
Added new project option
...
CURA-3494
2017-03-10 11:02:27 +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
Lipu Fei
e9ae531de2
CURA-3397 Set override profile preference option upon visibility change
2017-03-07 11:15:47 +01:00
Jack Ha
c10dc2f07c
Set old permissions back. CURA-3321
2017-03-07 10:36:30 +01:00
Jack Ha
42d939b34e
Solved merge conflict. CURA-3321
2017-03-07 10:34:53 +01:00
Jack Ha
3468bae732
Add result type.
2017-03-07 10:31:11 +01:00
Mark Burton
c9cdc40807
Merge remote-tracking branch 'upstream/master' into mb-combing-retract-before-outer-wall
2017-03-06 18:07:08 +00:00
Ghostkeeper
7a93d56f40
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-06 17:01:01 +01:00
Ghostkeeper
37e7971b81
Merge branch 'feature_temp_disable'
2017-03-06 16:51:59 +01:00
Jaime van Kessel
856562236e
Merge branch 'feature_CURA-3397_profile_override_dialog_options' of https://github.com/LipuFei/Cura
2017-03-06 16:17:48 +01:00
Tim Kuipers
38a9df9d76
fix: more lenient int-list validator parsing (CURA-3275)
...
allow for empty integers
allow the brackets to be omitted
2017-03-06 14:42:11 +01:00
fieldOfView
a0df6bf542
Jerry-rig single slider to replace dual slider design
2017-03-06 14:33:48 +01:00
Tim Kuipers
87c8ff0e08
Merge branch 'mb-infill-line-angles' of https://github.com/smartavionics/Cura into smartavionics-mb-infill-line-angles
2017-03-06 14:31:57 +01:00
Tim Kuipers
34d99b5ab3
Merge branch 'smartavionics-mb-anchor-skin-in-infill'
2017-03-06 13:45:46 +01:00
Tim Kuipers
aca2faa696
fix: combing_retract_before_outer_wall always causes retraction now (CURA-3438)
2017-03-06 12:56:27 +01:00
Tim Kuipers
8fa3be5bf8
Merge branch 'mb-combing-retract-before-outer-wall' of https://github.com/smartavionics/Cura into smartavionics-mb-combing-retract-before-outer-wall
2017-03-06 12:51:04 +01:00
Lipu Fei
1c15d24e5b
CURA-3397 Reduce tableView height to show buttons
2017-03-06 12:37:29 +01:00
Lipu Fei
c9254a3095
CURA-3397 Enable/disable "keep" and "discard" buttons according to the choice
2017-03-06 12:15:58 +01:00
Jack Ha
1c40c94c44
Fix compatibility options. CURA-3321
2017-03-06 11:55:39 +01:00
Ghostkeeper
44859210cc
Tweak bed adhesion settings
...
These settings are said to improve bed adhesion.
See https://github.com/Ultimaker/Cura/pull/1350#issuecomment-284247064
2017-03-06 11:13:20 +01:00
Tim Kuipers
4878a50b61
JSON refactor: skin expansion descriptions, defaults and new min_skin_angle_for_expansion settings (CURA-3440)
2017-03-03 14:50:46 +01:00
Jaime van Kessel
2f3998b9db
Fixed layout of discard dialog
2017-03-03 14:46:40 +01:00
Jaime van Kessel
419396cc16
Merge branch 'feature_CURA-3397_profile_override_dialog_options' of https://github.com/LipuFei/Cura
2017-03-03 14:43:42 +01:00
Lipu Fei
b65d950181
CURA-3397 Change headers in override profile table
2017-03-03 13:23:32 +01:00
Lipu Fei
67b57129ed
CURA-3397 Add options for profile override dialog
2017-03-03 13:23:32 +01:00
