Merge branch '2.7'

This commit is contained in:
Lipu Fei 2017-08-16 11:51:26 +02:00
commit b74c09dec8
2 changed files with 4 additions and 1 deletions

View file

@ -182,6 +182,9 @@ class SliceInfo(Extension):
data["print_settings"] = print_settings
# Send the name of the output device type that is used.
data["output_to"] = type(output_device).__name__
# Convert data to bytes
binary_data = json.dumps(data).encode("utf-8")

View file

@ -633,7 +633,7 @@
"unit": "mm",
"type": "float",
"default_value": 0.3,
"resolve": "sum(extruderValues('layer_height_0')) / len(extruderValues('layer_height_0'))",
"resolve": "min(extruderValues('layer_height_0'))",
"minimum_value": "0.001",
"minimum_value_warning": "0.1",
"maximum_value_warning": "0.8 * min(extruderValues('machine_nozzle_size'))",