4678 Commits

Author SHA1 Message Date
Tim Kuipers
401e302ad5 Merge branch 'master' into feature_support_bottoms 2016-08-02 12:46:44 +02:00
Tim Kuipers
dc3d22f148 JSON: disabled flow temp again (CURA-1174) 2016-08-02 11:48:47 +02:00
fieldOfView
a2fa8246b6 Disable UM2 material-related settings depending on gcode flavor...
...instead of hardcoding them as disabled.

The fdmprinter inheritance-functions for "enabled" are combined with a check for the flavor. This way it will be easier to switch an UM2 to a functional Reprap flavor in a variant. CURA-580
2016-08-02 09:50:42 +02:00
fieldOfView
42fc25ab09 Move sorting of DefinitionContainerModel out of qml
Add printer dialog now has sections by a configurable metadata property. A prefered section is set to always show on top.
Add weights to the Ultimaker printer definitions to create a sensible list (newest on top).

CURA-1593
2016-08-01 19:18:56 +02:00
Ghostkeeper
e7452cd644
Make speed_layer_0 and cousin settings not per-mesh
Fixed up some of the settable_per stuff.

Contributes to issue CURA-1507.
2016-08-01 16:35:48 +02:00
Ghostkeeper
dc6482853a
Split acceleration_layer_0 and jerk_layer_0 into print/travel
Exactly the same as how it's done with speed_layer_0.

Contributes to issue CURA-1507.
2016-08-01 14:15:11 +02:00
Ghostkeeper
4adadd86eb
Fix defaults of some settings
It was saying 'default' instead of 'default_value'. Must've been translated wrong from 2.1.
2016-08-01 14:15:11 +02:00
fieldOfView
228f5be35a Fix order of machine actions on manage printers page
MachineActionManager now uses lists instead of dicts because dicts don't maintain the order.
2016-07-29 17:14:18 +02:00
fieldOfView
0a75aa7496 Fix category of PrintrBot simple definition
CURA-1593
2016-07-29 16:40:58 +02:00
Tim Kuipers
4b192db1bf JSON: extruders cannot be more than 16 (CuraEngine hardcoded value) (CURA-2015) 2016-07-28 20:16:44 +02:00
Tim Kuipers
27f160c220 JSON fix: made retraction_hop_only_when_collides and retraction_hop not children of retraction_hop_enabled
retraction_hop_enabled was used by the engine, so it should never become disabled
2016-07-28 19:52:43 +02:00
Tim Kuipers
34ac8cf66f Merge branch 'feature_first_layer_travel_speed' 2016-07-28 17:05:07 +02:00
Tim Kuipers
20b96b4716 Merge branch 'master' into feature_first_layer_travel_speed 2016-07-28 16:48:42 +02:00
Tim Kuipers
1f903b9fcc JSON renames: support_roof_... ==> support_interface... (CURA-1013) 2016-07-28 14:06:00 +02:00
Tim Kuipers
2ab9531f83 Merge branch 'master' into feature_support_bottoms 2016-07-28 13:53:43 +02:00
Ghostkeeper
40932a3ad2
Set default of draft shield height to 10mm
This is a fairly arbitrary default until we have tests from materials. The draft shield height is now only used by the engine if the draft shield is enabled and limited.

Contributes to issue CURA-1295.
2016-07-28 13:33:27 +02:00
Ghostkeeper
6af0f28f32
Only show draft shield height if draft shield enabled
We must've missed that one previously.

Contributes to issue CURA-1295.
2016-07-27 17:50:34 +02:00
Tim Kuipers
d1f4fadbfc Merge branch 'master' into feature_support_bottoms 2016-07-27 17:40:36 +02:00
Tim Kuipers
cd26794155 JSON fix: retrieve globalish support settings from support extruder (CURA-2003) 2016-07-27 17:27:57 +02:00
Jack Ha
4175e51dbb Corrected gantry height for ultimaker2.json (extended and go inherit).
CURA-1979

Made same change in resources/definitions/ultimaker2.def.json as in
the original resources/machines/ultimaker2.json
2016-07-27 14:10:01 +02:00
Tim Kuipers
358a48dfbb JSON fix: support_bottom_height now warns if below support_bottom_stair_step_dist (CURA-1013) 2016-07-27 12:14:25 +02:00
Ghostkeeper
5da3cd34e9
Improve inheritance function for speed_travel_layer_0
This makes the speed_travel_layer_0 by default have the same ratio to the parent print speed as the travel speed has on other layers.
2016-07-27 10:56:13 +02:00
Tim Kuipers
17b455d2ed JSON rename: Support Roof ==> Support Interface (CURA-1013)
the support roof settings are now used for support bottoms as well
2016-07-27 10:34:41 +02:00
Tim Kuipers
f4698c7cd4 feat: support_bottom_height and support_interface_height (CURA-1013) 2016-07-27 10:18:19 +02:00
fieldOfView
4014cb11f9 Reinstate UMO wizard
CURA-1732
2016-07-25 18:00:17 +02:00
Tim Kuipers
6b3a25a491 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-25 14:50:11 +02:00
Tim Kuipers
59e8525855 JSON fix: flow temp graph reenabled (CURA-1174) 2016-07-25 14:50:05 +02:00
Jaime van Kessel
6883747671 Merge branch 'feature_remove_global_tab' of github.com:Ultimaker/Cura 2016-07-25 10:47:52 +02:00
Ghostkeeper
4e9bfc6573
Display some skirt/brim settings if skirt/brim enabled
Some needed to be updated because they concern both skirt and brim. Others missed the check entirely.

