Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_imgui_slideret_imgui_slider

5 files changed, 297 insertions, 22 deletions

diff --git a/build_win.bat b/build_win.bat
index c03ebf039..a5af27609 100644
--- a/build_win.bat
+++ b/build_win.bat
@@ -160,7 +160,10 @@ REM Build deps
 :BUILD_DEPS

 SET EXIT_STATUS=3

 SET PS_CURRENT_STEP=deps

-IF "%PS_STEPS_DIRTY%" EQU "" CALL :MAKE_OR_CLEAN_DIRECTORY deps\build "%PS_DEPS_PATH_FILE_NAME%" .vs

+IF "%PS_STEPS_DIRTY%" EQU "" (

+    CALL :MAKE_OR_CLEAN_DIRECTORY deps\build "%PS_DEPS_PATH_FILE_NAME%" .vs

+    CALL :MAKE_OR_CLEAN_DIRECTORY "%PS_DESTDIR%"

+)

 cd deps\build || GOTO :END

 cmake.exe .. -DDESTDIR="%PS_DESTDIR%"

 IF %ERRORLEVEL% NEQ 0 IF "%PS_STEPS_DIRTY%" NEQ "" (

@@ -203,8 +206,8 @@ IF "%PS_CURRENT_STEP%" NEQ "arguments" (
 )

 SET EXIT_STATUS=5

 SET PS_CURRENT_STEP=run

-cd src\%PS_CONFIG% || GOTO :END

 IF "%PS_RUN%" EQU "none" GOTO :PROLOGUE

+cd src\%PS_CONFIG% || GOTO :END

 SET PS_PROJECT_IS_OPEN=

 FOR /F "tokens=2 delims=," %%I in (

     'tasklist /V /FI "IMAGENAME eq devenv.exe " /NH /FO CSV ^| find "%PS_SOLUTION_NAME%"'

diff --git a/resources/profiles/PrusaResearch.idx b/resources/profiles/PrusaResearch.idx
index f73bedebf..34d0c0958 100644
--- a/resources/profiles/PrusaResearch.idx
+++ b/resources/profiles/PrusaResearch.idx
@@ -1,4 +1,5 @@
 min_slic3r_version = 2.4.0-beta0
+1.4.0-beta2 Added SLA material colors. Updated BASF filament profiles.
 1.4.0-beta1 Updated pad wall slope angle for SLA printers. Updated Filatech Filacarbon profile for Prusa MINI. 
 1.4.0-beta0 Added multiple Filatech and BASF filament profiles. Added material profiles for SL1S.
 min_slic3r_version = 2.4.0-alpha0
diff --git a/resources/profiles/PrusaResearch.ini b/resources/profiles/PrusaResearch.ini
index 25ce1c270..27d80b533 100644
--- a/resources/profiles/PrusaResearch.ini
+++ b/resources/profiles/PrusaResearch.ini
@@ -5,7 +5,7 @@
 name = Prusa Research

 # Configuration version of this file. Config file will only be installed, if the config_version differs.

 # This means, the server may force the PrusaSlicer configuration to be downgraded.

-config_version = 1.4.0-beta1

+config_version = 1.4.0-beta2

 # Where to get the updates from?

 config_update_url = https://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/PrusaResearch/

 changelog_url = https://files.prusa3d.com/?latest=slicer-profiles&lng=%1%

@@ -2925,9 +2925,14 @@ bridge_fan_speed = 100
 filament_type = PET

 disable_fan_first_layers = 1

 full_fan_speed_layer = 3

+

+filament_notes = "BASF Forward AM Ultrafuse PET\nMaterial profile version 1.0\n\nMaterial Description\nUltrafuse PET is made from a premium PET and prints as easy as PLA, but is much stronger. The filament has a large operating window for printing (temperature vs. speed), so it can be used on every 3D-printer. PET will give you outstanding printing results: a good layer adhesion, a high resolution and it is easy to handle. Ultrafuse PET can be 100% recycled, is watertight and has great colors and finish.\n\nPrinting Recommendations:\nUltrafuse PET can be printed directly onto a clean build plate. For challenging prints, use 3dLac to improve adhesion.\n"

+filament_retract_length = 2

+filament_retract_speed = 40

+filament_retract_before_travel = 2

+filament_wipe = 0

+filament_retract_layer_change = 0

 filament_retract_lift = 0

-# filament_retract_length = 3

-# filament_max_volumetric_speed = 7

 

 [filament:Ultrafuse PET @MINI]

 inherits = Ultrafuse PET; *PETMINI*

@@ -2939,11 +2944,21 @@ filament_cost =
 filament_density = 1.25

 filament_spool_weight = 0

 filament_colour = #FFFFFF

-# filament overrides

-# filament_retract_length = 2

-# filament_retract_speed = 40

-# filament_retract_before_travel = 2

-# filament_wipe = 0

+filament_notes = "BASF Forward AM Ultrafuse PLA PRO1\nMaterial profile version 1.0\n\nMaterial Description\nPLA PRO1 is an extremely versatile tough PLA filament made for professionals. It reduces your printing time by 30% – 80%, (subject to printer and object limitations) and the strength exceeds overall mechanical properties of printed ABS parts. Printer settings can be tuned to achieve blazing fast speeds or an unrivaled surface finish. The excellent quality control ensures the highest levels of consistency between colors and batches, it will perform as expected, every time.\n\nPrinting Recommendations:\nUltrafuse PLA PRO1 can be printed directly onto a clean build plate.\n"

+filament_retract_length = 2

+filament_retract_lift = 0

+filament_retract_speed = 40

+filament_retract_before_travel = 2

+filament_retract_layer_change = 0

+compatible_printers_condition = printer_model!="MINI" and printer_model!="MK2SMM" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material)

+

+[filament:Ultrafuse PRO1 @MINI]

+inherits = Ultrafuse PRO1

+filament_retract_length = nil

+filament_retract_speed = nil

+filament_retract_before_travel = nil

+filament_retract_layer_change = nil

+compatible_printers_condition = printer_model=="MINI"

 

 [filament:Ultrafuse ABS]

 inherits = *ABSC*

@@ -2955,17 +2970,19 @@ max_fan_speed = 20
 bed_temperature = 100

 disable_fan_first_layers = 3

 filament_colour = #FFFFFF

-# filament overrides

-# filament_retract_length = 2

-# filament_retract_speed = 40

-# filament_retract_before_travel = 2

-# filament_wipe = 0

+filament_notes = "BASF Forward AM Ultrafuse ABS\nMaterial profile version 1.0\n\nMaterial Description\nABS is the second most used 3D printing material. It is strong, flexible and has a high heat resistance. ABS is a preferred plastic for engineers and professional applications. ABS can be smoothened with acetone. To make a proper 3D print with ABS you will need a heated print bed. The filament is available in 9 colors.\n\nPrinting Recommendations:\n\nApply Tape, adhesion spray or glue to a clean build plate to improve adhesion.\n"

+filament_retract_length = 2

+filament_retract_speed = 40

+filament_retract_before_travel = 2

+filament_wipe = 0

+filament_retract_layer_change = 0

 

 [filament:Ultrafuse ABS @MINI]

 inherits = Ultrafuse ABS; *ABSMINI*

 

-[filament:Ultrafuse 17-4 PH]

+[filament:Ultrafuse Metal]

 inherits = *ABSC*

+renamed_from = "Ultrafuse 17-4 PH"

 filament_vendor = BASF

 filament_cost = 

 filament_density = 4.5

@@ -4607,6 +4624,7 @@ exposure_time = 12
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = 3DM

+material_colour = #FF8040

 

 [sla_material:3DM-Vulcan Gold @0.025]

 inherits = *common 0.025*

@@ -4614,6 +4632,7 @@ exposure_time = 12
 initial_exposure_time = 30

 material_type = Tough

 material_vendor = 3DM

+material_colour = #B0B000

 

 [sla_material:3DM-TOUGH Clear @0.025]

 inherits = *common 0.025*

@@ -4621,6 +4640,7 @@ exposure_time = 9
 initial_exposure_time = 30

 material_type = Tough

 material_vendor = 3DM

+material_colour = #F8F8F8

 

 [sla_material:3DM-HR Red Wine @0.025]

 inherits = *common 0.025*

@@ -4628,6 +4648,7 @@ exposure_time = 14
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = 3DM

+material_colour = #EC0000

 

 [sla_material:BlueCast Phrozen Wax @0.025]

 inherits = *common 0.025*

@@ -4635,6 +4656,7 @@ exposure_time = 15
 initial_exposure_time = 50

 material_type = Tough

 material_vendor = BlueCast

+material_colour = #007EFD

 

 [sla_material:BlueCast Castable Wax @0.025]

 inherits = *common 0.025*

@@ -4642,6 +4664,7 @@ exposure_time = 8
 initial_exposure_time = 35

 material_type = Casting

 material_vendor = BlueCast

+material_colour = #007EFD

 

 [sla_material:BlueCast EcoGray @0.025]

 inherits = *common 0.025*

@@ -4649,6 +4672,7 @@ exposure_time = 6
 initial_exposure_time = 40

 material_type = Tough

 material_vendor = BlueCast

+material_colour = #808080

 

 [sla_material:BlueCast Kera Master Dental @0.025]

 inherits = *common 0.025*

@@ -4656,6 +4680,7 @@ exposure_time = 6
 initial_exposure_time = 45

 material_type = Dental

 material_vendor = BlueCast

+material_colour = #B0B000

 

 [sla_material:BlueCast Model Dental Gray @0.025]

 inherits = *common 0.025*

@@ -4663,6 +4688,7 @@ exposure_time = 6
 initial_exposure_time = 35

 material_type = Dental

 material_vendor = BlueCast

+material_colour = #C0C0C0

 

 [sla_material:BlueCast X10 @0.025]

 inherits = *common 0.025*

@@ -4670,6 +4696,7 @@ exposure_time = 4
 initial_exposure_time = 100

 material_type = Tough

 material_vendor = BlueCast

+material_colour = #007EFD

 

 [sla_material:DruckWege Type D High Temp @0.025]

 inherits = *common 0.025*

@@ -4677,6 +4704,7 @@ exposure_time = 6
 initial_exposure_time = 20

 material_type = Tough

 material_vendor = DruckWege

+material_colour = #E800E8

 

 [sla_material:Esun Bio-Photopolymer Resin White @0.025]

 inherits = *common 0.025*

@@ -4684,6 +4712,7 @@ exposure_time = 5
 initial_exposure_time = 30

 material_type = Tough

 material_vendor = Esun

+material_colour = #FFFFFF

 

 [sla_material:FunToDo Castable Blend Red @0.025]

 inherits = *common 0.025*

@@ -4691,6 +4720,7 @@ exposure_time = 10
 initial_exposure_time = 35

 material_type = Casting

 material_vendor = FunToDo

+material_colour = #EC0000

 

 [sla_material:FunToDo Snow White @0.025]

 inherits = *common 0.025*

@@ -4698,6 +4728,7 @@ exposure_time = 7
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = FunToDo

+material_colour = #FFFFFF

 

 [sla_material:Harz Labs Basic Resin Red @0.025]

 inherits = *common 0.025*

@@ -4705,6 +4736,7 @@ exposure_time = 10
 initial_exposure_time = 20

 material_type = Tough

 material_vendor = Harz Labs

+material_colour = #EC0000

 

 [sla_material:Harz Labs Model Resin Cherry @0.025]

 inherits = *common 0.025*

@@ -4712,6 +4744,7 @@ exposure_time = 10
 initial_exposure_time = 20

 material_type = Tough

 material_vendor = Harz Labs

+material_colour = #EC0000

 

 [sla_material:Harz Labs Model Resin Black @0.025]

 inherits = *common 0.025*

@@ -4719,6 +4752,7 @@ exposure_time = 10
 initial_exposure_time = 20

 material_type = Tough

 material_vendor = Harz Labs

+material_colour = #007EFD

 

 [sla_material:Harz Labs Dental Cast Red @0.025]

 inherits = *common 0.025*

@@ -4726,6 +4760,7 @@ exposure_time = 10
 initial_exposure_time = 20

 material_type = Dental

 material_vendor = Harz Labs

+material_colour = #EC0000

 

 [sla_material:Esun Standard Resin Black @0.025]

 inherits = *common 0.025*

@@ -4733,6 +4768,7 @@ exposure_time = 6
 initial_exposure_time = 30

 material_type = Tough

 material_vendor = Esun

+material_colour = #007EFD

 

 [sla_material:Photocentric Ash Grey @0.025]

 inherits = *common 0.025*

@@ -4740,6 +4776,7 @@ exposure_time = 9
 initial_exposure_time = 30

 material_type = Tough

 material_vendor = Photocentric

+material_colour = #C0C0C0

 

 [sla_material:Resinworks 3D Violet @0.025]

 inherits = *common 0.025*

@@ -4747,6 +4784,7 @@ exposure_time = 15
 initial_exposure_time = 30

 material_type = Tough

 material_vendor = Resinworks 3D

+material_colour = #E800E8

 

 [sla_material:Resinworks 3D Green @0.025]

 inherits = *common 0.025*

@@ -4754,6 +4792,7 @@ exposure_time = 17
 initial_exposure_time = 30

 material_type = Tough

 material_vendor = Resinworks 3D

+material_colour = #00B900

 

 [sla_material:Monocure 3D Black Rapid Resin @0.025]

 inherits = *common 0.025*

@@ -4761,6 +4800,7 @@ exposure_time = 4
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Monocure

+material_colour = #007EFD

 

 [sla_material:Monocure 3D Blue Rapid Resin @0.025]

 inherits = *common 0.025*

@@ -4768,6 +4808,7 @@ exposure_time = 4
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Monocure

+material_colour = #007EFD

   

 ## Prusa Polymers 0.025

 

@@ -4777,6 +4818,7 @@ exposure_time = 5
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Prusa Polymers

+material_colour = #FF8040

 

 [sla_material:Prusament Resin Tough Rich Black @0.025]

 inherits = *common 0.025*

@@ -4784,6 +4826,7 @@ exposure_time = 5
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Prusa Polymers

+material_colour = #007EFD

 

 [sla_material:Prusament Resin Tough Anthracite Grey @0.025]

 inherits = *common 0.025*

@@ -4791,6 +4834,7 @@ exposure_time = 6
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Prusa Polymers

+material_colour = #808080

   

 ## Prusa 0.025

   

@@ -4800,6 +4844,7 @@ exposure_time = 6
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FF8040

 

 [sla_material:Prusa Grey Tough @0.025]

 inherits = *common 0.025*

@@ -4807,6 +4852,7 @@ exposure_time = 7
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FF8040

 

 [sla_material:Prusa Azure Blue Tough @0.025]

 inherits = *common 0.025*

@@ -4814,6 +4860,7 @@ exposure_time = 7
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #007EFD

 

 ## [sla_material:Prusa Blue Tough @0.025]

 ## inherits = *common 0.025*

@@ -4828,6 +4875,7 @@ exposure_time = 6
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #804000

 

 [sla_material:Prusa Beige Tough @0.025]

 inherits = *common 0.025*

@@ -4835,6 +4883,7 @@ exposure_time = 6
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FFEEE6

 

 [sla_material:Prusa Pink Tough @0.025]

 inherits = *common 0.025*

@@ -4842,6 +4891,7 @@ exposure_time = 7
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FF80C0

 

 [sla_material:Prusa White Tough @0.025]

 inherits = *common 0.025*

@@ -4849,6 +4899,7 @@ exposure_time = 6.5
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FFFFFF

 

 [sla_material:Prusa Transparent Tough @0.025]

 inherits = *common 0.025*

@@ -4856,6 +4907,7 @@ exposure_time = 6
 initial_exposure_time = 15

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #F8F8F8

 

 [sla_material:Prusa Green Dental Casting @0.025]

 inherits = *common 0.025*

@@ -4863,6 +4915,7 @@ exposure_time = 12
 initial_exposure_time = 40

 material_type = Casting

 material_vendor = Made for Prusa

+material_colour = #00B900

 

 [sla_material:Prusa Transparent Green Tough @0.025]

 inherits = *common 0.025*

@@ -4870,6 +4923,7 @@ exposure_time = 5
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #00B900

 

 [sla_material:Prusa Clear ABS like @0.025]

 inherits = *common 0.025*

@@ -4877,6 +4931,7 @@ exposure_time = 6
 initial_exposure_time = 30

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #F8F8F8

 

 [sla_material:Prusa White ABS like @0.025]

 inherits = *common 0.025*

@@ -4884,6 +4939,7 @@ exposure_time = 5
 initial_exposure_time = 30

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FFFFFF

 

 [sla_material:Prusa Grey High Tenacity @0.025]

 inherits = *common 0.025*

@@ -4891,6 +4947,7 @@ exposure_time = 5
 initial_exposure_time = 30

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #C0C0C0

 

 [sla_material:Prusa Super Low Odor Cyan Tough @0.025]

 inherits = *common 0.025*

@@ -4898,6 +4955,7 @@ exposure_time = 5
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #007EFD

 

 [sla_material:Prusa Super Low Odor Magenta Tough @0.025]

 inherits = *common 0.025*

@@ -4905,6 +4963,7 @@ exposure_time = 5
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #E800E8

 

 [sla_material:Prusa Super Low Odor Yellow Tough @0.025]

 inherits = *common 0.025*

@@ -4912,6 +4971,7 @@ exposure_time = 5
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FFFF6F

 

 [sla_material:Prusa Orange-Yellow Teeth Model @0.025]

 inherits = *common 0.025*

@@ -4919,6 +4979,7 @@ exposure_time = 5
 initial_exposure_time = 30

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FFFF6F

 

 [sla_material:Prusa Vibrant Orange Tough @0.025]

 inherits = *common 0.025*

@@ -4926,6 +4987,7 @@ exposure_time = 6
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FF8040

 

 [sla_material:Prusa Rich Black Tough @0.025]

 inherits = *common 0.025*

@@ -4933,6 +4995,7 @@ exposure_time = 5
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #007EFD

 

 [sla_material:Prusa Deep Blue Transparent Tough @0.025]

 inherits = *common 0.025*

@@ -4940,6 +5003,7 @@ exposure_time = 5
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #F8F8F8

 

 [sla_material:Prusa Yellow Jewelry Casting @0.025]

 inherits = *common 0.025*

@@ -4947,6 +5011,7 @@ exposure_time = 8
 initial_exposure_time = 45

 material_type = Casting

 material_vendor = Made for Prusa

+material_colour = #FFFF6F

 

 [sla_material:Siraya Tech Simple Clear @0.025]

 inherits = *common 0.025*

@@ -4954,6 +5019,7 @@ exposure_time = 8
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Siraya Tech

+material_colour = #F8F8F8

 

 [sla_material:Siraya Tech Blu Clear V2 @0.025]

 inherits = *common 0.025*

@@ -4961,6 +5027,7 @@ exposure_time = 9
 initial_exposure_time = 30

 material_type = Tough

 material_vendor = Siraya Tech

+material_colour = #F8F8F8

 

 [sla_material:Siraya Tech Blu Blue @0.025]

 inherits = *common 0.025*

@@ -4968,6 +5035,7 @@ exposure_time = 6
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Siraya Tech

+material_colour = #007EFD

 

 [sla_material:Siraya Tech Fast Grey @0.025]

 inherits = *common 0.025*

@@ -4975,6 +5043,7 @@ exposure_time = 6
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Siraya Tech

+material_colour = #C0C0C0

 

 [sla_material:Siraya Tech Tenacious @0.025]

 inherits = *common 0.025*

@@ -4982,6 +5051,7 @@ exposure_time = 6
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Siraya Tech

+material_colour = #F8F8F8

 

 [sla_material:Siraya Tech Easy @0.025]

 inherits = *common 0.025*

@@ -4989,6 +5059,7 @@ exposure_time = 11
 initial_exposure_time = 15

 material_type = Tough

 material_vendor = Siraya Tech

+material_colour = #F8F8F8

 

 [sla_material:Siraya Tech Sculpt @0.025]

 inherits = *common 0.025*

@@ -4996,6 +5067,7 @@ exposure_time = 7
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Siraya Tech

+material_colour = #C0C0C0

 

 [sla_material:Siraya Tech Fast Black @0.025]

 inherits = *common 0.025*

@@ -5003,6 +5075,7 @@ exposure_time = 6
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Siraya Tech

+material_colour = #007EFD

 

 [sla_material:NextDent Model 2.0 Grey @0.025]

 inherits = *common 0.025*

@@ -5010,6 +5083,7 @@ exposure_time = 14
 initial_exposure_time = 35

 material_type = Dental

 material_vendor = NextDent

+material_colour = #808080

 

 [sla_material:NextDent Surgical Guide @0.025]

 inherits = *common 0.025*

@@ -5017,6 +5091,7 @@ exposure_time = 6
 initial_exposure_time = 35

 material_type = Dental

 material_vendor = NextDent

+material_colour = #FF8040

 

 [sla_material:NextDent Cast Purple @0.025]

 inherits = *common 0.025*

@@ -5024,6 +5099,7 @@ exposure_time = 7
 initial_exposure_time = 20

 material_type = Casting

 material_vendor = NextDent

+material_colour = #E800E8

 

 [sla_material:MakerJuice Labs Standard Red @0.025]

 inherits = *common 0.025*

@@ -5031,6 +5107,7 @@ exposure_time = 9
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = MakerJuice Labs

+material_colour = #EC0000

 

 [sla_material:3DJake High Precision Grey @0.025]

 inherits = *common 0.025*

@@ -5038,6 +5115,7 @@ exposure_time = 8.5
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = 3DJake

+material_colour = #C0C0C0

 

 [sla_material:3DJake High Precision Blue @0.025]

 inherits = *common 0.025*

@@ -5045,6 +5123,7 @@ exposure_time = 6.5
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = 3DJake

+material_colour = #007EFD

 

 [sla_material:Zortrax Black @0.025]

 inherits = *common 0.025*

@@ -5052,6 +5131,7 @@ exposure_time = 4
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Zortrax

+material_colour = #007EFD

 

 ########### Materials 0.05

 

@@ -5061,6 +5141,7 @@ exposure_time = 15
 initial_exposure_time = 30

 material_type = Dental

 material_vendor = Asiga

+material_colour = #FFEEE6

 

 [sla_material:Asiga PlasGRAY @0.05]

 inherits = *common 0.05*

@@ -5068,6 +5149,7 @@ exposure_time = 29
 initial_exposure_time = 60

 material_type = Tough

 material_vendor = Asiga

+material_colour = #C0C0C0

 

 [sla_material:Ameralabs AMD 3 LED @0.05]

 inherits = *common 0.05*

@@ -5075,6 +5157,7 @@ exposure_time = 5
 initial_exposure_time = 30

 material_type = Tough

 material_vendor = Ameralabs

+material_colour = #808080

 

 [sla_material:BlueCast EcoGray @0.05]

 inherits = *common 0.05*

@@ -5082,6 +5165,7 @@ exposure_time = 7
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = BlueCast

+material_colour = #808080

 

 [sla_material:BlueCast Kera Master Dental @0.05]

 inherits = *common 0.05*

@@ -5089,6 +5173,7 @@ exposure_time = 7
 initial_exposure_time = 50

 material_type = Dental

 material_vendor = BlueCast

+material_colour = #FFEEE6

 

 [sla_material:BlueCast Model Dental Gray @0.05]

 inherits = *common 0.05*

@@ -5096,6 +5181,7 @@ exposure_time = 8
 initial_exposure_time = 35

 material_type = Dental

 material_vendor = BlueCast

+material_colour = #C0C0C0

 

 [sla_material:BlueCast LCD-DLP Original @0.05]

 inherits = *common 0.05*

@@ -5103,6 +5189,7 @@ exposure_time = 10
 initial_exposure_time = 60

 material_type = Tough

 material_vendor = BlueCast

+material_colour = #007EFD

 

 [sla_material:BlueCast Phrozen Wax @0.05]

 inherits = *common 0.05*

@@ -5110,6 +5197,7 @@ exposure_time = 16
 initial_exposure_time = 50

 material_type = Tough

 material_vendor = BlueCast

+material_colour = #007EFD

 

 [sla_material:BlueCast Castable Wax @0.05]

 inherits = *common 0.05*

@@ -5117,6 +5205,7 @@ exposure_time = 11
 initial_exposure_time = 35

 material_type = Casting

 material_vendor = BlueCast

+material_colour = #E800E8

 

 [sla_material:BlueCast S+ @0.05]

 inherits = *common 0.05*

@@ -5124,6 +5213,7 @@ exposure_time = 9
 initial_exposure_time = 45

 material_type = Tough

 material_vendor = BlueCast

+material_colour = #00B900

 

 [sla_material:BlueCast X5 @0.05]

 inherits = *common 0.05*

@@ -5131,6 +5221,7 @@ exposure_time = 9
 initial_exposure_time = 100

 material_type = Tough

 material_vendor = BlueCast

+material_colour = #007EFD

 

 [sla_material:BlueCast X10 @0.05]

 inherits = *common 0.05*

@@ -5138,6 +5229,7 @@ exposure_time = 6
 initial_exposure_time = 100

 material_type = Tough

 material_vendor = BlueCast

+material_colour = #007EFD

 

 [sla_material:BlueCast 23LS @0.05]

 inherits = *common 0.05*

@@ -5145,6 +5237,7 @@ exposure_time = 8
 initial_exposure_time = 50

 material_type = Tough

 material_vendor = BlueCast

+material_colour = #007EFD

 

 [sla_material:DruckWege Type D High Temp @0.05]

 inherits = *common 0.05*

@@ -5152,6 +5245,7 @@ exposure_time = 10
 initial_exposure_time = 20

 material_type = Tough

 material_vendor = DruckWege

+material_colour = #E800E8

 

 [sla_material:Monocure 3D Black Rapid Resin @0.05]

 inherits = *common 0.05*

@@ -5159,6 +5253,7 @@ exposure_time = 6
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Monocure

+material_colour = #007EFD

 

 [sla_material:Monocure 3D Blue Rapid Resin @0.05]

 inherits = *common 0.05*

@@ -5166,6 +5261,7 @@ exposure_time = 7
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Monocure

+material_colour = #007EFD

 

 [sla_material:Monocure 3D Clear Rapid Resin @0.05]

 inherits = *common 0.05*

@@ -5173,6 +5269,7 @@ exposure_time = 8
 initial_exposure_time = 40

 material_type = Tough

 material_vendor = Monocure

+material_colour = #F8F8F8

 

 [sla_material:Monocure 3D Grey Rapid Resin @0.05]

 inherits = *common 0.05*

@@ -5180,6 +5277,7 @@ exposure_time = 10
 initial_exposure_time = 30

 material_type = Tough

 material_vendor = Monocure

+material_colour = #C0C0C0

 

 [sla_material:Monocure 3D White Rapid Resin @0.05]

 inherits = *common 0.05*

@@ -5187,6 +5285,7 @@ exposure_time = 10
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Monocure

+material_colour = #FFFFFF

 

 [sla_material:3DM-HTR140 (high temperature) @0.05]

 inherits = *common 0.05*

@@ -5194,6 +5293,7 @@ exposure_time = 12
 initial_exposure_time = 45

 material_type = Tough

 material_vendor = Monocure

+material_colour = #EC0000

 

 [sla_material:Esun Bio-Photopolymer Resin White @0.05]

 inherits = *common 0.05*

@@ -5201,6 +5301,7 @@ exposure_time = 8
 initial_exposure_time = 30

 material_type = Tough

 material_vendor = Esun

+material_colour = #FFFFFF

 

 [sla_material:Esun Standard Resin Black @0.05]

 inherits = *common 0.05*

@@ -5208,6 +5309,7 @@ exposure_time = 7
 initial_exposure_time = 30

 material_type = Tough

 material_vendor = Esun

+material_colour = #007EFD

 

 [sla_material:FunToDo Castable Blend Red @0.05]

 inherits = *common 0.05*

@@ -5215,6 +5317,7 @@ exposure_time = 15
 initial_exposure_time = 35

 material_type = Casting

 material_vendor = FunToDo

+material_colour = #EC0000

 

 [sla_material:FunToDo Industrial Blend Unpigmented @0.05]

 inherits = *common 0.05*

@@ -5222,6 +5325,7 @@ exposure_time = 4
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = FunToDo

+material_colour = #F8F8F8

 

 [sla_material:FunToDo Snow White @0.05]

 inherits = *common 0.05*

@@ -5229,6 +5333,7 @@ exposure_time = 10
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = FunToDo

+material_colour = #FFFFFF

 

 [sla_material:3DM-ABS @0.05]

 inherits = *common 0.05*

@@ -5236,6 +5341,7 @@ exposure_time = 13
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = 3DM

+material_colour = #FF8040

 

 [sla_material:3DM-BLACK @0.05]

 inherits = *common 0.05*

@@ -5243,6 +5349,7 @@ exposure_time = 20
 initial_exposure_time = 40

 material_type = Tough

 material_vendor = 3DM

+material_colour = #007EFD

 

 [sla_material:3DM-DENT @0.05]

 inherits = *common 0.05*

@@ -5250,6 +5357,7 @@ exposure_time = 7
 initial_exposure_time = 45

 material_type = Dental

 material_vendor = 3DM

+material_colour = #FFEEE6

 

 [sla_material:3DM-HR Green @0.05]

 inherits = *common 0.05*

@@ -5257,6 +5365,7 @@ exposure_time = 15
 initial_exposure_time = 40

 material_type = Tough

 material_vendor = 3DM

+material_colour = #00B900

 

 [sla_material:3DM-HR Red Wine @0.05]

 inherits = *common 0.05*

@@ -5264,6 +5373,7 @@ exposure_time = 18
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = 3DM

+material_colour = #EC0000

 

 [sla_material:3DM-XPRO White @0.05]

 inherits = *common 0.05*

@@ -5271,6 +5381,7 @@ exposure_time = 9
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = 3DM

+material_colour = #FFFFFF

 

 [sla_material:3DM-Vulcan Gold @0.05]

 inherits = *common 0.05*

@@ -5278,6 +5389,7 @@ exposure_time = 15
 initial_exposure_time = 30

 material_type = Tough

 material_vendor = 3DM

+material_colour = #B0B000

 

 [sla_material:3DM-TOUGH Clear @0.05]

 inherits = *common 0.05*

@@ -5285,6 +5397,7 @@ exposure_time = 15
 initial_exposure_time = 30

 material_type = Tough

 material_vendor = 3DM

+material_colour = #F8F8F8

 

 [sla_material:FunToDo Ash Grey @0.05]

 inherits = *common 0.05*

@@ -5292,6 +5405,7 @@ exposure_time = 9
 initial_exposure_time = 40

 material_type = Tough

 material_vendor = FunToDo

+material_colour = #808080

 

 [sla_material:Harz Labs Model Resin Cherry @0.05]

 inherits = *common 0.05*

@@ -5299,6 +5413,7 @@ exposure_time = 13
 initial_exposure_time = 20

 material_type = Tough

 material_vendor = Harz Labs

+material_colour = #EC0000

 

 [sla_material:Harz Labs Basic Resin Red @0.05]

 inherits = *common 0.05*

@@ -5306,6 +5421,7 @@ exposure_time = 13
 initial_exposure_time = 20

 material_type = Tough

 material_vendor = Harz Labs

+material_colour = #EC0000

 

 [sla_material:Harz Labs Model Resin Black @0.05]

 inherits = *common 0.05*

@@ -5313,6 +5429,7 @@ exposure_time = 13
 initial_exposure_time = 20

 material_type = Tough

 material_vendor = Harz Labs

+material_colour = #007EFD

 

 [sla_material:Harz Labs Dental Cast Red @0.05]

 inherits = *common 0.05*

@@ -5320,6 +5437,7 @@ exposure_time = 13
 initial_exposure_time = 20

 material_type = Dental

 material_vendor = Harz Labs

+material_colour = #EC0000

 

 [sla_material:Resinworks 3D Violet @0.05]

 inherits = *common 0.05*

@@ -5327,6 +5445,7 @@ exposure_time = 17
 initial_exposure_time = 30

 material_type = Tough

 material_vendor = Resinworks 3D

+material_colour = #E800E8

 

 [sla_material:Resinworks 3D Green @0.05]

 inherits = *common 0.05*

@@ -5334,6 +5453,7 @@ exposure_time = 21
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Resinworks 3D

+material_colour = #00B900

 

 [sla_material:Photocentric Hard Grey @0.05]

 inherits = *common 0.05*

@@ -5341,6 +5461,7 @@ exposure_time = 15
 initial_exposure_time = 30

 material_type = Tough

 material_vendor = Photocentric

+material_colour = #808080

 

 [sla_material:Photocentric Ash Grey @0.05]

 inherits = *common 0.05*

@@ -5348,6 +5469,7 @@ exposure_time = 10
 initial_exposure_time = 30

 material_type = Tough

 material_vendor = Photocentric

+material_colour = #C0C0C0

 

 [sla_material:Siraya Tech Simple Clear @0.05]

 inherits = *common 0.05*

@@ -5355,6 +5477,7 @@ exposure_time = 10
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Siraya Tech

+material_colour = #F8F8F8

 

 [sla_material:Siraya Tech Blu Clear V2 @0.05]

 inherits = *common 0.05*

@@ -5362,6 +5485,7 @@ exposure_time = 10
 initial_exposure_time = 30

 material_type = Tough

 material_vendor = Siraya Tech

+material_colour = #F8F8F8

 

 [sla_material:Siraya Tech Blu Blue @0.05]

 inherits = *common 0.05*

@@ -5369,6 +5493,7 @@ exposure_time = 12
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Siraya Tech

+material_colour = #007EFD

 

 [sla_material:Siraya Tech Fast Grey @0.05]

 inherits = *common 0.05*

@@ -5376,6 +5501,7 @@ exposure_time = 10
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Siraya Tech

+material_colour = #C0C0C0

 

 [sla_material:Siraya Tech Tenacious @0.05]

 inherits = *common 0.05*

@@ -5383,6 +5509,7 @@ exposure_time = 8
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Siraya Tech

+material_colour = #F8F8F8

 

 [sla_material:Siraya Tech Easy @0.05]

 inherits = *common 0.05*

@@ -5390,6 +5517,7 @@ exposure_time = 12
 initial_exposure_time = 15

 material_type = Tough

 material_vendor = Siraya Tech

+material_colour = #F8F8F8

 

 [sla_material:Siraya Tech Sculpt @0.05]

 inherits = *common 0.05*

@@ -5397,6 +5525,7 @@ exposure_time = 8
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Siraya Tech

+material_colour = #C0C0C0

 

 [sla_material:Siraya Tech Fast Black @0.05]

 inherits = *common 0.05*

@@ -5404,6 +5533,7 @@ exposure_time = 9
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Siraya Tech

+material_colour = #007EFD

 

 [sla_material:NextDent Model 2.0 Grey @0.05]

 inherits = *common 0.05*

@@ -5411,6 +5541,7 @@ exposure_time = 12
 initial_exposure_time = 35

 material_type = Dental

 material_vendor = NextDent

+material_colour = #C0C0C0

 

 [sla_material:NextDent Surgical Guide @0.05]

 inherits = *common 0.05*

@@ -5418,6 +5549,7 @@ exposure_time = 7
 initial_exposure_time = 35

 material_type = Dental

 material_vendor = NextDent

+material_colour = #FFEEE6

 

 [sla_material:NextDent Cast Purple @0.05]

 inherits = *common 0.05*

@@ -5425,6 +5557,7 @@ exposure_time = 9
 initial_exposure_time = 20

 material_type = Casting

 material_vendor = NextDent

+material_colour = #E800E8

 

 [sla_material:NextDent Crown Bridge @0.05]

 inherits = *common 0.05*

@@ -5432,6 +5565,7 @@ exposure_time = 11
 initial_exposure_time = 35

 material_type = Dental

 material_vendor = NextDent

+material_colour = #FFFFFF

 

 [sla_material:MakerJuice Labs Standard Red @0.05]

 inherits = *common 0.05*

@@ -5439,6 +5573,7 @@ exposure_time = 10
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = MakerJuice Labs

+material_colour = #EC0000

 

 [sla_material:3DJake High Precision Grey @0.05]

 inherits = *common 0.05*

@@ -5446,6 +5581,7 @@ exposure_time = 9
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = 3DJake

+material_colour = #C0C0C0

 

 [sla_material:3DJake High Precision Blue @0.05]

 inherits = *common 0.05*

@@ -5453,6 +5589,7 @@ exposure_time = 7
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = 3DJake

+material_colour = #007EFD

 

 [sla_material:Dragon Resin Metalshine Metal Grey @0.05]

 inherits = *common 0.05*

@@ -5460,6 +5597,7 @@ exposure_time = 30
 initial_exposure_time = 50

 material_type = Tough

 material_vendor = Dragon Resin

+material_colour = #808080

 

 [sla_material:Dragon Resin Metalshine Dark Brass @0.05]

 inherits = *common 0.05*

@@ -5467,6 +5605,7 @@ exposure_time = 30
 initial_exposure_time = 50

 material_type = Tough

 material_vendor = Dragon Resin

+material_colour = #B0B000

 

 [sla_material:Dragon Resin Metalshine Brass @0.05]

 inherits = *common 0.05*

@@ -5474,6 +5613,7 @@ exposure_time = 30
 initial_exposure_time = 50

 material_type = Tough

 material_vendor = Dragon Resin

+material_colour = #B0B000

 

 [sla_material:Zortrax Black @0.05]

 inherits = *common 0.05*

@@ -5481,6 +5621,7 @@ exposure_time = 7
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Zortrax

+material_colour = #007EFD

 

 ## Prusa Polymers 0.05

 

@@ -5490,6 +5631,7 @@ exposure_time = 6
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Prusa Polymers

+material_colour = #FF8040

 

 [sla_material:Prusament Resin Tough Rich Black @0.05]

 inherits = *common 0.05*

@@ -5497,6 +5639,7 @@ exposure_time = 6
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Prusa Polymers

+material_colour = #007EFD

 

 [sla_material:Prusament Resin Tough Anthracite Grey @0.05]

 inherits = *common 0.05*

@@ -5504,6 +5647,7 @@ exposure_time = 7
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Prusa Polymers

+material_colour = #C0C0C0

 

 ## Prusa 0.05

 

@@ -5513,6 +5657,7 @@ exposure_time = 7
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour =

 

 [sla_material:Prusa Orange Tough @0.05]

 inherits = *common 0.05*

@@ -5520,6 +5665,7 @@ exposure_time = 7.5
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FFEEE6

 

 [sla_material:Prusa Grey Tough @0.05]

 inherits = *common 0.05*

@@ -5527,6 +5673,7 @@ exposure_time = 8.5
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #808080

 

 [sla_material:Prusa Black Tough @0.05]

 inherits = *common 0.05*

@@ -5534,6 +5681,7 @@ exposure_time = 6
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #007EFD

 

 ## [sla_material:Prusa Super Low Odor Beige Tough @0.05]

 ## inherits = *common 0.05*

@@ -5562,6 +5710,7 @@ exposure_time = 6
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour =

 

 [sla_material:Prusa Super Low Odor Magenta Tough @0.05]

 inherits = *common 0.05*

@@ -5569,6 +5718,7 @@ exposure_time = 6
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #E800E8

 

 [sla_material:Prusa Super Low Odor Yellow Tough @0.05]

 inherits = *common 0.05*

@@ -5576,6 +5726,7 @@ exposure_time = 6
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FFFF6F

 

 ## [sla_material:Prusa Black High Tenacity @0.05]

 ## inherits = *common 0.05*

@@ -5590,6 +5741,7 @@ exposure_time = 7
 initial_exposure_time = 30

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FFFF6F

 

 [sla_material:Prusa Green Dental Casting @0.05]

 inherits = *common 0.05*

@@ -5597,6 +5749,7 @@ exposure_time = 13
 initial_exposure_time = 50

 material_type = Casting

 material_vendor = Made for Prusa

+material_colour = #00B900

 

 ## [sla_material:Prusa Yellow Solid @0.05]

 ## inherits = *common 0.05*

@@ -5609,6 +5762,7 @@ exposure_time = 7.5
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FFFFFF

 

 [sla_material:Prusa Transparent Green Tough @0.05]

 inherits = *common 0.05*

@@ -5616,6 +5770,7 @@ exposure_time = 6
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #00B900

 

 [sla_material:Prusa Transparent Red Tough @0.05]

 inherits = *common 0.05*

@@ -5623,6 +5778,7 @@ exposure_time = 6
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #EC0000

 

 [sla_material:Prusa Maroon Tough @0.05]

 inherits = *common 0.05*

@@ -5630,6 +5786,7 @@ exposure_time = 7.5
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #804000

 

 [sla_material:Prusa Pink Tough @0.05]

 inherits = *common 0.05*

@@ -5637,6 +5794,7 @@ exposure_time = 8
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FF80C0

 

 [sla_material:Prusa Azure Blue Tough @0.05]

 inherits = *common 0.05*

@@ -5644,6 +5802,7 @@ exposure_time = 8
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #007EFD

 

 ## [sla_material:Prusa Blue Tough @0.05]

 ## inherits = *common 0.05*

@@ -5658,6 +5817,7 @@ exposure_time = 7
 initial_exposure_time = 15

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #F8F8F8

 

 ## [sla_material:Prusa Yellow Flexible @0.05]

 ## inherits = *common 0.05*

@@ -5670,6 +5830,7 @@ exposure_time = 5
 initial_exposure_time = 15

 material_type = Flexible

 material_vendor = Made for Prusa

+material_colour = #F8F8F8

 

 ## [sla_material:Prusa White Flexible @0.05]

 ## inherits = *common 0.05*

@@ -5682,6 +5843,7 @@ exposure_time = 5
 initial_exposure_time = 15

 material_type = Flexible

 material_vendor = Made for Prusa

+material_colour = #007EFD

 

 ## [sla_material:Prusa Black Flexible @0.05]

 ## inherits = *common 0.05*

@@ -5699,6 +5861,7 @@ exposure_time = 8
 initial_exposure_time = 30

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #F8F8F8

 

 [sla_material:Prusa White ABS like @0.05]

 inherits = *common 0.05*

@@ -5706,6 +5869,7 @@ exposure_time = 8
 initial_exposure_time = 30

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FFFFFF

 

 [sla_material:Prusa Yellow Jewelry Casting @0.05]

 inherits = *common 0.05*

@@ -5713,6 +5877,7 @@ exposure_time = 13
 initial_exposure_time = 45

 material_type = Casting

 material_vendor = Made for Prusa

+material_colour = #FFFF6F

 

 [sla_material:Prusa Grey High Tenacity @0.05]

 inherits = *common 0.05*

@@ -5720,6 +5885,7 @@ exposure_time = 7
 initial_exposure_time = 30

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #C0C0C0

 

 [sla_material:Prusa Vibrant Orange Tough @0.05]

 inherits = *common 0.05*

@@ -5727,6 +5893,7 @@ exposure_time = 7
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FF8040

 

 [sla_material:Prusa Rich Black Tough @0.05]

 inherits = *common 0.05*

@@ -5734,6 +5901,7 @@ exposure_time = 8
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #007EFD

 

 [sla_material:Prusa Deep Blue Transparent Tough @0.05]

 inherits = *common 0.05*

@@ -5741,6 +5909,7 @@ exposure_time = 8
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #007EFD

 

 ########### Materials 0.035

 

@@ -5750,6 +5919,7 @@ exposure_time = 6
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FF8040

 

 ########### Materials 0.1

 

@@ -5759,6 +5929,7 @@ exposure_time = 10
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = BlueCast

+material_colour = #C0C0C0

 

 [sla_material:BlueCast Kera Master Dental @0.1]

 inherits = *common 0.1*

@@ -5766,6 +5937,7 @@ exposure_time = 13
 initial_exposure_time = 50

 material_type = Tough

 material_vendor = BlueCast

+material_colour = #FFEEE6

 

 ## Prusa Polymers 0.1

 

@@ -5775,6 +5947,7 @@ exposure_time = 13
 initial_exposure_time = 45

 material_type = Tough

 material_vendor = Prusa Polymers

+material_colour = #FF8040

 

 [sla_material:Prusament Resin Tough Rich Black @0.1]

 inherits = *common 0.1*

@@ -5782,6 +5955,7 @@ exposure_time = 13
 initial_exposure_time = 45

 material_type = Tough

 material_vendor = Prusa Polymers

+material_colour = #007EFD

 

 [sla_material:Prusament Resin Tough Anthracite Grey @0.1]

 inherits = *common 0.1*

@@ -5789,6 +5963,7 @@ exposure_time = 14
 initial_exposure_time = 45

 material_type = Tough

 material_vendor = Prusa Polymers

+material_colour = #808080

 

 ## Prusa 0.1

 

@@ -5798,6 +5973,7 @@ exposure_time = 13
 initial_exposure_time = 45

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FF8040

 

 [sla_material:Prusa Beige Tough @0.1]

 inherits = *common 0.1*

@@ -5805,6 +5981,7 @@ exposure_time = 13
 initial_exposure_time = 45

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FFEEE6

 

 [sla_material:Prusa Pink Tough @0.1]

 inherits = *common 0.1*

@@ -5812,6 +5989,7 @@ exposure_time = 13
 initial_exposure_time = 45

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FF80C0

 

 [sla_material:Prusa Azure Blue Tough @0.1]

 inherits = *common 0.1*

@@ -5819,6 +5997,7 @@ exposure_time = 13
 initial_exposure_time = 45

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #007EFD

 

 [sla_material:Prusa Maroon Tough @0.1]

 inherits = *common 0.1*

@@ -5826,6 +6005,7 @@ exposure_time = 13
 initial_exposure_time = 45

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #804000

 

 [sla_material:Prusa White Tough @0.1]

 inherits = *common 0.1*

@@ -5833,6 +6013,7 @@ exposure_time = 13
 initial_exposure_time = 45

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FFFFFF

 

 [sla_material:Prusa Black Tough @0.1]

 inherits = *common 0.1*

@@ -5840,6 +6021,7 @@ exposure_time = 13
 initial_exposure_time = 55

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #007EFD

 

 [sla_material:Prusa Transparent Tough @0.1]

 inherits = *common 0.1*

@@ -5847,6 +6029,7 @@ exposure_time = 8
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #F8F8F8

 

 [sla_material:Prusa Green Dental Casting @0.1]

 inherits = *common 0.1*

@@ -5854,6 +6037,7 @@ exposure_time = 15
 initial_exposure_time = 50

 material_type = Casting

 material_vendor = Made for Prusa

+material_colour = #00B900

 

 [sla_material:Prusa Transparent Green Tough @0.1]

 inherits = *common 0.1*

@@ -5861,6 +6045,7 @@ exposure_time = 7
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #00B900

 

 [sla_material:Prusa Vibrant Orange Tough @0.1]

 inherits = *common 0.1*

@@ -5868,6 +6053,7 @@ exposure_time = 8
 initial_exposure_time = 35

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FF8040

 

 ## SL1S materials ##

 

@@ -5881,6 +6067,7 @@ exposure_time = 1.8
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Prusa Polymers

+material_colour = #FF8040

 

 [sla_material:Prusament Resin Tough Rich Black @0.025 SL1S]

 inherits = *0.025_sl1s*

@@ -5888,6 +6075,7 @@ exposure_time = 1.8
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Prusa Polymers

+material_colour = #007EFD

 

 [sla_material:Prusament Resin Tough Anthracite Grey @0.025 SL1S]

 inherits = *0.025_sl1s*

@@ -5895,6 +6083,7 @@ exposure_time = 2
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Prusa Polymers

+material_colour = #808080

 

 ## Made for Prusa 0.025

 

@@ -5904,6 +6093,7 @@ exposure_time = 1.8
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FF8040

 

 [sla_material:Prusa White ABS like @0.025 SL1S]

 inherits = *0.025_sl1s*

@@ -5911,6 +6101,7 @@ exposure_time = 1.8
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FFFFFF

 

 [sla_material:Prusa Azure Blue Tough @0.025 SL1S]

 inherits = *0.025_sl1s*

@@ -5918,6 +6109,7 @@ exposure_time = 1.8
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #007EFD

 

 [sla_material:Prusa Black Tough @0.025 SL1S]

 inherits = *0.025_sl1s*

@@ -5925,6 +6117,7 @@ exposure_time = 2
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #007EFD

 

 [sla_material:Prusa Cyan Tough @0.025 SL1S]

 inherits = *0.025_sl1s*

@@ -5932,6 +6125,7 @@ exposure_time = 1.8
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour =

 

 [sla_material:Prusa Magenta Tough @0.025 SL1S]

 inherits = *0.025_sl1s*

@@ -5939,6 +6133,7 @@ exposure_time = 1.8
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #E800E8

 

 [sla_material:Prusa Maroon Tough @0.025 SL1S]

 inherits = *0.025_sl1s*

@@ -5946,6 +6141,7 @@ exposure_time = 2
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #804000

 

 [sla_material:Prusa White Tough @0.025 SL1S]

 inherits = *0.025_sl1s*

@@ -5953,6 +6149,7 @@ exposure_time = 1.8
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FFFFFF

 

 [sla_material:Prusa Pink Tough @0.025 SL1S]

 inherits = *0.025_sl1s*

@@ -5960,6 +6157,7 @@ exposure_time = 1.8
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FF80C0

 

 [sla_material:Prusa Grey Tough @0.025 SL1S]

 inherits = *0.025_sl1s*

@@ -5967,6 +6165,7 @@ exposure_time = 2
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #C0C0C0

 

 [sla_material:Prusa Blue Flexible @0.025 SL1S]

 inherits = *0.025_sl1s*

@@ -5974,6 +6173,7 @@ exposure_time = 1.8
 initial_exposure_time = 25

 material_type = Flexible

 material_vendor = Made for Prusa

+material_colour = #007EFD

 

 [sla_material:Prusa Grey High Tenacity @0.025 SL1S]

 inherits = *0.025_sl1s*

@@ -5981,6 +6181,7 @@ exposure_time = 1.8
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #C0C0C0

 

 [sla_material:Prusa Vibrant Orange Tough @0.025 SL1S]

 inherits = *0.025_sl1s*

@@ -5988,6 +6189,7 @@ exposure_time = 4
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FF8040

 

 [sla_material:Prusa Deep Blue Transparent Tough @0.025 SL1S]

 inherits = *0.025_sl1s*

@@ -5995,6 +6197,7 @@ exposure_time = 4
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #007EFD

 

 [sla_material:Prusa Green Dental Casting @0.025 SL1S]

 inherits = *0.025_sl1s*

@@ -6002,6 +6205,7 @@ exposure_time = 3
 initial_exposure_time = 50

 material_type = Casting

 material_vendor = Made for Prusa

+material_colour = #00B900

 

 [sla_material:PrimaCreator Tough Light Grey @0.025 SL1S]

 inherits = *0.025_sl1s*

@@ -6009,6 +6213,7 @@ exposure_time = 1.8
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = PrimaCreator

+material_colour = #C0C0C0

 

 [sla_material:PrimaCreator Tough Clear @0.025 SL1S]

 inherits = *0.025_sl1s*

@@ -6016,6 +6221,7 @@ exposure_time = 1.8
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = PrimaCreator

+material_colour = #F8F8F8

 

 [sla_material:PrimaCreator Tough White @0.025 SL1S]

 inherits = *0.025_sl1s*

@@ -6023,6 +6229,7 @@ exposure_time = 1.8
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = PrimaCreator

+material_colour = #FFFFFF

 

 [sla_material:PrimaCreator Flex Clear @0.025 SL1S]

 inherits = *0.025_sl1s*

@@ -6030,6 +6237,7 @@ exposure_time = 1.8
 initial_exposure_time = 25

 material_type = Flexible

 material_vendor = PrimaCreator

+material_colour = #F8F8F8

 

 [sla_material:PrimaCreator Water Washable Transparent @0.025 SL1S]

 inherits = *0.025_sl1s*

@@ -6037,6 +6245,7 @@ exposure_time = 1.8
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = PrimaCreator

+material_colour = #F8F8F8

 

 [sla_material:DruckWege Type D Dental Model @0.025 SL1S]

 inherits = *0.025_sl1s*

@@ -6044,6 +6253,7 @@ exposure_time = 1.2
 initial_exposure_time = 15

 material_type = Dental

 material_vendor = DruckWege

+material_colour = #FFEEE6

 

 [sla_material:DruckWege Type D Standard White @0.025 SL1S]

 inherits = *0.025_sl1s*

@@ -6051,6 +6261,7 @@ exposure_time = 1.6
 initial_exposure_time = 15

 material_type = Tough

 material_vendor = DruckWege

+material_colour = #FFFFFF

 

 [sla_material:DruckWege Type D Standard Pigmentfrei Clear @0.025 SL1S]

 inherits = *0.025_sl1s*

@@ -6058,6 +6269,7 @@ exposure_time = 1.8
 initial_exposure_time = 15

 material_type = Tough

 material_vendor = DruckWege

+material_colour = #F8F8F8

 

 [sla_material:3DM-ABS Orange @0.025 SL1S]

 inherits = *0.025_sl1s*

@@ -6065,6 +6277,7 @@ exposure_time = 1.8
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = 3DM

+material_colour = #FF8040

 

 [sla_material:3DM-TOUGH Clear @0.025 SL1S]

 inherits = *0.025_sl1s*

@@ -6072,6 +6285,7 @@ exposure_time = 1.8
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = 3DM

+material_colour = #F8F8F8

 

 [sla_material:Peopoly Deft White @0.025 SL1S]

 inherits = *0.025_sl1s*

@@ -6079,6 +6293,7 @@ exposure_time = 1.8
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Peopoly

+material_colour = #FFFFFF

 

 [sla_material:Peopoly Neo Clear @0.025 SL1S]

 inherits = *0.025_sl1s*

@@ -6086,6 +6301,7 @@ exposure_time = 1.8
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Peopoly

+material_colour = #F8F8F8

 

 ## 0.05 SL1S

 

@@ -6097,6 +6313,7 @@ exposure_time = 2
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Prusa Polymers

+material_colour = #FF8040

 

 [sla_material:Prusament Resin Tough Rich Black @0.05 SL1S]

 inherits = *0.05_sl1s*

@@ -6104,6 +6321,7 @@ exposure_time = 2
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Prusa Polymers

+material_colour = #007EFD

 

 [sla_material:Prusament Resin Tough Anthracite Grey @0.05 SL1S]

 inherits = *0.05_sl1s*

@@ -6111,6 +6329,7 @@ exposure_time = 2.4
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Prusa Polymers

+material_colour = #808080

 

 ## Made for Prusa 0.05

 

@@ -6120,6 +6339,7 @@ exposure_time = 2
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FF8040

 

 [sla_material:Prusa White ABS like @0.05 SL1S]

 inherits = *0.05_sl1s*

@@ -6127,6 +6347,7 @@ exposure_time = 2
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FFFFFF

 

 [sla_material:Prusa Azure Blue Tough @0.05 SL1S]

 inherits = *0.05_sl1s*

@@ -6134,6 +6355,7 @@ exposure_time = 2
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #007EFD

 

 [sla_material:Prusa Black Tough @0.05 SL1S]

 inherits = *0.05_sl1s*

@@ -6141,6 +6363,7 @@ exposure_time = 2.4
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #007EFD

 

 [sla_material:Prusa Cyan Tough @0.05 SL1S]

 inherits = *0.05_sl1s*

@@ -6148,6 +6371,7 @@ exposure_time = 2
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour =

 

 [sla_material:Prusa Magenta Tough @0.05 SL1S]

 inherits = *0.05_sl1s*

@@ -6155,6 +6379,7 @@ exposure_time = 2
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #E800E8

 

 [sla_material:Prusa Maroon Tough @0.05 SL1S]

 inherits = *0.05_sl1s*

@@ -6162,6 +6387,7 @@ exposure_time = 2.4
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #804000

 

 [sla_material:Prusa White Tough @0.05 SL1S]

 inherits = *0.05_sl1s*

@@ -6169,6 +6395,7 @@ exposure_time = 2
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FFFFFF

 

 [sla_material:Prusa Pink Tough @0.05 SL1S]

 inherits = *0.05_sl1s*

@@ -6176,6 +6403,7 @@ exposure_time = 2
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FF80C0

 

 [sla_material:Prusa Blue Flexible @0.05 SL1S]

 inherits = *0.05_sl1s*

@@ -6183,6 +6411,7 @@ exposure_time = 2
 initial_exposure_time = 25

 material_type = Flexible

 material_vendor = Made for Prusa

+material_colour = #007EFD

 

 [sla_material:Prusa Grey Tough @0.05 SL1S]

 inherits = *0.05_sl1s*

@@ -6190,6 +6419,7 @@ exposure_time = 2.4
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #C0C0C0

 

 [sla_material:Prusa Grey High Tenacity @0.05 SL1S]

 inherits = *0.05_sl1s*

@@ -6197,6 +6427,7 @@ exposure_time = 2
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #C0C0C0

 

 [sla_material:Prusa Vibrant Orange Tough @0.05 SL1S]

 inherits = *0.05_sl1s*

@@ -6204,6 +6435,7 @@ exposure_time = 5
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FF8040

 

 [sla_material:Prusa Deep Blue Transparent Tough @0.05 SL1S]

 inherits = *0.05_sl1s*

@@ -6211,6 +6443,7 @@ exposure_time = 5
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #007EFD

 

 [sla_material:Prusa Green Dental Casting @0.05 SL1S]

 inherits = *0.05_sl1s*

@@ -6218,6 +6451,7 @@ exposure_time = 4
 initial_exposure_time = 50

 material_type = Casting

 material_vendor = Made for Prusa

+material_colour = #00B900

 

 [sla_material:PrimaCreator Tough Light Grey @0.05 SL1S]

 inherits = *0.05_sl1s*

@@ -6225,6 +6459,7 @@ exposure_time = 2.4
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = PrimaCreator

+material_colour = #C0C0C0

 

 [sla_material:PrimaCreator Tough Clear @0.05 SL1S]

 inherits = *0.05_sl1s*

@@ -6232,6 +6467,7 @@ exposure_time = 2
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = PrimaCreator

+material_colour = #F8F8F8

 

 [sla_material:PrimaCreator Tough White @0.05 SL1S]

 inherits = *0.05_sl1s*

@@ -6239,6 +6475,7 @@ exposure_time = 2
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = PrimaCreator

+material_colour = #FFFFFF

 

 [sla_material:PrimaCreator Flex Clear @0.05 SL1S]

 inherits = *0.05_sl1s*

@@ -6246,6 +6483,7 @@ exposure_time = 2
 initial_exposure_time = 25

 material_type = Flexible

 material_vendor = PrimaCreator

+material_colour = #F8F8F8

 

 [sla_material:PrimaCreator Water Washable Transparent @0.05 SL1S]

 inherits = *0.05_sl1s*

@@ -6253,6 +6491,7 @@ exposure_time = 2
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = PrimaCreator

+material_colour = #F8F8F8

 

 [sla_material:DruckWege Type D Dental Model @0.05 SL1S]

 inherits = *0.05_sl1s*

@@ -6260,6 +6499,7 @@ exposure_time = 1.4
 initial_exposure_time = 15

 material_type = Dental

 material_vendor = DruckWege

+material_colour = #FFEEE6

 

 [sla_material:DruckWege Type D Standard White @0.05 SL1S]

 inherits = *0.05_sl1s*

@@ -6267,6 +6507,7 @@ exposure_time = 2
 initial_exposure_time = 15

 material_type = Tough

 material_vendor = DruckWege

+material_colour = #FFFFFF

 

 [sla_material:DruckWege Type D Standard Pigmentfrei Clear @0.05 SL1S]

 inherits = *0.05_sl1s*

@@ -6274,6 +6515,7 @@ exposure_time = 2
 initial_exposure_time = 15

 material_type = Tough

 material_vendor = DruckWege

+material_colour = #F8F8F8

 

 [sla_material:3DM-ABS Orange @0.05 SL1S]

 inherits = *0.05_sl1s*

@@ -6281,6 +6523,7 @@ exposure_time = 2.6
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = 3DM

+material_colour = #FF8040

 

 [sla_material:3DM-TOUGH Clear @0.05 SL1S]

 inherits = *0.05_sl1s*

@@ -6288,6 +6531,7 @@ exposure_time = 2.6
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = 3DM

+material_colour = #F8F8F8

 

 [sla_material:Peopoly Deft White @0.05 SL1S]

 inherits = *0.05_sl1s*

@@ -6295,6 +6539,7 @@ exposure_time = 2
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Peopoly

+material_colour = #FFFFFF

 

 [sla_material:Peopoly Neo Clear @0.05 SL1S]

 inherits = *0.05_sl1s*

@@ -6302,6 +6547,7 @@ exposure_time = 2
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Peopoly

+material_colour = #F8F8F8

 

 ## 0.1 SL1S

 

@@ -6313,6 +6559,7 @@ exposure_time = 2.6
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Prusa Polymers

+material_colour = #FF8040

 

 [sla_material:Prusament Resin Tough Rich Black @0.1 SL1S]

 inherits = *0.1_sl1s*

@@ -6320,6 +6567,7 @@ exposure_time = 2.6
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Prusa Polymers

+material_colour = #007EFD

 

 [sla_material:Prusament Resin Tough Anthracite Grey @0.1 SL1S]

 inherits = *0.1_sl1s*

@@ -6327,6 +6575,7 @@ exposure_time = 3
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Prusa Polymers

+material_colour = #808080

 

 ## Made for Prusa 0.1

 

@@ -6336,6 +6585,7 @@ exposure_time = 2.6
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FF8040

 

 [sla_material:Prusa White ABS like @0.1 SL1S]

 inherits = *0.1_sl1s*

@@ -6343,6 +6593,7 @@ exposure_time = 2.6
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FFFFFF

 

 [sla_material:Prusa Azure Blue Tough @0.1 SL1S]

 inherits = *0.1_sl1s*

@@ -6350,6 +6601,7 @@ exposure_time = 2.6
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #007EFD

 

 [sla_material:Prusa Black Tough @0.1 SL1S]

 inherits = *0.1_sl1s*

@@ -6357,6 +6609,7 @@ exposure_time = 3
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #007EFD

 

 [sla_material:Prusa Cyan Tough @0.1 SL1S]

 inherits = *0.1_sl1s*

@@ -6364,6 +6617,7 @@ exposure_time = 2.6
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour =

 

 [sla_material:Prusa Magenta Tough @0.1 SL1S]

 inherits = *0.1_sl1s*

@@ -6371,6 +6625,7 @@ exposure_time = 2.6
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #E800E8

 

 [sla_material:Prusa Maroon Tough @0.1 SL1S]

 inherits = *0.1_sl1s*

@@ -6378,6 +6633,7 @@ exposure_time = 3
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #804000

 

 [sla_material:Prusa White Tough @0.1 SL1S]

 inherits = *0.1_sl1s*

@@ -6385,6 +6641,7 @@ exposure_time = 2.6
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FFFFFF

 

 [sla_material:Prusa Pink Tough @0.1 SL1S]

 inherits = *0.1_sl1s*

@@ -6392,6 +6649,7 @@ exposure_time = 2.6
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FF80C0

 

 [sla_material:Prusa Blue Flexible @0.1 SL1S]

 inherits = *0.1_sl1s*

@@ -6399,6 +6657,7 @@ exposure_time = 2.6
 initial_exposure_time = 25

 material_type = Flexible

 material_vendor = Made for Prusa

+material_colour =

 

 [sla_material:Prusa Grey Tough @0.1 SL1S]

 inherits = *0.1_sl1s*

@@ -6406,6 +6665,7 @@ exposure_time = 3
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #007EFD

 

 [sla_material:Prusa Grey High Tenacity @0.1 SL1S]

 inherits = *0.1_sl1s*

@@ -6413,6 +6673,7 @@ exposure_time = 2.6
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #808080

 

 [sla_material:Prusa Vibrant Orange Tough @0.1 SL1S]

 inherits = *0.1_sl1s*

@@ -6420,6 +6681,7 @@ exposure_time = 10
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #FF8040

 

 [sla_material:Prusa Deep Blue Transparent Tough @0.1 SL1S]

 inherits = *0.1_sl1s*

@@ -6427,6 +6689,7 @@ exposure_time = 10
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Made for Prusa

+material_colour = #007EFD

 

 [sla_material:Prusa Green Dental Casting @0.1 SL1S]

 inherits = *0.1_sl1s*

@@ -6434,6 +6697,7 @@ exposure_time = 8
 initial_exposure_time = 50

 material_type = Casting

 material_vendor = Made for Prusa

+material_colour = #00B900

 

 [sla_material:PrimaCreator Tough Light Grey @0.1 SL1S]

 inherits = *0.1_sl1s*

@@ -6441,6 +6705,7 @@ exposure_time = 3
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = PrimaCreator

+material_colour = #C0C0C0

 

 [sla_material:PrimaCreator Tough Clear @0.1 SL1S]

 inherits = *0.1_sl1s*

@@ -6448,6 +6713,7 @@ exposure_time = 2.6
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = PrimaCreator

+material_colour = #F8F8F8

 

 [sla_material:PrimaCreator Tough White @0.1 SL1S]

 inherits = *0.1_sl1s*

@@ -6455,6 +6721,7 @@ exposure_time = 2.6
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = PrimaCreator

+material_colour = #FFFFFF

 

 [sla_material:PrimaCreator Flex Clear @0.1 SL1S]

 inherits = *0.1_sl1s*

@@ -6462,6 +6729,7 @@ exposure_time = 2.6
 initial_exposure_time = 25

 material_type = Flexible

 material_vendor = PrimaCreator

+material_colour = #F8F8F8

 

 [sla_material:PrimaCreator Water Washable Transparent @0.1 SL1S]

 inherits = *0.1_sl1s*

@@ -6469,6 +6737,7 @@ exposure_time = 2.6
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = PrimaCreator

+material_colour = #F8F8F8

 

 [sla_material:DruckWege Type D Dental Model @0.1 SL1S]

 inherits = *0.1_sl1s*

@@ -6476,6 +6745,7 @@ exposure_time = 2.6
 initial_exposure_time = 15

 material_type = Dental

 material_vendor = DruckWege

+material_colour = #FFEEE6

 

 [sla_material:3DM-ABS Orange @0.1 SL1S]

 inherits = *0.1_sl1s*

@@ -6483,6 +6753,7 @@ exposure_time = 3
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = 3DM

+material_colour = #FF8040

 

 [sla_material:3DM-TOUGH Clear @0.1 SL1S]

 inherits = *0.1_sl1s*

@@ -6490,6 +6761,7 @@ exposure_time = 3
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = 3DM

+material_colour = #F8F8F8

 

 [sla_material:Peopoly Deft White @0.1 SL1S]

 inherits = *0.1_sl1s*

@@ -6497,6 +6769,7 @@ exposure_time = 2.6
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Peopoly

+material_colour = #FFFFFF

 

 [sla_material:Peopoly Neo Clear @0.1 SL1S]

 inherits = *0.1_sl1s*

@@ -6504,6 +6777,7 @@ exposure_time = 2.6
 initial_exposure_time = 25

 material_type = Tough

 material_vendor = Peopoly

+material_colour = #F8F8F8

 

 [printer:*common*]

 printer_technology = FFF

diff --git a/src/libslic3r/Model.cpp b/src/libslic3r/Model.cpp
index 81627347b..e88188b44 100644
--- a/src/libslic3r/Model.cpp
+++ b/src/libslic3r/Model.cpp
@@ -40,7 +40,8 @@ ModelInstanceEPrintVolumeState printbed_collision_state(const Polygon& printbed_
             break;
         }
     }
