Merge branch '2.4'

This commit is contained in:
Jack Ha 2017-01-25 15:28:56 +01:00
commit 7281b46118
2 changed files with 7 additions and 6 deletions

View file

@ -1383,9 +1383,9 @@
"type": "float",
"resolve": "max(extruderValues('material_bed_temperature_layer_0'))",
"default_value": 60,
"value": "material_bed_temperature",
"value": "max(extruderValues('material_bed_temperature'))",
"minimum_value": "-273.15",
"minimum_value_warning": "0",
"minimum_value_warning": "max(extruderValues('material_bed_temperature'))",
"maximum_value_warning": "260",
"enabled": "machine_heated_bed and machine_gcode_flavor != \"UltiGCode\"",
"settable_per_mesh": false,