Contributes to issue CURA-1678.
2016-07-22 17:23:03 +02:00
Ghostkeeper
54685e8898
Rename setting skirt_minimal_length to skirt_brim_minimal_length
Also updated the description and made it a bit more accurate. Because this concerns not only the skirt, but also the brim.

Contributes to issue CURA-1678.
2016-07-22 17:12:34 +02:00
Ghostkeeper
d4f96ab62d
Rename setting skirt_line_width to skirt_brim_line_width
Also updated the description. Because this concerns not only the skirt, but also the brim.

Contributes to issue CURA-1678.
2016-07-22 17:00:30 +02:00
Ghostkeeper
5e2f1688b4
Rename setting jerk_skirt to jerk_skirt_brim
Because it concerns not only the skirt, but also the brim.

Contributes to issue CURA-1678.
2016-07-22 16:53:41 +02:00
Ghostkeeper
23f643aabc
Rename setting acceleration_skirt to acceleration_skirt_brim
Also updated the description. Because this concerns not only the skirt, but also the brim.

Contributes to issue CURA-1678.
2016-07-22 16:49:31 +02:00
Ghostkeeper
cb4c1fd08c
Rename skirt_speed to skirt_brim_speed
Also updated the description. Because this concerns not only the skirt, but also the brim.

Contributes to issue CURA-1678.
2016-07-22 16:45:11 +02:00
Jaime van Kessel
fa61a9e3f0 Removed bunch of unneeded global inheritance stuff
CURA-1758
2016-07-22 14:04:35 +02:00
Jaime van Kessel
7e48b6ad4c Removed global_inherit_stack from support enable and support type
CURA-1758
2016-07-22 09:03:14 +02:00
fieldOfView
64c870a3cf Disable setting support_enable per extruder
This prevents a lot of confusion with setting the support_extruder_nr to an extruder which then has support_enable set to False (resulting in no support). It is still possible to print some objects with no support using the Per Object Settings tool.

CURA-1758
2016-07-21 15:12:26 +02:00
fieldOfView
8537c5a0e2 Introduce a property that says which extruder the global stack should get its value from.
CURA-1758
2016-07-21 15:12:24 +02:00
Ghostkeeper
4295a85f6a
Split Initial Layer Speed in two
It's now two settings: Initial Layer Print Speed (for the extrusion moves) and Initial Layer Travel Speed (for the non-extrusion moves).

Contributes to issue CURA-1507.
2016-07-20 10:53:04 +02:00
Jaime van Kessel
aed033674f Changed some warnings into errors
CURA-1706
2016-07-20 09:39:19 +02:00
Tim Kuipers
44de859916 JSON fix: made gradual infill step max depend on infill line distance (CURA-836) 2016-07-19 13:16:15 +02:00
Tim Kuipers
47fcec8271 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-18 14:27:25 +02:00
Tim Kuipers
f079d83705 Merge branch 'feature_gradual_infill' 2016-07-18 14:27:12 +02:00
Jaime van Kessel
48d39ce387 material_guid is now also a setting in fdmprinter
CURA-1836
2016-07-18 11:46:12 +02:00
Tim Kuipers
8029139358 JSON fix: making max gradual infill steps lower to allow for engine not crashing when setting the infill to a low percentage (CURA-836) 2016-07-15 13:54:56 +02:00
Tim Kuipers
a52095df0e JSON fix: disabled prime location by default (CURA-1816) 2016-07-15 13:32:43 +02:00
Tim Kuipers
942539981b JSON fix: moved prime location to category platform_adhesion (CURA-1816) 2016-07-15 13:30:17 +02:00
Tim Kuipers
026fd3e2dd feat: tetrahedral infill (CURA-1925) 2016-07-15 12:57:37 +02:00
Tim Kuipers
42d400d436 JSON feat: cubic isometric infill (CURA-1723) 2016-07-15 12:52:33 +02:00
Tim Kuipers
29457ab11f JSON fix: support roof extruder could be chosen even when roofs weren't enabled (CURA-1723)
just putting this commit under that issue so that it will be reviewed...
2016-07-15 12:52:14 +02:00