juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-27 19:01:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.2.0' into dev_bury_point_alves

Browse Source
This commit is contained in:
alves
2025-12-18 14:10:47 +08:00
parent 43892819f5 8e2c02152b
commit 5beaa11ce3
35 changed files with 53505 additions and 62693 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libslic3r/AppConfig.cpp
+11 -1
View File
@@ -686,6 +686,16 @@ std::string AppConfig::load()
return err.what();
}
// Convert "China" to "Chinese Mainland" for region parameter
auto it_app = m_storage.find("app");
if (it_app != m_storage.end()) {
auto it_region = it_app->second.find("region");
if (it_region != it_app->second.end() && it_region->second == "China") {
it_region->second = "Chinese Mainland";
m_dirty = true;
}
}
// Figure out if datadir has legacy presets
auto ini_ver = Semver::parse(get("version"));
m_legacy_datadir = false;
@@ -1324,7 +1334,7 @@ std::string AppConfig::get_country_code()
// #if !BBL_RELEASE_TO_PUBLIC
// if (is_engineering_region()) { return region; }
// #endif
if (region == "CHN" || region == "China")
if (region == "CHN" || region == "Chinese Mainland" || region == "China")
return "CN";
else if (region == "USA")
return "US";