PrusaSlicer

mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-12 13:11:46 +08:00

History

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

Support of CJK languages in ImGUI:

2019-05-23 18:04:27 +02:00

icons

Merge branch 'et_world_coordinates' into fs_emboss

2022-07-20 13:02:07 +02:00

localization

Merge branch 'master_250'