Filip Sykala 7df893177c Merge branch 'master' into fs_emboss ... # Conflicts: # src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp		2021-09-14 09:50:19 +02:00
..
data	Open menubar item by name with translations	2021-09-02 09:48:06 +02:00
fonts	Support of CJK languages in ImGUI:	2019-05-23 18:04:27 +02:00
icons	Merge branch 'master' into fs_emboss	2021-09-14 09:50:19 +02:00
localization	Korean localization addition update (#6314)	2021-07-08 17:05:15 +02:00
profiles	Updated raft_contact_distance values.	2021-09-01 13:36:13 +02:00
shaders	Techs ENABLE_SEAMS_USING_MODELS and ENABLE_SEAMS_USING_BATCHED_MODELS - Fixed seams (and other options) zs to match toolpaths zs in preview	2021-09-08 13:04:43 +02:00
shapes	Shapes Gallery: Added PNG-files to the system gallery	2021-08-02 15:03:58 +02:00
udev	Cleanup of file 90-3dconnexion.rules	2019-11-18 16:07:39 +01:00