14353 Commits

Author SHA1 Message Date
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
Tim Kuipers
4d5ac40bb2 Merge branch 'master' into feature_spaghetti_infill 2017-02-27 13:20:25 +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
MaukCC
d4f4ada2f0
Update cartesio_0.4.inst.cfg 2017-02-24 12:39:15 +01:00
MaukCC
c96e23e51c
Update cartesio_0.4.inst.cfg 2017-02-24 12:39:14 +01:00
MaukCC
047a078fb1
Update cartesio_0.25.inst.cfg 2017-02-24 12:39:14 +01:00
MaukCC
f123aec8bd
Update cartesio_0.25.inst.cfg 2017-02-24 12:39:14 +01:00
MaukCC
cadbecd1d1
Update cartesio_0.4.inst.cfg 2017-02-24 12:39:14 +01:00
MaukCC
2f9cbd38e9
Update cartesio_extruder_0.def.json 2017-02-24 12:39:14 +01:00
MaukCC
58c50a7022
Update cartesio_extruder_0.def.json 2017-02-24 12:39:14 +01:00
MaukCC
596fcc09b4
Update cartesio_extruder_0.def.json 2017-02-24 12:39:14 +01:00
MaukCC
39f6314395
Update cartesio_extruder_1.def.json 2017-02-24 12:39:13 +01:00
MaukCC
e5442bbe9e
Update cartesio_extruder_3.def.json 2017-02-24 12:39:13 +01:00
MaukCC
c7b7ec9723
Update cartesio_extruder_2.def.json 2017-02-24 12:39:13 +01:00
MaukCC
0c0f5c7e57
Update cartesio_extruder_1.def.json 2017-02-24 12:39:13 +01:00
MaukCC
a11ef02468
Update cartesio_extruder_0.def.json 2017-02-24 12:39:13 +01:00
MaukCC
67d3e59ea4
Update cartesio_extruder_0.def.json 2017-02-24 12:39:13 +01:00