From b49bfadd87795d217af9a682ea79f2b4d8a40575 Mon Sep 17 00:00:00 2001 From: Vojtech Kral Date: Tue, 24 Jul 2018 15:27:31 +0200 Subject: [PATCH 1/3] PresetUpdater: Fail harder on bundle version not present in index --- lib/Slic3r/GUI.pm | 4 ++-- xs/src/slic3r/Utils/PresetUpdater.cpp | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/Slic3r/GUI.pm b/lib/Slic3r/GUI.pm index 0b9596261..483fd36f9 100644 --- a/lib/Slic3r/GUI.pm +++ b/lib/Slic3r/GUI.pm @@ -145,8 +145,8 @@ sub OnInit { } }; if ($@) { - warn $@ . "\n"; - fatal_error(undef, $@); + show_error(undef, $@); + $self->{mainframe}->Close; } }); diff --git a/xs/src/slic3r/Utils/PresetUpdater.cpp b/xs/src/slic3r/Utils/PresetUpdater.cpp index c962a2c82..6e23ab421 100644 --- a/xs/src/slic3r/Utils/PresetUpdater.cpp +++ b/xs/src/slic3r/Utils/PresetUpdater.cpp @@ -322,8 +322,9 @@ Updates PresetUpdater::priv::get_config_updates() const const auto ver_current = idx.find(vp.config_version); if (ver_current == idx.end()) { - BOOST_LOG_TRIVIAL(error) << boost::format("Preset bundle (`%1%`) version not found in index: %2%") % idx.vendor() % vp.config_version.to_string(); - continue; + auto message = (boost::format("Preset bundle `%1%` version not found in index: %2%") % idx.vendor() % vp.config_version.to_string()).str(); + BOOST_LOG_TRIVIAL(error) << message; + throw std::runtime_error(message); } // Getting a recommended version from the latest index, wich may have been downloaded From 07ae905150d026b3fdd47dd609668cc36bf8880b Mon Sep 17 00:00:00 2001 From: Vojtech Kral Date: Tue, 24 Jul 2018 15:47:13 +0200 Subject: [PATCH 2/3] Sync PrusaResearch.idx --- resources/profiles/PrusaResearch.idx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/resources/profiles/PrusaResearch.idx b/resources/profiles/PrusaResearch.idx index bdb372d81..522243e6b 100644 --- a/resources/profiles/PrusaResearch.idx +++ b/resources/profiles/PrusaResearch.idx @@ -1,8 +1,13 @@ min_slic3r_version = 1.41.0-alpha 0.2.0-alpha2 -0.2.0-alpha1 -0.2.0-alpha +0.2.0-alpha1 added initial profiles for the i3 MK3 Multi Material Upgrade 2.0 +0.2.0-alpha moved machine limits from the start G-code to the new print profile parameters min_slic3r_version = 1.40.0 +0.1.11 fw version changed to 3.3.1 +0.1.10 MK3 jerk and acceleration update +0.1.9 edited support extrusion width for 0.25 and 0.6 nozzles +0.1.8 extrusion width for 0,25, 0.6 and variable layer height fixes +0.1.7 Fixed errors in 0.25mm and 0.6mm profiles 0.1.6 Split the MK2.5 profile from the MK2S min_slic3r_version = 1.40.0-beta 0.1.5 fixed printer_variant fields for the i3 MK3 0.25 and 0.6mm nozzles From e0e6a238107b3614fde83d79a6e6056d0a378e2a Mon Sep 17 00:00:00 2001 From: Vojtech Kral Date: Tue, 24 Jul 2018 15:53:17 +0200 Subject: [PATCH 3/3] PrusaResearch.idx: Comment 0.2.0-alpha2 --- resources/profiles/PrusaResearch.idx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/profiles/PrusaResearch.idx b/resources/profiles/PrusaResearch.idx index 522243e6b..5c06353ca 100644 --- a/resources/profiles/PrusaResearch.idx +++ b/resources/profiles/PrusaResearch.idx @@ -1,5 +1,5 @@ min_slic3r_version = 1.41.0-alpha -0.2.0-alpha2 +0.2.0-alpha2 Renamed the key MK3SMMU to MK3MMU2, added a generic PLA MMU2 material 0.2.0-alpha1 added initial profiles for the i3 MK3 Multi Material Upgrade 2.0 0.2.0-alpha moved machine limits from the start G-code to the new print profile parameters min_slic3r_version = 1.40.0