Filip Sykala - NTB T15p 79a7f588b9 Merge branch 'et_world_coordinates' into fs_emboss ... # Conflicts: # src/libslic3r/CMakeLists.txt # src/libslic3r/Format/3mf.cpp # src/libslic3r/Model.hpp # src/libslic3r/Technologies.hpp # src/slic3r/GUI/GLCanvas3D.cpp # src/slic3r/GUI/GUI_App.cpp # src/slic3r/GUI/Gizmos/GLGizmoBase.cpp # src/slic3r/GUI/Gizmos/GLGizmoBase.hpp # src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp # src/slic3r/GUI/Selection.cpp # src/slic3r/GUI/Selection.hpp		2022-07-20 13:02:07 +02:00
..
data	Merge branch 'et_world_coordinates' into fs_emboss	2022-07-20 13:02:07 +02:00
fonts
icons	Merge branch 'et_world_coordinates' into fs_emboss	2022-07-20 13:02:07 +02:00
localization	Merge branch 'master_250'	2022-07-15 15:04:10 +02:00
profiles	Fixing conflicts part 1:	2022-06-29 16:43:29 +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