Filip Sykala 37961c36e8 Merge branch 'master' into fs_emboss ... # Conflicts: # src/libslic3r/Technologies.hpp # src/slic3r/GUI/GLCanvas3D.cpp # src/slic3r/GUI/GUI_App.cpp		2022-05-18 14:35:48 +02:00
..
data	Merge branch 'master' into fs_emboss	2022-02-02 15:27:25 +01:00
fonts	Support of CJK languages in ImGUI:	2019-05-23 18:04:27 +02:00
icons	Emboss icons version 3	2022-04-26 22:33:14 +02:00
localization	Localization: Update for list.txt	2022-05-09 17:04:10 +02:00
profiles	Merge pull request #8251 from pmjdebruijn/creality	2022-05-16 06:28:27 +02:00
shaders	Fixed rendering of printbed while the camera is below it	2022-04-11 08:38:09 +02:00
shapes	Shapes Gallery: Added PLA_recycling_symbol	2022-04-12 09:15:55 +02:00
udev	Cleanup of file 90-3dconnexion.rules	2019-11-18 16:07:39 +01:00