3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-27 21:01:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge branch 'feature_intent'

Browse source 
Here we go!

Contributes to issue CURA-6864.
This commit is contained in:
Ghostkeeper 2019-10-08 13:17:54 +02:00
commit cf14fa6820
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
154 changed files with 5293 additions and 4600 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,8 @@
"file_formats": "text/x-gcode;application/x-stl-ascii;application/x-stl-binary;application/x-wavefront-obj;application/x3g",
"visible": false,
"has_materials": true,
"has_variants": false,
"has_machine_quality": false,
"preferred_material": "generic_pla",
"preferred_quality_type": "normal",
"machine_extruder_trains":

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

@ -9,7 +9,6 @@
"file_formats": "text/x-gcode",
"has_materials": true,
"has_machine_materials": true,
"preferred_material": "generic_pla",
"exclude_materials": [
"chromatik_pla",

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

@ -14,8 +14,6 @@
"has_materials": false,
"has_machine_quality": true,
"preferred_variant_name": "0.4 mm",
"first_start_actions": ["UM2UpgradeSelection"],
"supported_actions":["UM2UpgradeSelection"],
"machine_extruder_trains":
{
"0": "ultimaker2_extruder_0"

12
resources/definitions/ultimaker2_extended_olsson.def.json Normal file
View file

@ -0,0 +1,12 @@
{
"version": 2,
"name": "Ultimaker 2 Extended with Olsson",
"inherits": "ultimaker2_extended",
"metadata": {
"has_variants": true
},
"overrides": {
"machine_name": { "default_value": "Ultimaker 2 Extended with Olsson" }
}
}

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

@ -11,7 +11,6 @@
"platform": "ultimaker2go_platform.obj",
"platform_texture": "Ultimaker2Gobackplate.png",
"platform_offset": [0, 0, 0],
"first_start_actions": [],
"machine_extruder_trains":
{
"0": "ultimaker2_go_extruder_0"

13
resources/definitions/ultimaker2_olsson.def.json Normal file
View file

@ -0,0 +1,13 @@
{
"version": 2,
"name": "Ultimaker 2 with Olsson Block",
"inherits": "ultimaker2",
"metadata": {
"has_variants": true,
"quality_definition": "ultimaker2"
},
"overrides": {
"machine_name": { "default_value": "Ultimaker 2 with Olsson Block" }
}
}