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

This commit is contained in:
Jaime van Kessel 2022-02-22 11:06:13 +01:00
commit 03a9f3e2ee
3 changed files with 3 additions and 5 deletions

View file

@ -162,8 +162,6 @@
"tool_button_border": [255, 255, 255, 38],
"y_axis": [96, 96, 255, 255],
"viewport_background": [31, 36, 39, 255],
"volume_outline": [12, 169, 227, 128],
"buildplate": [169, 169, 169, 255],

View file

@ -381,8 +381,8 @@
"disabled_axis": [127, 127, 127, 255],
"x_axis": [218, 30, 40, 255],
"y_axis": [36, 162, 73, 255],
"z_axis": [25, 110, 240, 255],
"y_axis": [25, 110, 240, 255],
"z_axis": [36, 162, 73, 255],
"all_axis": [255, 255, 255, 255],
"viewport_background": [250, 250, 250, 255],