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

Merge branch 'master' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2016-07-25 13:51:27 +02:00
commit b28cf14288
4 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
View file

@ -183,6 +183,7 @@ Item {
settingLoader.item.showInheritButton = false
settingLoader.item.showLinkedSettingIcon = false
settingLoader.item.doDepthIndentation = false
settingLoader.item.doQualityUserSettingEmphasis = false
}
sourceComponent:

5
plugins/SliceInfoPlugin/SliceInfo.py
View file

@ -10,6 +10,7 @@ from UM.Message import Message
from UM.i18n import i18nCatalog
from UM.Logger import Logger
from UM.Platform import Platform
from UM.Qt.Duration import DurationFormat
import collections
import json
@ -90,7 +91,7 @@ class SliceInfo(Extension):
"settings": global_container_stack.serialize(), # global_container with references on used containers
"version": Application.getInstance().getVersion(),
"modelhash": "None",
"printtime": print_information.currentPrintTime.getDisplayString(),
"printtime": print_information.currentPrintTime.getDisplayString(DurationFormat.Format.ISO8601),
"filament": material_used,
"language": Preferences.getInstance().getValue("general/language"),
}
@ -126,4 +127,4 @@ class SliceInfo(Extension):
except:
# We really can't afford to have a mistake here, as this would break the sending of g-code to a device
# (Either saving or directly to a printer). The functionality of the slice data is not *that* important.
pass
pass