Filip Sykala 65909c74c4 Merge branch 'master' into fs_emboss ... # Conflicts: # src/libslic3r/Technologies.hpp		2022-03-22 12:52:16 +01: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	Readded Photon MONO X	2022-03-18 15:42:15 +01:00
shaders	Tech ENABLE_LEGACY_OPENGL_REMOVAL - A few refactorings and fixes	2022-03-22 08:18:39 +01: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