Merge remote-tracking branch 'remote/master' into SoftFever

# Conflicts:
#	src/libslic3r/PerimeterGenerator.cpp

src/slic3r/Utils/MacDarkMode.hpp

@@ -13,7 +13,6 @@ extern void set_miniaturizable(void * window);
 void WKWebView_evaluateJavaScript(void * web, wxString const & script, void (*callback)(wxString const &));
 void set_title_colour_after_set_title();
 void initGestures(void * view,  wxEvtHandler * handler);
-
 #endif
 
 

src/slic3r/Utils/MacDarkMode.mm

@@ -1,4 +1,6 @@
 #import "MacDarkMode.hpp"
+#include "../GUI/Widgets/Label.hpp"
+
 #include "wx/osx/core/cfstring.h"
 
 #import <algorithm>
@@ -74,7 +76,7 @@ void WKWebView_evaluateJavaScript(void * web, wxString const & script, void (*ca
         }
     }];
 }
-    
+
 }
 }
 
@@ -178,6 +180,17 @@ void WKWebView_evaluateJavaScript(void * web, wxString const & script, void (*ca
 
 @end
 
+/* Font for wxTextCtrl */
+
+@implementation NSTableHeaderCell (Font)
+
+- (NSFont*) font
+{
+    return Label::sysFont(13).OSXGetNSFont();
+}
+
+@end
+
 /* remove focused border for wxTextCtrl */
 
 @implementation NSTextField (FocusRing)

src/slic3r/Utils/bambu_networking.hpp

@@ -36,7 +36,7 @@ namespace BBL {
 
 #define BAMBU_NETWORK_LIBRARY               "bambu_networking"
 #define BAMBU_NETWORK_AGENT_NAME            "bambu_network_agent"
-#define BAMBU_NETWORK_AGENT_VERSION         "01.01.00.10"
+#define BAMBU_NETWORK_AGENT_VERSION         "01.01.01.02"
 
 
 //iot preset type strings