Merge branch '2.5'

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

View file

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

View file

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