Merge remote-tracking branch 'remotes/origin/master' into vb_treesupp…

…orts

resources/profiles/PrusaResearch.idx

@@ -1,11 +1,15 @@
 min_slic3r_version = 2.5.0-alpha0
+1.5.4 Added material profiles for Prusament Resin BioBased60.
+1.5.3 Added filament profiles for ColorFabb VarioShore TPU, FormFutura PP, NinjaTek NinjaFlex/Cheetah TPU and for multiple Eolas Prints filaments. Updated bridging settings in 50um and 70um profiles. 
+1.5.2 Added SLA material profiles.
 1.5.1 Renamed filament type "NYLON" to "PA". Updated Adura X profile. Updated PETG fan settings for Prusa MINI (removed fan ramp up).
 1.5.0 Updated arachne parameters. Added profiles for Jessie filaments.
 1.5.0-alpha1 Added filament profile for Prusament PA11 Carbon Fiber. Added profiles for multiple 3D-Fuel filaments.
 1.5.0-alpha0 Added parameters for Arachne perimeter generator. Changed default seam position. Updated output filename format.
 min_slic3r_version = 2.4.0-rc
+1.4.8 Added filament and SLA material profiles. Updated settings.
 1.4.7 Added filament profile for Prusament PA11 Carbon Fiber. Added profiles for multiple 3D-Fuel filaments.
-1.4.6 Added SLA materials. Updated filament profiles.
+1.4.6 Added SLA materials. Updated filament profiles. 
 1.4.5 Added MMU2/S profiles for 0.25mm nozzle. Updated FW version. Enabled g-code thumbnails for MK3 family printers. Updated end g-code.
 1.4.4 Added multiple Fiberlogy filament profiles. Updated Extrudr filament profiles.
 1.4.3 Added new filament profiles and SLA materials.