public_mirrors/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-07-22 09:54:27 +00:00
Code Issues Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Lukas Matena
2020-03-24 21:51:05 +01:00
parent a48a79603c c3a9915fa1
commit 97b9de47b4
166 changed files with 13682 additions and 9161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/slic3r/Utils/FlashAir.cpp
+1 -1
View File
@@ -70,7 +70,7 @@ wxString FlashAir::get_test_ok_msg () const
wxString FlashAir::get_test_failed_msg (wxString &msg) const
{
return wxString::FromUTF8((boost::format("%s: %s")
return GUI::from_u8((boost::format("%s: %s\n%s")
% _utf8(L("Could not connect to FlashAir"))
% std::string(msg.ToUTF8())
% _utf8(L("Note: FlashAir with firmware 2.00.02 or newer and activated upload function is required."))).str());