Merge remote-tracking branch 'upstream/main' into dev/h2d-2

# Conflicts:
#	src/slic3r/GUI/GUI_App.cpp
This commit is contained in:
Noisyfox
2025-09-28 11:09:24 +08:00
14 changed files with 693 additions and 91 deletions

View File

@@ -37,8 +37,7 @@ using namespace nlohmann;
namespace Slic3r {
static const std::string VERSION_CHECK_URL_STABLE = "https://api.github.com/repos/softfever/OrcaSlicer/releases/latest";
static const std::string VERSION_CHECK_URL = "https://api.github.com/repos/softfever/OrcaSlicer/releases";
static const std::string VERSION_CHECK_URL = "https://check-version.orcaslicer.com/latest";
static const std::string PROFILE_UPDATE_URL = "https://api.github.com/repos/OrcaSlicer/orcaslicer-profiles/releases/tags";
static const std::string MODELS_STR = "models";
@@ -1435,10 +1434,10 @@ std::string AppConfig::config_path()
return path;
}
std::string AppConfig::version_check_url(bool stable_only/* = false*/) const
std::string AppConfig::version_check_url() const
{
auto from_settings = get("version_check_url");
return from_settings.empty() ? stable_only ? VERSION_CHECK_URL_STABLE : VERSION_CHECK_URL : from_settings;
return from_settings.empty() ? VERSION_CHECK_URL : from_settings;
}
std::string AppConfig::profile_update_url() const