Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0

This commit is contained in:
Jaime van Kessel 2019-01-30 13:37:34 +01:00
commit 969ed6409c
8 changed files with 139 additions and 40 deletions

View file

@ -294,7 +294,7 @@
"setting_validation_ok": [255, 255, 255, 255],
"setting_filter_field" : [153, 153, 153, 255],
"material_compatibility_warning": [0, 0, 0, 255],
"material_compatibility_warning": [243, 166, 59, 255],
"progressbar_background": [245, 245, 245, 255],
"progressbar_control": [50, 130, 255, 255],