3125 Commits

Author SHA1 Message Date
Ghostkeeper
e1b4379c74
Add park distance setting
As a result, the description of the other two settings no longer needs to mention that it is used by the park distance.

Contributes to issue CURA-2795.
2016-12-06 16:01:08 +01:00
Jack Ha
b120cba148 Better colors. CURA-2763 2016-12-06 15:56:20 +01:00
Jack Ha
30a74fb2c1 Layout changes, extruders are now displayed as extruder tabs. CURA-2763 2016-12-06 15:49:34 +01:00
Jack Ha
a65a81e60b colours 2016-12-06 14:14:24 +01:00
Jack Ha
ed7ec58822 Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-06 11:52:14 +01:00
Jack Ha
64c0cbd0a4 Fix clean config cura, recommended mode support extruder update. CURA-3033 2016-12-06 11:48:49 +01:00
Tim Kuipers
f4979be5cb JSON fix: description of speed_travel_layer_0 now includes explanation of inheritance function (CURA-3066) 2016-12-06 11:48:04 +01:00
Jaime van Kessel
5aa394b197 Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-06 11:39:37 +01:00
Jaime van Kessel
58e7e6ef5a Added default_printing_temperature property
CURA-2586
2016-12-06 11:38:56 +01:00
Ghostkeeper
2f790c12b8
Expand description of heat zone with implementation details
It is used to move filament in parking position when an extruder is not used any more.

Contributes to issue CURA-2795.
2016-12-06 08:58:19 +01:00
Ghostkeeper
1932a95ded
Expand description of cool zone setting
It is apparently desirable to have more implementation detail in here.

Contributes to issue CURA-2795.
2016-12-06 08:55:06 +01:00
Jaime van Kessel
adb1cc7933 Merge branch 'recommended_sidebar' of github.com:Ultimaker/Cura 2016-12-05 14:02:51 +01:00
Ghostkeeper
1c14c8e2c5 Add cool zone length setting
This setting can vary from cartridge to cartridge and between machines.

Contributes to issue CURA-2795.
2016-12-05 13:20:43 +01:00
Ghostkeeper
96bca5e297 Fix spelling of heat zone length description
Not user visible, but eh.
2016-12-05 13:20:43 +01:00
Tim Kuipers
0e7223bd30 JSON fix: set user specified z seam position at back by default 2016-12-05 12:50:45 +01:00
Jaime van Kessel
8f023524d2 Small textual changes for project handling
CURA-1263
2016-12-05 11:44:42 +01:00
SAMSECTOR
c4a39443cb
Minor starting code new line fix 2016-12-05 09:27:35 +01:00
Jaime van Kessel
c50d0172cc Moved open project to below open recent
CURA-1263
2016-12-02 13:33:13 +01:00
Jaime van Kessel
ea0cbec691 Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-02 11:13:45 +01:00
Jaime van Kessel
5119ee9a93 Use correct descriptor for project open
CURA-1263
2016-12-02 11:13:21 +01:00
Ghostkeeper
53ab4955df
Set initial bed temperature to be equal to normal
By default. Update from the materials team.
2016-12-02 11:05:54 +01:00
Jaime van Kessel
4cf454757f Change import & export back to save & open
CURA-1263
2016-12-02 10:43:02 +01:00
Jack Ha
8c5d97f6a0 Removed log. CURA-2767 2016-12-01 14:52:40 +01:00
Jack Ha
8ff233871f Fixed typo. CURA-2767 2016-12-01 14:51:41 +01:00
Jack Ha
14701d89d0 Finally got edge cases regarding recommended mode support extruder color working. CURA-2767 2016-12-01 14:50:40 +01:00
Jack Ha
23f7a91b40 Merge branch 'master' into recommended_sidebar 2016-12-01 14:10:06 +01:00
Jack Ha
1972e59713 Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-01 14:06:34 +01:00
Jack Ha
2924d2bf71 Fix color update in extruder comboboxes. CURA-3033 2016-12-01 14:06:17 +01:00
Jack Ha
4cd940cc5e Merge branch 'master' into recommended_sidebar 2016-12-01 11:34:41 +01:00
Jack Ha
ef6e90283e Added color to recommended view support extruder by adding combobox_color style. CURA-2767 2016-12-01 11:34:37 +01:00
Ghostkeeper
1035526185
Merge branch 'samirabaza-master' 2016-12-01 10:56:03 +01:00
Ghostkeeper
b94027ffef Merge branch 'master' of https://github.com/samirabaza/Cura into samirabaza-master 2016-12-01 10:55:44 +01:00
SAMSECTOR
1ea4441148 Update printrbot_simple_extended.def.json
added platform offset 
"platform_offset": [0, -0.3, 0],
2016-12-01 08:22:31 +03:00
Ghostkeeper
f6422769b5
Merge branch 'feature_z_seam_location' 2016-11-30 16:34:50 +01:00
Tim Kuipers
1305b51806 JSON fix: multiple_mesh_overlap description was clumsy (CURA-2444) 2016-11-30 16:29:06 +01:00
Tim Kuipers
8da058d95d JSON fix: description of z_seam_type still mentioned 'Back' (CURA-1461) 2016-11-30 16:25:40 +01:00
Jaime van Kessel
d08c1b73bf Fixed export profile derp
CURA-1263
2016-11-30 13:13:47 +01:00
Jaime van Kessel
86019c2df0 Renamed load&save workspace to import&export project
CURA-1263
2016-11-30 12:59:09 +01:00
Jack Ha
c27219b1c4 Merge branch 'master' into recommended_sidebar 2016-11-30 12:36:46 +01:00
Ghostkeeper
db2ee920ce Merge branch 'master' of https://github.com/samirabaza/Cura into samirabaza-master 2016-11-30 11:09:56 +01:00
Tim Kuipers
b8ff7acb68 JSON fix: initial fan speed zero by default (CURA-3068) 2016-11-30 10:27:53 +01:00
Tim Kuipers
09e884fd92 JSON refactor: moved Initial Fan Speed out of the children of Fan Speed (CURA-3068)
we don't want it to inherit from Fan Speed, but children must always inherit from their parent.
2016-11-30 10:27:53 +01:00
Jaime van Kessel
477ffe12aa Merge branch 'feature_polar' of https://github.com/fieldOfView/Cura 2016-11-30 09:13:05 +01:00
SAMSECTOR
edd76cd9ab Update printrbot_simple_extended.def.json 2016-11-30 10:27:31 +03:00
Tim Kuipers
e60f05c2fd JSON fix: limit_to_extruder for support_conical_enabled (CURA-2896) 2016-11-29 17:54:01 +01:00
Tim Kuipers
383eba9930 JSON refactor: multiple_mesh_overlap: Objects ==> Meshes (CURA-2444) 2016-11-29 17:50:01 +01:00
Tim Kuipers
32a102a9e7 JSON refactor: move multiple_mesh_overlap to meshfixes category (CURA-2444) 2016-11-29 17:50:01 +01:00
Tim Kuipers
50a61e56f7 JSON refactor: Dual Extrusion Overlap => Merged Objects Overlap (CURA-2444) 2016-11-29 17:50:01 +01:00
Jaime van Kessel
292d075a03 Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-29 15:41:46 +01:00
Jaime van Kessel
06a9b69dc9 Merge branch 'feature_recursive_cubic' of github.com:Ultimaker/Cura 2016-11-29 15:16:25 +01:00