-    const bool contained_z = -1e10 < obj_min_z && obj_max_z < print_volume_height;
+
+    const bool contained_z = -1e10 < obj_min_z && obj_max_z <= print_volume_height;
     return (contained_xy && contained_z) ? ModelInstancePVS_Inside : ModelInstancePVS_Partly_Outside;
 }
 
diff --git a/src/slic3r/GUI/MsgDialog.cpp b/src/slic3r/GUI/MsgDialog.cpp
index bc17dd9ce..2515f0281 100644
--- a/src/slic3r/GUI/MsgDialog.cpp
+++ b/src/slic3r/GUI/MsgDialog.cpp
@@ -55,11 +55,7 @@ MsgDialog::MsgDialog(wxWindow *parent, const wxString &title, const wxString &he
 		btn_sizer->Add(button);
 	}
 
-	if (! bitmap.IsOk()) {
-		bitmap = create_scaled_bitmap("PrusaSlicer_192px.png", this, 192);
-	}
-
-	logo = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap);
+	logo = new wxStaticBitmap(this, wxID_ANY, bitmap.IsOk() ? bitmap : wxNullBitmap);
 
 	topsizer->Add(logo, 0, wxALL, BORDER);
 	topsizer->Add(rightsizer, 1, wxTOP | wxBOTTOM | wxRIGHT | wxEXPAND, BORDER);