3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp

Browse Source
This commit is contained in:
Enrico Turri 2018-07-25 08:35:05 +02:00
commit 496a83bb28
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Slic3r/GUI.pm
View File

@ -145,8 +145,8 @@ sub OnInit {
} }
}; };
if ($@) { if ($@) {
warn $@ . "\n"; show_error(undef, $@);
fatal_error(undef, $@); $self->{mainframe}->Close;
} }
}); });

11
resources/profiles/PrusaResearch.idx
View File

@ -1,8 +1,13 @@
min_slic3r_version = 1.41.0-alpha 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 0.2.0-alpha1 added initial profiles for the i3 MK3 Multi Material Upgrade 2.0
0.2.0-alpha 0.2.0-alpha moved machine limits from the start G-code to the new print profile parameters
min_slic3r_version = 1.40.0 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 0.1.6 Split the MK2.5 profile from the MK2S
min_slic3r_version = 1.40.0-beta min_slic3r_version = 1.40.0-beta
0.1.5 fixed printer_variant fields for the i3 MK3 0.25 and 0.6mm nozzles 0.1.5 fixed printer_variant fields for the i3 MK3 0.25 and 0.6mm nozzles

5
xs/src/slic3r/Utils/PresetUpdater.cpp
View File

@ -322,8 +322,9 @@ Updates PresetUpdater::priv::get_config_updates() const
const auto ver_current = idx.find(vp.config_version); const auto ver_current = idx.find(vp.config_version);
if (ver_current == idx.end()) { 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(); auto message = (boost::format("Preset bundle `%1%` version not found in index: %2%") % idx.vendor() % vp.config_version.to_string()).str();
continue; BOOST_LOG_TRIVIAL(error) << message;
throw std::runtime_error(message);
} }
// Getting a recommended version from the latest index, wich may have been downloaded // Getting a recommended version from the latest index, wich may have been downloaded