Merge branch '2.4'

This commit is contained in:
Jack Ha 2017-01-26 15:30:50 +01:00
commit 6defbc8649

View File

@ -1383,7 +1383,7 @@
"type": "float",
"resolve": "max(extruderValues('material_bed_temperature_layer_0'))",
"default_value": 60,
"value": "max(extruderValues('material_bed_temperature'))",
"value": "resolveOrValue('material_bed_temperature')",
"minimum_value": "-273.15",
"minimum_value_warning": "max(extruderValues('material_bed_temperature'))",
"maximum_value_warning": "260",