merge upstream changes

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
This commit is contained in:
SoftFever 2023-01-21 00:37:10 +08:00
parent 1bdedb1c47
commit 2492e5d39c
156 changed files with 33597 additions and 65667 deletions

View file

@ -36,7 +36,7 @@
namespace Slic3r {
namespace GUI {
#define BORDER_W 10
#define BORDER_W FromDIP(10)
//------------------------------------------
// PhysicalPrinterDialog