Jaime van Kessel
|
414337dead
|
Fixed 3mf writing
The type hinting changes also changed the way we handle certain imports, which caused saving to fail.
CURA-3215
|
2017-03-07 11:01:03 +01:00 |
|
Jack Ha
|
73dff09443
|
Travel moves now have a width of 0.1. CURA-3321
|
2017-03-07 10:47:34 +01:00 |
|
jack
|
340cf188a6
|
Merge pull request #1479 from Ultimaker/layer_view3_layout
Layer view layout
|
2017-03-07 10:41:36 +01:00 |
|
Jack Ha
|
efbc624ea8
|
More defensive setExtruderOpacity, removed unnecessary part. CURA-3321
|
2017-03-07 10:40:59 +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 |
|
fieldOfView
|
34ac02f5bd
|
Use Pointing Rectangle for layer number indicator
|
2017-03-06 18:23:08 +01:00 |
|
fieldOfView
|
2b49484dc7
|
Hide the slider controls when there are no layers
(and code cleanup)
|
2017-03-06 17:46:42 +01:00 |
|
fieldOfView
|
af265be900
|
Add up/down key navigation to layernum box
|
2017-03-06 17:27:37 +01:00 |
|
Arjen Hiemstra
|
8a77dd66fc
|
Properly handle CMake options that are enabled but not "ON"
Contributes to CURA-2787
|
2017-03-06 17:26:02 +01:00 |
|
fieldOfView
|
65d721cc1d
|
Merge branch 'layer_view3_layout' into feature_draggable_range_slider2
# Conflicts:
# plugins/LayerView/LayerView.qml
|
2017-03-06 17:19:44 +01:00 |
|
fieldOfView
|
d0c8b05314
|
Fix setting central value
|
2017-03-06 17:16:36 +01:00 |
|
Ghostkeeper
|
d1fada78e6
|
Merge branch '3mf_speedup'
|
2017-03-06 17:03:42 +01: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 |
|
fieldOfView
|
0fa32c3c16
|
Step by 10 layers with shift key down
|
2017-03-06 16:48:59 +01:00 |
|
fieldOfView
|
a6bc2b07f8
|
Fix setting lower value
|
2017-03-06 16:35:00 +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 |
|
Jaime van Kessel
|
04c2186b74
|
Merge branch 'master' of github.com:Ultimaker/Cura
|
2017-03-06 16:17:30 +01:00 |
|
fieldOfView
|
a664ee88b7
|
Fix setting upper value
|
2017-03-06 16:01:00 +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 |
|
Jaime van Kessel
|
d459f8bf63
|
Merge branch 'master' of github.com:Ultimaker/Cura
|
2017-03-06 14:42:10 +01:00 |
|
Jaime van Kessel
|
356d4f9288
|
Heated bed timeout time now hides correctly if time ran out
CURA-3360
|
2017-03-06 14:41:33 +01:00 |
|
fieldOfView
|
694da25bb7
|
Show proper values of the active handle of the slider
|
2017-03-06 14:35:36 +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 |
|
Jack Ha
|
b2e06bed37
|
Fix 'inverting slider' when switching between Layer view and a different view. CURA-3321
|
2017-03-06 14:03:42 +01:00 |
|
Tim Kuipers
|
34d99b5ab3
|
Merge branch 'smartavionics-mb-anchor-skin-in-infill'
|
2017-03-06 13:45:46 +01:00 |
|
Jack Ha
|
1f61017946
|
Fix updateLegend function. CURA-3321
|
2017-03-06 13:20:14 +01:00 |
|
Tim Kuipers
|
7477022102
|
Merge branch 'mb-anchor-skin-in-infill' of https://github.com/smartavionics/Cura into smartavionics-mb-anchor-skin-in-infill
|
2017-03-06 13:19:04 +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 |
|
Jaime van Kessel
|
f205028509
|
Merge pull request #1491 from probonopd/patch-2
Add WirelessPrinting Plugin
|
2017-03-06 10:25:19 +01:00 |
|
probonopd
|
e05236ed72
|
Add WirelessPrinting Plugin
|
2017-03-05 14:16:36 +01:00 |
|
Tim Kuipers
|
396198797e
|
JSON refactor: skin expansion descriptions, defaults and new min_skin_angle_for_expansion settings (CURA-3440)
|
2017-03-03 14:26:33 +00:00 |
|
Tim Kuipers
|
e5090f70aa
|
JSON fix: only enable skin expansion settings when we have it enabled (CURA-3440)
|
2017-03-03 14:26:26 +00:00 |
|
Tim Kuipers
|
016a25ce35
|
JSON fix: don't expand bottom skins by default (CURA-3440)
|
2017-03-03 14:26:17 +00:00 |
|
Tim Kuipers
|
54c1c995ed
|
JSON fix: moved expand_skins_expand_distance and min_skin_width_for_expansion out of illegitimate parent (CURA-3440)
|
2017-03-03 14:26:08 +00: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 |
|
Lipu Fei
|
7997ae55ea
|
CURA-3397 Make discard button default
|
2017-03-03 13:19:56 +01:00 |
|