diff options
| author | fieldOfView <aldo@fieldofview.com> | 2016-08-22 18:12:39 +0300 |
|---|---|---|
| committer | fieldOfView <aldo@fieldofview.com> | 2016-08-22 18:12:39 +0300 |
| commit | 5bf19f9ff20e6517ed638a0aec3f4693e4ffffaf (patch) | |
| tree | b49c1b69e1ce57119b9a3fb0c92ca8c4e75ea9ab | |
| parent | 756422fc0e1214f6d003dbcc3d6c614c55100b34 (diff) | |
Fix preferred material for cases when there more than 1 "pla" materials
| -rw-r--r-- | resources/definitions/custom.def.json | 1 | ||||
| -rw-r--r-- | resources/definitions/fdmprinter.def.json | 6 | ||||
| -rw-r--r-- | resources/definitions/ultimaker2_plus.def.json | 4 | ||||
| -rw-r--r-- | resources/definitions/ultimaker_original.def.json | 2 | ||||
| -rw-r--r-- | resources/definitions/ultimaker_original_dual.def.json | 2 |
5 files changed, 4 insertions, 11 deletions
diff --git a/resources/definitions/custom.def.json b/resources/definitions/custom.def.json index 0ccd2d9890..7ae1d1bd28 100644 --- a/resources/definitions/custom.def.json +++ b/resources/definitions/custom.def.json @@ -10,7 +10,6 @@ "category": "Custom", "file_formats": "text/x-gcode", "has_materials": true, - "preferred_material": "*pla*", "first_start_actions": ["MachineSettingsAction"] } } diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 2669f7d4dc..089661314a 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -10,8 +10,8 @@ "manufacturer": "Ultimaker", "file_formats": "text/x-gcode;application/x-stl-ascii;application/x-stl-binary;application/x-wavefront-obj;application/x3g", "visible": false, - "preferred_material": "pla", - "preferred_quality": "normal", + "preferred_material": "*generic_pla*", + "preferred_quality": "*normal*", "machine_extruder_trains": { "0": "fdmextruder" @@ -139,7 +139,7 @@ { "label": "Has heated build plate", "description": "Whether the machine has a heated build plate present.", - "default_value": false, + "default_value": true, "type": "bool", "settable_per_mesh": false, "settable_per_extruder": false, diff --git a/resources/definitions/ultimaker2_plus.def.json b/resources/definitions/ultimaker2_plus.def.json index 4c7279b178..9866d65e3d 100644 --- a/resources/definitions/ultimaker2_plus.def.json +++ b/resources/definitions/ultimaker2_plus.def.json @@ -11,9 +11,7 @@ "file_formats": "text/x-gcode", "platform": "ultimaker2_platform.obj", "platform_texture": "Ultimaker2Plusbackplate.png", - "preferred_variant": "ultimaker2_plus_0.4", - "preferred_material": "*pla*", - "preferred_quality": "*normal*", + "preferred_variant": "*0.4*", "has_variants": true, "has_materials": true, "has_machine_materials": true, diff --git a/resources/definitions/ultimaker_original.def.json b/resources/definitions/ultimaker_original.def.json index 3dd4766afa..a4c37e7aa7 100644 --- a/resources/definitions/ultimaker_original.def.json +++ b/resources/definitions/ultimaker_original.def.json @@ -13,8 +13,6 @@ "icon": "icon_ultimaker.png", "platform": "ultimaker_platform.stl", "has_materials": true, - "preferred_material": "*pla*", - "preferred_quality": "*normal*", "first_start_actions": ["UMOUpgradeSelection", "UMOCheckup", "BedLevel"], "supported_actions": ["UMOUpgradeSelection", "UMOCheckup", "BedLevel", "UpgradeFirmware"] }, diff --git a/resources/definitions/ultimaker_original_dual.def.json b/resources/definitions/ultimaker_original_dual.def.json index e379d978a9..6feaa07470 100644 --- a/resources/definitions/ultimaker_original_dual.def.json +++ b/resources/definitions/ultimaker_original_dual.def.json @@ -13,8 +13,6 @@ "icon": "icon_ultimaker.png", "platform": "ultimaker_platform.stl", "has_materials": true, - "preferred_material": "*pla*", - "preferred_quality": "*normal*", "machine_extruder_trains": { "0": "ultimaker_original_dual_1st", |