From f179a231f8f7e3b5ec85dba7d977f456eb094806 Mon Sep 17 00:00:00 2001
From: bubnikv <bubnikv@gmail.com>
Date: Mon, 3 Jun 2019 16:01:02 +0200
Subject: [PATCH 1/4] Fixed the github issue template to indicate that 3MFs
 cannot be attached directly and need to be zipped Fixes "Can't upload .3mf
 files to GitHub for issues #2372"

---
 .github/ISSUE_TEMPLATE.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 3744315ae3b..dbf3c76dc3c 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -24,3 +24,4 @@ _Is this a new feature request?_
 
 #### Project File (.3MF) where problem occurs
 _Upload a PrusaSlicer Project File (.3MF) (`Plater -> Export plate as 3MF` for Slic3r PE 1.41.2 and older, `File -> Save` / `Save Project` for PrusaSlicer, Slic3r PE 1.42.0-alpha and newer)_
+_Images (PNG, GIF, JPEG), PDFs or text files could be drag & dropped to the issue directly, while all other files need to be zipped first (.zip, .gz)_

From c10ba1d870a3531ecf03d2af0be783a26163bbe3 Mon Sep 17 00:00:00 2001
From: Vojtech Kral <vojtech@kral.hk>
Date: Tue, 21 May 2019 13:02:47 +0200
Subject: [PATCH 2/4] Add missing header

---
 src/libslic3r/Zipper.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libslic3r/Zipper.cpp b/src/libslic3r/Zipper.cpp
index 348be49ccb7..7e69f0bb4d2 100644
--- a/src/libslic3r/Zipper.cpp
+++ b/src/libslic3r/Zipper.cpp
@@ -1,3 +1,4 @@
+#include <cstdint>
 #include <exception>
 
 #include "Zipper.hpp"

From cdacd38d2d46404812e83175b083eccec05dcd56 Mon Sep 17 00:00:00 2001
From: Vojtech Kral <vojtech@kral.hk>
Date: Mon, 3 Jun 2019 16:59:27 +0200
Subject: [PATCH 3/4] BonjourDialog: Fix dialog flags

---
 src/slic3r/GUI/BonjourDialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/slic3r/GUI/BonjourDialog.cpp b/src/slic3r/GUI/BonjourDialog.cpp
index ec6b2f0c95c..1885dda7bef 100644
--- a/src/slic3r/GUI/BonjourDialog.cpp
+++ b/src/slic3r/GUI/BonjourDialog.cpp
@@ -52,7 +52,7 @@ struct LifetimeGuard
 };
 
 BonjourDialog::BonjourDialog(wxWindow *parent, Slic3r::PrinterTechnology tech)
-	: wxDialog(parent, wxID_ANY, _(L("Network lookup")), wxDefaultPosition, wxDefaultSize, wxRESIZE_BORDER)
+	: wxDialog(parent, wxID_ANY, _(L("Network lookup")), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)
 	, list(new wxListView(this, wxID_ANY))
 	, replies(new ReplySet)
 	, label(new wxStaticText(this, wxID_ANY, ""))

From 53ada19bc9b3c27570e46dae5887c35433660d0d Mon Sep 17 00:00:00 2001
From: tamasmeszaros <meszaros.q@gmail.com>
Date: Tue, 4 Jun 2019 09:26:33 +0200
Subject: [PATCH 4/4] Move cstdint to Zipper header.

The declarations already contain specific integers.
---
 src/libslic3r/Zipper.cpp | 1 -
 src/libslic3r/Zipper.hpp | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libslic3r/Zipper.cpp b/src/libslic3r/Zipper.cpp
index 7e69f0bb4d2..348be49ccb7 100644
--- a/src/libslic3r/Zipper.cpp
+++ b/src/libslic3r/Zipper.cpp
@@ -1,4 +1,3 @@
-#include <cstdint>
 #include <exception>
 
 #include "Zipper.hpp"
diff --git a/src/libslic3r/Zipper.hpp b/src/libslic3r/Zipper.hpp
index 7d95ffdac7a..a574de95963 100644
--- a/src/libslic3r/Zipper.hpp
+++ b/src/libslic3r/Zipper.hpp
@@ -1,6 +1,7 @@
 #ifndef ZIPPER_HPP
 #define ZIPPER_HPP
 
+#include <cstdint>
 #include <string>
 #include <memory>