Filip Sykala a50d93cd66 Merge branch 'master' into fs_emboss ... # Conflicts: # src/libslic3r/Geometry.cpp # src/slic3r/GUI/Gizmos/GLGizmoBase.cpp # src/slic3r/GUI/Gizmos/GLGizmoMove.cpp # src/slic3r/GUI/Gizmos/GLGizmoMove.hpp # src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp # src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp # src/slic3r/GUI/Gizmos/GLGizmoScale.cpp # src/slic3r/GUI/Gizmos/GLGizmoScale.hpp # src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp # src/slic3r/GUI/ImGuiWrapper.cpp # src/slic3r/GUI/ImGuiWrapper.hpp # src/slic3r/GUI/Selection.cpp # tests/slic3rutils/slic3r_jobs_tests.cpp		2022-02-02 15:27:25 +01:00
..
data	Merge branch 'master' into fs_emboss	2022-02-02 15:27:25 +01:00
fonts
icons	Merge branch 'master' into fs_emboss	2022-02-02 15:27:25 +01:00
localization	Localization: Added Hungarian dictionary. Thanks for Attila Zombori(https://github.com/zomatt)	2022-01-27 10:29:03 +01:00
profiles	Added G92 E0.	2022-01-31 14:44:43 +01:00
shaders	Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Textures rendering	2022-01-28 16:50:07 +01:00
shapes	ShapeGallery: Added more system shapes	2021-10-08 09:05:03 +02:00
udev