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
Tim Kuipers
a7e08f10a4
JSON fix: only enable skin expansion settings when we have it enabled (CURA-3440)
2017-03-03 12:41:54 +01:00
Tim Kuipers
5550dbf53f
JSON fix: don't expand bottom skins by default (CURA-3440)
2017-03-03 12:41:14 +01:00
Tim Kuipers
3a92bf73a8
JSON fix: moved expand_skins_expand_distance and min_skin_width_for_expansion out of illegitimate parent (CURA-3440)
2017-03-03 12:37:06 +01:00
Tim Kuipers
ca9c32c0aa
Merge branch 'mb-anchor-skin-in-infill' of https://github.com/smartavionics/Cura into smartavionics-mb-anchor-skin-in-infill
2017-03-03 12:15:44 +01:00
Jaime van Kessel
4514f53ea4
Formulas are no longer shown in discard changes dialog
...
CURA-3221
2017-03-03 10:22:06 +01:00
Jaime van Kessel
cd9a8dbca5
Listbox now scales with window
...
CURA-3221
2017-03-03 10:19:53 +01:00
Jaime van Kessel
8e4f650746
Added a tiny bit of spacing between machine action buttons
2017-03-03 09:47:58 +01:00
Jaime van Kessel
433d45cdae
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-02 17:11:44 +01:00
Jaime van Kessel
87336c4c01
Fixed exception for clean start
2017-03-02 17:11:33 +01:00
Jaime van Kessel
bae7af1ea0
Dots in the ID no longer confuse workspace reader
...
CURA-3450
2017-03-02 17:06:10 +01:00
Jack Ha
e89b1afa2c
Initial layer view color mode -> legend. CURA-3321
2017-03-02 16:55:54 +01:00
Jack Ha
bedb41b6d3
SliceInfo now only sends sliceable model hashes (layer data was also sent)
2017-03-02 16:44:40 +01:00
Jack Ha
d04e630497
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-02 16:38:45 +01:00
Jack Ha
1029fb4ddd
Not to trigger reslice happy anymore, only retrigger if necessary. Also using isSliceable instead of property check when inspecting root node. CURA-3413 CURA-3412
2017-03-02 16:38:31 +01:00
Ghostkeeper
c0b4d43995
Add hotkey for reload all models
...
Small change. I can't be bothered to make an issue for this.
2017-03-02 15:42:57 +01:00
U-ULTIMAKER\j.ha
30eca943d0
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-02 13:15:43 +01:00
U-ULTIMAKER\j.ha
c54d5ce707
Fixed compatibility mode active extruder. CURA-3321
2017-03-02 13:15:29 +01:00
Simon Edwards
3e4ee0639c
Fixed case of the button text.
...
CURA-3398
2017-03-02 11:46:28 +01:00
Ghostkeeper
d372e73eda
Adjust warning values for temperatures
...
We know that some printers (e.g. UM3) are able to reach at least 285 degrees so we set that to be our warning value now.
The warning value for the bed temperature was probably mixed up with the warning value for nozzle temperature. Fixed that too.
2017-03-02 10:36:19 +01:00
Mark Burton
aef39991a2
Disable infill_angles setting when infill_pattern is concentric, concentric_3d or cubicsubdiv.
2017-03-02 07:47:41 +00:00
Mark Burton
d6bed392e4
Disable skin_angles setting when top_bottom_pattern is concentric.
2017-03-02 07:46:55 +00:00
Mark Burton
c0fc8287c0
Rename expand_skins_shrink_distance setting to min_skin_width_for_expansion.
2017-03-01 14:47:56 +00:00
Mark Burton
9555a64ab1
Merge remote-tracking branch 'upstream/master' into mb-anchor-skin-in-infill
2017-03-01 14:24:21 +00:00
Jaime van Kessel
94a8da8823
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-01 15:15:27 +01:00
Jack Ha
bdd07bd160
Removed commented out stuff. CURA-3321
2017-03-01 14:54:12 +01:00
Ghostkeeper
7658939198
Make initial layer print temperature dependent on actual printing temperature
...
Otherwise when you change the print temperatures the initial print temperature doesn't change along.
Contributes to issue CURA-3433.
2017-03-01 14:52:03 +01:00
Jack Ha
f9a5dc885c
Solved merge conflicts #1479 CURA-3321
2017-03-01 14:47:54 +01:00
Jaime van Kessel
0bf0b29a50
Added Create new profile button to Discard or keep profile changes dialog
...
CURA-3398
2017-03-01 14:42:18 +01:00
Ghostkeeper
4eca62370d
Normalise print temperature so that normal quality is at default temperature
...
All print temperatures go down 5 degrees and then in the material profile the temperature is increased by 5. This gives the normal profile a +0 instead of +5.
Contributes to issue CURA-3433.
2017-03-01 14:33:55 +01:00
