Skip to content

Commit

Permalink
oops. remember to change a blank lower to min_height
Browse files Browse the repository at this point in the history
  • Loading branch information
nanoplane committed Mar 23, 2021
1 parent cdfb98a commit c86822c
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 9 deletions.
4 changes: 2 additions & 2 deletions src/libslic3r/AppConfig.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace Slic3r {

static const std::string VENDOR_PREFIX = "vendor:";
static const std::string MODEL_PREFIX = "model:";
static const std::string VERSION_CHECK_URL = "https://api.github.com/repos/supermerill/superslicer/releases";
static const std::string VERSION_CHECK_URL = "https://api.github.com/repos/nanoplane/superslicermx/releases";

const std::string AppConfig::SECTION_FILAMENTS = "filaments";
const std::string AppConfig::SECTION_MATERIALS = "sla_materials";
Expand Down Expand Up @@ -185,7 +185,7 @@ std::string AppConfig::load()
// we will rethrow this exception from the place of load() call, if returned value wouldn't be empty
/*
throw Slic3r::RuntimeError(
_utf8(L("Error parsing SuperSlicer config file, it is probably corrupted. "
_utf8(L("Error parsing SuperSlicerMx config file, it is probably corrupted. "
"Try to manually delete the file to recover from the error. Your user profiles will not be affected.")) +
"\n\n" + AppConfig::config_path() + "\n\n" + ex.what());
*/
Expand Down
2 changes: 2 additions & 0 deletions src/libslic3r/GCode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1158,6 +1158,8 @@ ExtruderMixAndChangePts::ExtruderMixAndChangePts(int num_filaments, std::string
}
if (mheights.back() >= 0){
mheights.back() = std::max(mheights.back(), min_height);
} else {
mheights.back() = min_height;
}
}

Expand Down
12 changes: 6 additions & 6 deletions src/slic3r/GUI/MainFrame.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ static wxIcon main_frame_icon(GUI_App::EAppMode app_mode)
if (app_mode == GUI_App::EAppMode::GCodeViewer) {
// Only in case the slicer was started with --gcodeviewer parameter try to load the icon from prusa-gcodeviewer.exe
// Otherwise load it from the exe.
for (const std::wstring_view exe_name : { std::wstring_view(L"superslicer.exe"), std::wstring_view(L"superslicer_console.exe") })
for (const std::wstring_view exe_name : { std::wstring_view(L"superslicerMx.exe"), std::wstring_view(L"superslicer_console.exe") })
if (boost::iends_with(path, exe_name)) {
path.erase(path.end() - exe_name.size(), path.end());
path += L"prusa-gcodeviewer.exe";
Expand Down Expand Up @@ -150,7 +150,7 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_S
m_statusbar->embed(this);
m_statusbar->set_status_text(_L("Version") + " " +
SLIC3R_VERSION +
_L("Remember to check for updates at https://github.com/supermerill/SuperSlicer/releases"));
_L("Remember to check for updates at https://github.com/nanoplane/SuperSlicerMx/releases"));

// initialize tabpanel and menubar
init_tabpanel();
Expand Down Expand Up @@ -869,11 +869,11 @@ static wxMenu* generate_help_menu()
{
wxMenu* helpMenu = new wxMenu();
append_menu_item(helpMenu, wxID_ANY, _L("SuperSlicer Releases"), _L("Open the SuperSlicer releases page in your browser"),
[](wxCommandEvent&) { wxLaunchDefaultBrowser("http://github.com/supermerill/SuperSlicer/releases"); });
[](wxCommandEvent&) { wxLaunchDefaultBrowser("http://github.com/nanoplane/SuperSlicerMx/releases"); });
append_menu_item(helpMenu, wxID_ANY, _L("SuperSlicer wiki"), _L("Open the SuperSlicer wiki in your browser"),
[](wxCommandEvent&) { wxLaunchDefaultBrowser("http://github.com/supermerill/SuperSlicer/wiki"); });
[](wxCommandEvent&) { wxLaunchDefaultBrowser("http://github.com/nanoplane/SuperSlicerMx/wiki"); });
append_menu_item(helpMenu, wxID_ANY, _L("SuperSlicer website"), _L("Open the SuperSlicer website in your browser"),
[](wxCommandEvent&) { wxLaunchDefaultBrowser("http://github.com/supermerill/SuperSlicer"); });
[](wxCommandEvent&) { wxLaunchDefaultBrowser("http://github.com/nanoplane/SuperSlicerMx"); });
append_menu_item(helpMenu, wxID_ANY, _L("Prusa Edition website"), _L("Open the Prusa Edition website in your browser"),
[](wxCommandEvent&) { wxLaunchDefaultBrowser("http://github.com/prusa3d/PrusaSlicer"); });
//# my $versioncheck = $self->_append_menu_item($helpMenu, "Check for &Updates...", "Check for new Slic3r versions", sub{
Expand All @@ -892,7 +892,7 @@ static wxMenu* generate_help_menu()
append_menu_item(helpMenu, wxID_ANY, _L("Show &Configuration Folder"), _L("Show user configuration folder (datadir)"),
[](wxCommandEvent&) { Slic3r::GUI::desktop_open_datadir_folder(); });
append_menu_item(helpMenu, wxID_ANY, _L("Report an I&ssue"), wxString::Format(_L("Report an issue on %s"), SLIC3R_APP_NAME),
[](wxCommandEvent&) { wxLaunchDefaultBrowser("http://github.com/supermerill/SuperSlicer/issues/new"); });
[](wxCommandEvent&) { wxLaunchDefaultBrowser("http://github.com/nanoplane/SuperSlicerMx/issues/new"); });

if (wxGetApp().is_editor())
append_menu_item(helpMenu, wxID_ANY, wxString::Format(_L("&About %s"), SLIC3R_APP_NAME), _L("Show about dialog"),
Expand Down
2 changes: 1 addition & 1 deletion src/slic3r/GUI/UpdateDialogs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ namespace GUI {

static const char* URL_CHANGELOG = "https://files.prusa3d.com/?latest=slicer-stable&lng=%1%";
static const char* URL_DOWNLOAD = "https://www.prusa3d.com/downloads&lng=%1%";
static const char* URL_DEV = "https://github.com/supermerill/SuperSlicer/releases/tag/version_%1%";
static const char* URL_DEV = "https://github.com/nanoplane/SuperSlicerMx/releases/tag/version_%1%";

static const std::string CONFIG_UPDATE_WIKI_URL("https://github.com/prusa3d/PrusaSlicer/wiki/Slic3r-PE-1.40-configuration-update");

Expand Down

0 comments on commit c86822c

Please sign in to comment.