7 Commits

Author SHA1 Message Date
Ghostkeeper
ee9de1f11b
Merge branch '3.2'
Lots of conflicts due to rounding vs. flooring of text element positions for weirdness with the font aliasing.
2018-02-14 10:53:51 +01:00
Mark
b531c0550d Change Math.floor to Math.round as a last try to fix garbled fonts
CURA-4941
2018-02-14 09:28:47 +01:00
Jaime van Kessel
1c1c195b93 When an printer gets added / removed, this is now correctly shown
CL-541
2017-11-30 15:01:28 +01:00
Jaime van Kessel
6f495f2d8b Cluster monitor now uses material name
This matches better with what Cura does.

CL-541
2017-11-27 16:00:57 +01:00
Jaime van Kessel
5d3779da26 Update cluster view components
CL-541
2017-11-27 15:54:44 +01:00
Mark
334283e893 Found some more margins that wouldnt be fixed numbers and made the code more consistent 2017-10-27 14:12:35 +02:00
Simon Edwards
85efd9249c
Add in all of the changes for Cura Connect
CURA-4376
2017-09-27 10:29:48 +02:00