Enrico Turri 1f6d671abb Fixed conflicts after merge with master

2019-04-12 08:41:59 +02:00

..

fonts

Removed the NotoSans hinted fonts as they are too large, they are

2019-02-19 13:28:05 +01:00

icons

New icons for copy and paste toolbar items

2019-04-11 15:51:12 +02:00

localization

Localization: Updated dictionaries

2019-04-09 16:54:31 +02:00

models

Restored old sl1 printbed model

2019-02-07 09:15:20 +01:00

profiles

Updated Prusa3D print profiles

2019-03-16 19:13:30 +01:00

shaders

Fixed a literal in vertex shader that refused to compile on OSX

2019-04-08 16:05:18 +02:00