Merge branch 'master-CURA-1615' of https://github.com/thopiekar/Cura.git into master-CURA-1445

This commit is contained in:
Thomas Karl Pietrowski 2016-06-22 14:02:41 +02:00
commit f1ac2405a7

View file

@ -85,7 +85,7 @@ class SliceInfo(Extension):
"settings": global_container_stack.serialize(), # global_container with references on used containers
"version": Application.getInstance().getVersion(),
"modelhash": "None",
"printtime": str(print_information.currentPrintTime),
"printtime": print_information.currentPrintTime.getDisplayString(),
"filament": material_used,
"language": Preferences.getInstance().getValue("general/language"),
"materials_profiles ": {}