amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'bs_1.5.0.61' into SoftFever

Browse source
This commit is contained in:
SoftFever 2023-03-15 22:29:41 +08:00
commit 25f2dd6ebb
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/slic3r/GUI/HttpServer.cpp
View file

@ -48,8 +48,8 @@ std::string http_headers::get_response()
std::string user_avatar;
try {
json user_j = json::parse(http_body);
if (user_j.contains("uid"))
user_id = std::to_string(user_j["uid"].get<int>());
if (user_j.contains("uidStr"))
user_id = user_j["uidStr"].get<std::string>();
if (user_j.contains("name"))
user_name = user_j["name"].get<std::string>();
if (user_j.contains("avatar"))

2
version.inc
View file

@ -11,4 +11,4 @@ if(NOT DEFINED BBL_INTERNAL_TESTING)
set(BBL_INTERNAL_TESTING "1")
endif()
set(SoftFever_VERSION "1.5.0")
set(SLIC3R_VERSION "01.05.00.60")
set(SLIC3R_VERSION "01.05.00.61")