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

Merge branch '2.5'

Browse source
This commit is contained in:
Ghostkeeper 2017-03-10 18:20:58 +01:00
commit 5d0f7f9042
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,7 @@
"has_machine_materials": true, "has_machine_materials": true,
"has_variant_materials": true, "has_variant_materials": true,
"has_variants": true, "has_variants": true,
"preferred_variant": "*aa*", "preferred_variant": "*aa04*",
"preferred_quality": "*Normal*", "preferred_quality": "*Normal*",
"variants_name": "Print core", "variants_name": "Print core",
"machine_extruder_trains": "machine_extruder_trains":

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

@ -18,7 +18,7 @@
"has_variant_materials": true, "has_variant_materials": true,
"has_materials": true, "has_materials": true,
"has_variants": true, "has_variants": true,
"preferred_variant": "*aa*", "preferred_variant": "*aa04*",
"variants_name": "Print core", "variants_name": "Print core",
"machine_extruder_trains": "machine_extruder_trains":
{ {