Merge branch 'master-remote' into SoftFever

# Conflicts:
#	src/slic3r/GUI/GUI_App.cpp
#	version.inc
This commit is contained in:
SoftFever 2022-11-28 20:46:53 +08:00
commit 5bb0addb3d
9 changed files with 178 additions and 16 deletions

View file

@ -538,6 +538,7 @@ public:
private:
int updating_bambu_networking();
bool on_init_inner();
void copy_network_if_available();
bool on_init_network(bool try_backup = false);
void init_networking_callbacks();
void init_app_config();