3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 22:35:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3

Browse source
This commit is contained in:
Tim Kuipers 2016-09-08 16:19:06 +02:00
commit 84fb59a0f3
34 changed files with 318 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

11
resources/definitions/fdmprinter.def.json
View file

@ -10,6 +10,7 @@
"manufacturer": "Ultimaker",
"file_formats": "text/x-gcode;application/x-stl-ascii;application/x-stl-binary;application/x-wavefront-obj;application/x3g",
"visible": false,
"has_materials": true,
"preferred_material": "*generic_pla*",
"preferred_quality": "*normal*",
"machine_extruder_trains":
@ -403,7 +404,7 @@
"description": "The maximum speed of the filament.",
"unit": "mm/s",
"type": "float",
"default_value": 25,
"default_value": 299792458000,
"settable_per_mesh": false,
"settable_per_extruder": false,
"settable_per_meshgroup": false
@ -1161,7 +1162,7 @@
"default_value": 25,
"minimum_value": "0",
"maximum_value": "machine_max_feedrate_e",
"maximum_value_warning": "100",
"maximum_value_warning": "25",
"enabled": "retraction_enable",
"settable_per_mesh": false,
"settable_per_extruder": true,
@ -1174,7 +1175,7 @@
"default_value": 25,
"minimum_value": "0",
"maximum_value": "machine_max_feedrate_e",
"maximum_value_warning": "100",
"maximum_value_warning": "25",
"enabled": "retraction_enable",
"value": "retraction_speed",
"settable_per_mesh": false,
@ -1188,7 +1189,7 @@
"default_value": 25,
"minimum_value": "0",
"maximum_value": "machine_max_feedrate_e",
"maximum_value_warning": "100",
"maximum_value_warning": "25",
"enabled": "retraction_enable",
"value": "retraction_speed",
"settable_per_mesh": false,
@ -3207,6 +3208,7 @@
"type": "category",
"icon": "category_dual",
"description": "Settings used for printing with multiple extruders.",
"enabled": "machine_extruder_count > 1",
"children":
{
"adhesion_extruder_nr":
@ -3284,6 +3286,7 @@
"default_value": 15,
"value": "15 if prime_tower_enable else 0",
"minimum_value": "0",
"maximum_value": "min(0.5 * machine_width, 0.5 * machine_depth)",
"maximum_value_warning": "20",
"settable_per_mesh": false,
"settable_per_extruder": false

3
resources/definitions/ultimaker.def.json
View file

@ -9,6 +9,9 @@
"visible": false
},
"overrides": {
"machine_max_feedrate_e": {
"default_value": 45
},
"material_print_temperature": {
"minimum_value": "0"
},

1
resources/definitions/ultimaker2.def.json
View file

@ -14,6 +14,7 @@
"platform": "ultimaker2_platform.obj",
"platform_texture": "Ultimaker2backplate.png",
"platform_offset": [9, 0, 0],
"has_materials": false,
"supported_actions":["UpgradeFirmware"]
},
"overrides": {

2
resources/definitions/ultimaker_original_dual.def.json
View file

@ -78,7 +78,7 @@
"default_value": 185
},
"prime_tower_position_y": {
"default_value": 175
"default_value": 160
}
}
}