diff options
Diffstat (limited to 'resources/profiles/PrusaResearch.idx')
| -rw-r--r-- | resources/profiles/PrusaResearch.idx | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/resources/profiles/PrusaResearch.idx b/resources/profiles/PrusaResearch.idx index c7633c257..f90ba8279 100644 --- a/resources/profiles/PrusaResearch.idx +++ b/resources/profiles/PrusaResearch.idx @@ -1,8 +1,3 @@ -<<<<<<< HEAD -min_slic3r_version = 2.3.2-alpha0 -1.3.0 Added SL1S SPEED profiles. -min_slic3r_version = 2.3.0-rc1 -======= min_slic3r_version = 2.4.0-rc 1.4.2 Added SLA material profiles. 1.4.1 Updated firmware version. @@ -39,7 +34,6 @@ min_slic3r_version = 2.3.0-rc1 1.2.10 Added multiple profiles for Filatech filaments. Updated SLA print settings (pad wall slope angle). 1.2.9 Added material profiles for Prusament Resin. 1.2.8 Added multiple add:north and Extrudr filament profiles. ->>>>>>> master 1.2.7 Updated "Prusament PC Blend Carbon Fiber" profile for Prusa MINI. 1.2.6 Added filament profile for "Prusament PC Blend Carbon Fiber". 1.2.5 Updated firmware version. Added filament profiles. Various improvements. @@ -56,10 +50,7 @@ min_slic3r_version = 2.3.0-alpha4 1.2.0-alpha1 Renamed MK3S and MINI printer profiles. Updated end g-code (MINI). Added new SLA materials and filament profiles. 1.2.0-alpha0 Added filament spool weights min_slic3r_version = 2.2.0-alpha3 -<<<<<<< HEAD -======= 1.1.15 Updated firmware version. ->>>>>>> master 1.1.14 Updated firmware version. 1.1.13 Updated firmware version. Updated end g-code in MMU2 printer profiles. 1.1.12 Added Prusament PVB filament profile. Added 0.8mm nozzle profiles. |