Filip Sykala 8719ec8977 Merge branch 'master' into fs_emboss ... # Conflicts: # src/libslic3r/Model.hpp		2022-04-05 15:55:24 +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	Fixed conflicts after merge with branch et_world_coordinates	2022-03-10 13:22:20 +01:00
localization	Catalan language updated to 2.4.1 RC1	2022-03-08 10:29:14 +01:00
profiles	Reduced/reworked resources.	2022-04-05 08:34:27 +02:00
shaders	Tech ENABLE_GL_SHADERS_ATTRIBUTES - Fixed OpenGL clipping planes while rendering picking pass	2022-03-31 13:23:04 +02:00
shapes	ShapeGallery: Added more system shapes	2021-10-08 09:05:03 +02:00
udev	Cleanup of file 90-3dconnexion.rules	2019-11-18 16:07:39 +01:00