3125 Commits

Author SHA1 Message Date
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
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
Jack Ha
e89b1afa2c Initial layer view color mode -> legend. CURA-3321 2017-03-02 16:55:54 +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
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
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
Ghostkeeper
9f38ae5b68
Add material_print_temperature back into profiles
The optimisation script didn't know that the temperature settings in material profiles now refers to default_material_print_temperature rather than material_print_temperature. This caused a few things to go wrong here.

Contributes to issue CURA-3433.
2017-03-01 14:30:48 +01:00
Ghostkeeper
3f059ff1d4
Reduce code duplication
It stays unreadable though, because of JSON.

Contributes to issue CURA-3405.
2017-03-01 14:08:33 +01:00
jack
fee73c352c Merge pull request #1481 from Ultimaker/feature_override_profile
Feature override profile
2017-03-01 13:52:05 +01:00
Ghostkeeper
17e1fdf7a6
Increase warning temperature for initial layer as well
It was already changed for normal printing temperature.

Contributes to issue CURA-3433.
2017-03-01 13:25:16 +01:00
Jaime van Kessel
a1281bc019 Clarified some of the text in the discard dialog
CURA-3221
2017-03-01 11:33:03 +01:00
Ghostkeeper
de7e1247e3
Merge branch 'VertexK8400Defs' of https://github.com/tbackdahl/Cura into tbackdahl-VertexK8400Defs 2017-03-01 10:44:03 +01:00
Ghostkeeper
82b2bc13e2
Don't cool bed if there is no heated bed
Makes the line a bit unusable, but it was already unusable, really.

Contributes to issue CURA-3405.
2017-03-01 09:48:53 +01:00
Jack Ha
212a2bc4f3 Removed unused theme element. CURA-3321 2017-02-28 14:47:25 +01:00
Jack Ha
f22299c80d Added option for show_travels in compatibility mode top layers. CURA-3321 2017-02-28 14:43:46 +01:00
Tim Kuipers
cae40da7aa JSON fix: put material_print_temperature_layer_0 back to normal print temp for all machines other than UM3 family (CURA-3359) 2017-02-28 14:23:46 +01:00
Jaime van Kessel
af21146fef Layout improvements
CURA-3221
2017-02-28 14:07:12 +01:00
Jaime van Kessel
4d7133610d Updated layout of dialog
CURA-3221
2017-02-28 13:38:15 +01:00
Jaime van Kessel
85b58c9296 Pressing the discard button now actually discards the changes
CURA-3221
2017-02-28 12:35:08 +01:00
Jack Ha
27f013fd81 Cleanup layout, finalizing 2017-02-28 11:52:51 +01:00
Jaime van Kessel
2462699982 Switching profiles now shows a new dialog with all the changes.
CURA-3221
2017-02-28 10:25:42 +01:00
Jack Ha
8b7aee1664 Adjusted menu, added View Mode: Layers. CURA-3321 2017-02-27 14:16:56 +01:00
Jack Ha
fa1b332733 Moved layer view menu to left, next to sliders. CURA-3321 2017-02-27 14:06:17 +01:00
Thomas Bäckdahl
6f9fe60a6c Velleman Vertex K8400 single and dual head
Definition files for single and dual head versions of Velleman Vertex
K8400 printer.
The machine uses printable coordinates x=0 to 200, y=20 to 200 and
parking position 200, 200 regardless of how many extruders you use.
Thereby the different machine_width for the two models.
The g-code can probably be improved.
USB connection not successful this far.
2017-02-24 20:57:46 +01:00
Ghostkeeper
537de489bf
Fix optimising CPE+, PC and TPU profiles
These materials are hard-coded in the optimisation script, so the optimisation script didn't know that those materials were materials and this caused a chain reaction where in the end the profile could only override XML-settings.
2017-02-24 14:12:32 +01:00
MaukCC
e80ac13615
Update cartesio_0.8.inst.cfg 2017-02-24 12:39:16 +01:00
MaukCC
93e800bae7
Update cartesio_extruder_0.def.json 2017-02-24 12:39:16 +01:00
MaukCC
d0124dafd8
Update cartesio_0.25.inst.cfg 2017-02-24 12:39:16 +01:00
MaukCC
5a06dc5e2f
Update cartesio_0.4.inst.cfg 2017-02-24 12:39:16 +01:00
MaukCC
b9b7df1593
Update cartesio_0.8.inst.cfg 2017-02-24 12:39:15 +01:00
MaukCC
94ab027499
Update cartesio_0.8.inst.cfg 2017-02-24 12:39:15 +01:00
MaukCC
cb9e8b57de
Update cartesio_0.25.inst.cfg 2017-02-24 12:39:15 +01:00
MaukCC
40f48f7825
Update cartesio_0.4.inst.cfg 2017-02-24 12:39:15 +01:00
MaukCC
a4c65fda67
Update cartesio_0.8.inst.cfg 2017-02-24 12:39:15 +01:00
MaukCC
2ba70c8453
Update cartesio_0.8.inst.cfg 2017-02-24 12:39:15 +01:00
MaukCC
264b488b31
Update cartesio_0.25.inst.cfg 2017-02-24 12:39:15 +01:00