From 192bdffb3f513018c0ebfe74086d421f71e76b0c Mon Sep 17 00:00:00 2001 From: bubnikv Date: Sat, 29 Feb 2020 10:53:18 +0100 Subject: Updated printer profiles, bumped up version to 2.2.0-rc. --- resources/profiles/Creality.idx | 1 + resources/profiles/Creality.ini | 2 +- resources/profiles/PrusaResearch.idx | 1 + resources/profiles/PrusaResearch.ini | 226 +++++++++++++++++++++++------------ src/slic3r/GUI/GUI_App.cpp | 4 +- version.inc | 2 +- 6 files changed, 157 insertions(+), 79 deletions(-) diff --git a/resources/profiles/Creality.idx b/resources/profiles/Creality.idx index 1647e1c31..6db20df5b 100644 --- a/resources/profiles/Creality.idx +++ b/resources/profiles/Creality.idx @@ -1,4 +1,5 @@ min_slic3r_version = 2.2.0-alpha3 +0.0.2 Updated for PrusaSlicer 2.2.0-rc 0.0.2-beta Update for PrusaSlicer 2.2.0-beta 0.0.2-alpha1 Extended list of default filaments to be installed 0.0.2-alpha0 Print bed textures are now configurable from the Preset Bundle. Requires PrusaSlicer 2.2.0-alpha3 and newer. diff --git a/resources/profiles/Creality.ini b/resources/profiles/Creality.ini index 054347efb..93006cc56 100644 --- a/resources/profiles/Creality.ini +++ b/resources/profiles/Creality.ini @@ -5,7 +5,7 @@ name = Creality # 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 = 0.0.2-beta +config_version = 0.0.2 # Where to get the updates from? config_update_url = http://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/Creality/ # changelog_url = http://files.prusa3d.com/?latest=slicer-profiles&lng=%1% diff --git a/resources/profiles/PrusaResearch.idx b/resources/profiles/PrusaResearch.idx index 3cc89e6fb..9fcc8c1ad 100644 --- a/resources/profiles/PrusaResearch.idx +++ b/resources/profiles/PrusaResearch.idx @@ -1,4 +1,5 @@ min_slic3r_version = 2.2.0-alpha3 +1.1.1 Added Verbatim and Fiberlogy PETG filament profiles. Updated auto cooling settings for ABS. 1.1.1-beta Updated for PrusaSlicer 2.2.0-beta 1.1.1-alpha4 Extended list of default filaments to be installed, top/bottom_solid_min_thickness defined, infill_acceleration changed etc 1.1.1-alpha3 Print bed textures are now configurable from the Preset Bundle. Requires PrusaSlicer 2.2.0-alpha3 and newer. diff --git a/resources/profiles/PrusaResearch.ini b/resources/profiles/PrusaResearch.ini index 571195c14..1b22575c0 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.1.1-beta +config_version = 1.1.1 # Where to get the updates from? config_update_url = http://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/PrusaResearch/ changelog_url = http://files.prusa3d.com/?latest=slicer-profiles&lng=%1% @@ -1538,12 +1538,12 @@ start_filament_gcode = "M900 K0 ; Filament gcode" [filament:*ABS*] inherits = *common* bed_temperature = 110 -bridge_fan_speed = 30 +bridge_fan_speed = 25 cooling = 0 disable_fan_first_layers = 3 fan_always_on = 0 fan_below_layer_time = 20 -filament_colour = #3A80CA +filament_colour = #FFF2EC filament_max_volumetric_speed = 11 filament_ramming_parameters = "120 100 5.70968 6.03226 7 8.25806 9 9.19355 9.3871 9.77419 10.129 10.3226 10.4516 10.5161| 0.05 5.69677 0.45 6.15484 0.95 8.76774 1.45 9.20323 1.95 9.95806 2.45 10.3871 2.95 10.5677 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" filament_type = ABS @@ -1555,6 +1555,28 @@ temperature = 255 start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}200{elsif nozzle_diameter[0]==0.6}18{else}30{endif} ; Filament gcode" compatible_printers_condition = printer_model!="MINI" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material) +[filament:*ABSC*] +inherits = *common* +bed_temperature = 110 +bridge_fan_speed = 25 +cooling = 1 +disable_fan_first_layers = 4 +fan_always_on = 0 +fan_below_layer_time = 20 +slowdown_below_layer_time = 20 +filament_colour = #FFF2EC +filament_max_volumetric_speed = 11 +filament_ramming_parameters = "120 100 5.70968 6.03226 7 8.25806 9 9.19355 9.3871 9.77419 10.129 10.3226 10.4516 10.5161| 0.05 5.69677 0.45 6.15484 0.95 8.76774 1.45 9.20323 1.95 9.95806 2.45 10.3871 2.95 10.5677 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" +filament_type = ABS +first_layer_bed_temperature = 100 +first_layer_temperature = 255 +max_fan_speed = 15 +min_fan_speed = 15 +min_print_speed = 15 +temperature = 255 +start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}200{elsif nozzle_diameter[0]==0.6}18{else}30{endif} ; Filament gcode" +compatible_printers_condition = printer_model!="MINI" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material) + [filament:*FLEX*] inherits = *common* bed_temperature = 50 @@ -1744,7 +1766,7 @@ filament_cost = 25.4 filament_density = 1.24 [filament:Fillamentum ABS] -inherits = *ABS* +inherits = *ABSC* filament_vendor = Fillamentum filament_cost = 32.4 filament_density = 1.04 @@ -1827,25 +1849,25 @@ temperature = 220 filament_retract_lift = 0.2 [filament:Generic ABS] -inherits = *ABS* +inherits = *ABSC* filament_vendor = Generic filament_cost = 27.82 filament_density = 1.04 [filament:Esun ABS] -inherits = *ABS* +inherits = *ABSC* filament_vendor = Esun filament_cost = 27.82 filament_density = 1.04 [filament:Hatchbox ABS] -inherits = *ABS* +inherits = *ABSC* filament_vendor = Hatchbox filament_cost = 27.82 filament_density = 1.04 [filament:Plasty Mladec ABS] -inherits = *ABS* +inherits = *ABSC* filament_vendor = Plasty Mladec filament_cost = 27.82 filament_density = 1.04 @@ -1867,7 +1889,6 @@ inherits = *PLA* filament_vendor = Generic filament_cost = 25.4 filament_density = 1.24 -filament_notes = "List of materials tested with standard PLA print settings:\n\nDas Filament\nEsun PLA\nEUMAKERS PLA\nFiberlogy HD-PLA\nFillamentum PLA\nFloreon3D\nHatchbox PLA\nPlasty Mladec PLA\nPrimavalue PLA\nProto pasta Matte Fiber\nVerbatim PLA\nVerbatim BVOH" [filament:Generic FLEX] inherits = *FLEX* @@ -1938,7 +1959,7 @@ filament_cost = 77.3 filament_density = 1.20 filament_type = PC bed_temperature = 115 -filament_colour = #3A80CA +filament_colour = #FFF2EC first_layer_bed_temperature = 100 first_layer_temperature = 270 temperature = 270 @@ -1954,7 +1975,6 @@ cooling = 0 fan_always_on = 0 filament_colour = #FFFFD7 filament_max_volumetric_speed = 3.8 -filament_notes = "List of materials tested with standard PVA print settings:\n\nPrimaSelect PVA+\nICE FILAMENTS PVA 'NAUGHTY NATURAL'" filament_ramming_parameters = "120 100 8.3871 8.6129 8.93548 9.22581 9.48387 9.70968 9.87097 10.0323 10.2258 10.4194 10.6452 10.8065| 0.05 8.34193 0.45 8.73548 0.95 9.34836 1.45 9.78385 1.95 10.0871 2.45 10.5161 2.95 10.8903 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" filament_soluble = 1 filament_type = PVA @@ -1963,11 +1983,10 @@ start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/}0{elsi temperature = 195 [filament:Prusa ABS] -inherits = *ABS* +inherits = *ABSC* filament_vendor = Made for Prusa filament_cost = 27.82 filament_density = 1.08 -filament_notes = "List of materials tested with standard ABS print settings:\n\nEsun ABS\nFil-A-Gehr ABS\nHatchboxABS\nPlasty Mladec ABS" [filament:*ABS MMU2*] inherits = Prusa ABS @@ -1984,12 +2003,10 @@ filament_unloading_speed = 20 [filament:Generic ABS @MMU2] inherits = *ABS MMU2* -# alias = Generic ABS filament_vendor = Generic [filament:Prusament ASA @MMU2] inherits = *ABS MMU2* -# alias = Prusament ASA filament_vendor = Prusa Polymers filament_cost = 35.28 filament_density = 1.07 @@ -2013,7 +2030,6 @@ start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}200{el [filament:Prusa ABS @MMU2] inherits = *ABS MMU2* -# alias = Prusa ABS filament_vendor = Made for Prusa [filament:Plasty Mladec ABS @MMU2] @@ -2027,7 +2043,7 @@ filament_cost = 27.3 filament_density = 1.04 bridge_fan_speed = 50 cooling = 1 -extrusion_multiplier = 0.9 +extrusion_multiplier = 1 fan_always_on = 1 fan_below_layer_time = 10 filament_colour = #FFFFD7 @@ -2063,7 +2079,20 @@ inherits = *PET* filament_vendor = Made for Prusa filament_cost = 27.82 filament_density = 1.27 -filament_notes = "List of manufacturers tested with standard PETG print settings:\n\nE3D Edge\nPlasty Mladec PETG" +compatible_printers_condition = nozzle_diameter[0]!=0.6 and printer_model!="MK2SMM" and printer_model!="MINI" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material) + +[filament:Verbatim PETG] +inherits = *PET* +filament_vendor = Verbatim +filament_cost = 27.90 +filament_density = 1.27 +compatible_printers_condition = nozzle_diameter[0]!=0.6 and printer_model!="MK2SMM" and printer_model!="MINI" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material) + +[filament:Fiberlogy PETG] +inherits = *PET* +filament_vendor = Fiberlogy +filament_cost = 21.50 +filament_density = 1.27 compatible_printers_condition = nozzle_diameter[0]!=0.6 and printer_model!="MK2SMM" and printer_model!="MINI" and ! (printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK(2.5|3).*/ and single_extruder_multi_material) [filament:Prusament PETG] @@ -2078,11 +2107,9 @@ compatible_printers_condition = nozzle_diameter[0]!=0.6 and printer_model!="MK2S [filament:Prusa PETG @0.6 nozzle] inherits = *PET06* -# alias = Prusa PETG filament_vendor = Made for Prusa filament_cost = 27.82 filament_density = 1.27 -filament_notes = "List of manufacturers tested with standard PETG print settings:\n\nE3D Edge\nPlasty Mladec PETG" [filament:Prusament PETG @0.6 nozzle] inherits = *PET06* @@ -2096,9 +2123,27 @@ filament_type = PETG [filament:Plasty Mladec PETG @0.6 nozzle] inherits = *PET06* filament_vendor = Plasty Mladec -first_layer_temperature = 240 -temperature = 250 -filament_cost = 24.99 +first_layer_temperature = 230 +temperature = 240 +filament_cost = 27.92 +filament_density = 1.27 +filament_type = PETG + +[filament:Verbatim PETG @0.6 nozzle] +inherits = *PET06* +filament_vendor = Verbatim +first_layer_temperature = 230 +temperature = 240 +filament_cost = 27.90 +filament_density = 1.27 +filament_type = PETG + +[filament:Fiberlogy PETG @0.6 nozzle] +inherits = *PET06* +filament_vendor = Fiberlogy +first_layer_temperature = 230 +temperature = 240 +filament_cost = 21.50 filament_density = 1.27 filament_type = PETG @@ -2112,7 +2157,6 @@ filament_cooling_initial_speed = 2 filament_cooling_moves = 1 filament_load_time = 15 filament_loading_speed = 14 -filament_notes = PET filament_ramming_parameters = "120 140 4.70968 4.74194 4.77419 4.80645 4.83871 4.87097 4.90323 5 5.25806 5.67742 6.29032 7.06452 7.83871 8.3871| 0.05 4.72901 0.45 4.73545 0.95 4.83226 1.45 4.88067 1.95 5.05483 2.45 5.93553 2.95 7.53556 3.45 8.6323 3.95 7.6 4.45 7.6 4.95 7.6" filament_unload_time = 12 filament_unloading_speed = 20 @@ -2128,7 +2172,6 @@ filament_max_volumetric_speed = 13 [filament:Generic PETG @MMU2] inherits = *PET MMU2* -# alias = Generic PETG filament_vendor = Generic [filament:Plasty Mladec PETG @MMU2] @@ -2137,35 +2180,29 @@ filament_vendor = Plasty Mladec [filament:Prusa PETG @MMU2] inherits = *PET MMU2* -# alias = Prusa PETG filament_vendor = Made for Prusa [filament:Prusament PETG @MMU2] inherits = *PET MMU2* filament_type = PETG -# alias = Prusament PETG filament_vendor = Prusa Polymers [filament:Generic PETG @MMU2 0.6 nozzle] inherits = *PET MMU2 06* -# alias = Generic PETG filament_vendor = Generic [filament:Prusa PETG @MMU2 0.6 nozzle] inherits = *PET MMU2 06* -# alias = Prusa PETG filament_vendor = Made for Prusa [filament:Prusament PETG @MMU2 0.6 nozzle] inherits = *PET MMU2 06* filament_type = PETG -# alias = Prusament PETG filament_vendor = Prusa Polymers [filament:Plasty Mladec PETG @MMU2 0.6 nozzle] inherits = *PET MMU2 06* filament_type = PETG -# alias = Prusament PETG filament_vendor = Plasty Mladec [filament:Prusa PLA] @@ -2321,7 +2358,6 @@ fan_always_on = 0 fan_below_layer_time = 100 filament_colour = #FFFFD7 filament_max_volumetric_speed = 4 -filament_notes = "List of materials tested with standard PVA print settings:\n\nVerbatim BVOH" filament_soluble = 1 filament_type = PVA first_layer_bed_temperature = 60 @@ -2373,7 +2409,6 @@ filament_loading_speed = 14 filament_loading_speed_start = 19 filament_max_volumetric_speed = 3.8 filament_minimal_purge_on_wipe_tower = 15 -filament_notes = "List of materials tested with standard PVA print settings:\n\nPrimaSelect PVA+" filament_ramming_parameters = "120 110 3.83871 3.90323 3.96774 4.03226 4.09677 4.19355 4.3871 4.83871 5.67742 6.93548 8.54839 10.3226 11.9677 13.2581 14.129 14.5806| 0.05 3.8258 0.45 3.89676 0.95 4.05807 1.45 4.23548 1.95 5.18386 2.45 7.80651 2.95 11.5356 3.45 13.9872 3.95 14.7613 4.45 7.6 4.95 7.6" filament_soluble = 1 filament_toolchange_delay = 0 @@ -2404,7 +2439,6 @@ fan_always_on = 1 fan_below_layer_time = 100 filament_colour = #DEE0E6 filament_max_volumetric_speed = 5 -filament_notes = "List of materials tested with standard PLA print settings:\n\nEsun PLA\nFiberlogy HD-PLA\nFillamentum PLA\nFloreon3D\nHatchbox PLA\nPlasty Mladec PLA\nPrimavalue PLA\nProto pasta Matte Fiber\nEUMAKERS PLA" filament_type = PP first_layer_bed_temperature = 100 first_layer_temperature = 220 @@ -2445,7 +2479,6 @@ temperature = 270 [filament:ColorFabb XT-CF20 @MMU1] inherits = *PETMMU1* -# alias = ColorFabb XT-CF20 filament_vendor = ColorFabb compatible_printers_condition = nozzle_diameter[0]>0.35 and printer_model=="MK2SMM" extrusion_multiplier = 1.2 @@ -2460,7 +2493,6 @@ temperature = 260 [filament:ColorFabb nGen @MMU1] inherits = *PETMMU1* -# alias = ColorFabb nGen filament_vendor = ColorFabb filament_cost = 21.2 filament_density = 1.2 @@ -2474,16 +2506,13 @@ min_fan_speed = 20 [filament:E3D Edge @MMU1] inherits = *PETMMU1* -# alias = E3D Edge filament_vendor = E3D filament_cost = 56.9 filament_density = 1.26 filament_type = EDGE -filament_notes = "List of manufacturers tested with standard PETG print settings:\n\nE3D Edge\nFillamentum CPE GH100\nPlasty Mladec PETG" [filament:Fillamentum CPE @MMU1] inherits = *PETMMU1* -# alias = Fillamentum CPE filament_vendor = Fillamentum filament_cost = 54.1 filament_density = 1.25 @@ -2496,29 +2525,36 @@ temperature = 275 [filament:Generic PETG @MMU1] inherits = *PETMMU1* -# alias = Generic PETG filament_vendor = Generic filament_cost = 27.82 filament_density = 1.27 [filament:Plasty Mladec PETG @MMU1] inherits = *PETMMU1* -# alias = Generic PETG filament_vendor = Plasty Mladec filament_cost = 27.82 filament_density = 1.27 +[filament:Verbatim PETG @MMU1] +inherits = *PETMMU1* +filament_vendor = Verbatim +filament_cost = 27.90 +filament_density = 1.27 + +[filament:Fiberlogy PETG @MMU1] +inherits = *PETMMU1* +filament_vendor = Fiberlogy +filament_cost = 21.50 +filament_density = 1.27 + [filament:Prusa PETG @MMU1] inherits = *PETMMU1* -# alias = Prusa PETG filament_vendor = Made for Prusa filament_cost = 27.82 filament_density = 1.27 -filament_notes = "List of manufacturers tested with standard PETG print settings:\n\nE3D Edge\nPlasty Mladec PETG" [filament:Prusament PETG @MMU1] inherits = *PETMMU1* -# alias = Prusament PETG filament_vendor = Prusa Polymers first_layer_temperature = 240 temperature = 250 @@ -2528,7 +2564,6 @@ filament_type = PETG [filament:Taulman T-Glase @MMU1] inherits = *PETMMU1* -# alias = Taulman T-Glase filament_vendor = Taulman filament_cost = 40 filament_density = 1.27 @@ -2554,7 +2589,6 @@ compatible_printers_condition = printer_model=="MK2SMM" [filament:Generic FLEX @MMU1] inherits = *FLEX* -# alias = Generic FLEX filament_vendor = Generic filament_cost = 82 filament_density = 1.22 @@ -2569,7 +2603,6 @@ compatible_printers_condition = printer_model=="MK2SMM" [filament:Generic PETG @MINI] inherits = Generic PETG; *PETMINI* filament_vendor = Generic -# alias = Generic PETG filament_cost = 27.82 filament_density = 1.27 compatible_printers_condition = printer_model=="MINI" and nozzle_diameter[0]!=0.6 @@ -2581,35 +2614,79 @@ filament_cost = 27.82 filament_density = 1.27 compatible_printers_condition = printer_model=="MINI" and nozzle_diameter[0]!=0.6 +[filament:Verbatim PETG @MINI] +inherits = Generic PETG; *PETMINI* +filament_vendor = Verbatim +filament_cost = 27.90 +filament_density = 1.27 +compatible_printers_condition = printer_model=="MINI" and nozzle_diameter[0]!=0.6 + +[filament:Fiberlogy PETG @MINI] +inherits = Generic PETG; *PETMINI* +filament_vendor = Fiberlogy +filament_cost = 21.50 +filament_density = 1.27 +compatible_printers_condition = printer_model=="MINI" and nozzle_diameter[0]!=0.6 + [filament:Generic ABS @MINI] inherits = Generic ABS; *ABSMINI* filament_vendor = Generic -# alias = Generic ABS filament_cost = 27.82 filament_density = 1.08 +fan_always_on = 0 +cooling = 1 +min_fan_speed = 15 +max_fan_speed = 15 +slowdown_below_layer_time = 20 +disable_fan_first_layers = 4 +fan_below_layer_time = 20 +bridge_fan_speed = 25 [filament:Esun ABS @MINI] inherits = Generic ABS; *ABSMINI* filament_vendor = Esun filament_cost = 27.82 filament_density = 1.08 +fan_always_on = 0 +cooling = 1 +min_fan_speed = 15 +max_fan_speed = 15 +slowdown_below_layer_time = 20 +disable_fan_first_layers = 4 +fan_below_layer_time = 20 +bridge_fan_speed = 25 [filament:Hatchbox ABS @MINI] inherits = Generic ABS; *ABSMINI* filament_vendor = Hatchbox filament_cost = 27.82 filament_density = 1.08 +fan_always_on = 0 +cooling = 1 +min_fan_speed = 15 +max_fan_speed = 15 +slowdown_below_layer_time = 20 +disable_fan_first_layers = 4 +fan_below_layer_time = 20 +bridge_fan_speed = 25 [filament:Plasty Mladec ABS @MINI] inherits = Generic ABS; *ABSMINI* filament_vendor = Plasty Mladec filament_cost = 27.82 filament_density = 1.08 +fan_always_on = 0 +cooling = 1 +min_fan_speed = 15 +max_fan_speed = 15 +slowdown_below_layer_time = 20 +disable_fan_first_layers = 4 +fan_below_layer_time = 20 +bridge_fan_speed = 25 [filament:Prusament PETG @MINI] inherits = Prusament PETG; *PETMINI* filament_vendor = Prusa Polymers -# alias = Prusament PETG first_layer_temperature = 240 temperature = 250 filament_density = 1.27 @@ -2618,7 +2695,6 @@ compatible_printers_condition = printer_model=="MINI" and nozzle_diameter[0]!=0. [filament:Prusament PETG @0.6 nozzle MINI] inherits = Prusament PETG; *PETMINI06* -# alias = Prusament PETG first_layer_temperature = 240 temperature = 250 filament_density = 1.27 @@ -2626,16 +2702,21 @@ filament_cost = 24.99 [filament:Generic PETG @0.6 nozzle MINI] inherits = Generic PETG; *PETMINI06* -# alias = Generic PETG [filament:Plasty Mladec PETG @0.6 nozzle MINI] inherits = Generic PETG; *PETMINI06* filament_vendor = Plasty Mladec -# alias = Generic PETG + +[filament:Verbatim PETG @0.6 nozzle MINI] +inherits = Generic PETG; *PETMINI06* +filament_vendor = Verbatim + +[filament:Fiberlogy PETG @0.6 nozzle MINI] +inherits = Generic PETG; *PETMINI06* +filament_vendor = Fiberlogy [filament:Prusament ASA @MINI] inherits = Prusament ASA; *ABSMINI* -# alias = Prusament ASA first_layer_temperature = 260 first_layer_bed_temperature = 100 temperature = 260 @@ -2654,7 +2735,6 @@ filament_density = 1.07 [filament:Fillamentum Flexfill 98A @MINI] inherits = SemiFlex or Flexfill 98A; *FLEXMINI* -# alias = Fillamentum Flexfill 98A filament_vendor = Fillamentum first_layer_temperature = 240 temperature = 240 @@ -2662,7 +2742,6 @@ filament_max_volumetric_speed = 1.35 [filament:Generic FLEX @MINI] inherits = SemiFlex or Flexfill 98A; *FLEXMINI* -# alias = Semiflex or Flex 98A filament_vendor = Generic fan_always_on = 0 bridge_fan_speed = 80 @@ -2673,7 +2752,6 @@ filament_max_volumetric_speed = 1.35 [filament:AmazonBasics TPU @MINI] inherits = *FLEXMINI* -# alias = AmazonBasics TPU filament_vendor = AmazonBasics filament_max_volumetric_speed = 1.5 first_layer_temperature = 235 @@ -2689,7 +2767,6 @@ filament_density = 1.21 [filament:SainSmart TPU @MINI] inherits = *FLEXMINI* -# alias = SainSmart TPU filament_vendor = SainSmart filament_max_volumetric_speed = 1.8 first_layer_temperature = 235 @@ -2708,7 +2785,6 @@ filament_density = 1.21 [filament:Filatech FilaFlex40 @MINI] inherits = *FLEXMINI* -# alias = Filatech FilaFlex40 filament_vendor = Filatech filament_max_volumetric_speed = 1.8 fan_always_on = 1 @@ -2728,7 +2804,6 @@ filament_cost = 51.45 [filament:Fillamentum Flexfill 92A @MINI] inherits = *FLEXMINI* -# alias = Fillamentum Flexfill 92A filament_vendor = Fillamentum first_layer_temperature = 245 temperature = 245 @@ -2753,7 +2828,6 @@ start_filament_gcode = "M900 K0 ; Filament gcode" [filament:Fillamentum CPE @MINI] inherits = Fillamentum CPE; *PETMINI* -# alias = Fillamentum CPE first_layer_temperature = 265 first_layer_bed_temperature = 90 temperature = 265 @@ -2763,25 +2837,29 @@ filament_density = 1.25 [filament:ColorFabb nGen @MINI] inherits = ColorFabb nGen; *PETMINI* -# alias = ColorFabb nGen filament_cost = 52.46 filament_density = 1.2 [filament:E3D PC-ABS @MINI] inherits = E3D PC-ABS; *ABSMINI* -# alias = E3D PC-ABS filament_density = 1.05 filament_cost = 28.80 [filament:Fillamentum ABS @MINI] inherits = Fillamentum ABS; *ABSMINI* -# alias = Fillamentum ABS filament_cost = 32.4 filament_density = 1.04 +fan_always_on = 0 +cooling = 1 +min_fan_speed = 15 +max_fan_speed = 15 +slowdown_below_layer_time = 20 +disable_fan_first_layers = 4 +fan_below_layer_time = 20 +bridge_fan_speed = 25 [filament:Fillamentum ASA @MINI] inherits = Fillamentum ASA; *ABSMINI* -# alias = Fillamentum ASA first_layer_temperature = 255 first_layer_bed_temperature = 100 temperature = 255 @@ -2800,11 +2878,10 @@ filament_density = 1.07 [filament:Polymaker PC-Max @MINI] inherits = Polymaker PC-Max; *ABSMINI* -# alias = Polymaker PC-Max filament_type = PC filament_max_volumetric_speed = 7 bed_temperature = 100 -filament_colour = #3A80CA +filament_colour = #FFF2EC first_layer_bed_temperature = 100 first_layer_temperature = 270 temperature = 270 @@ -2814,14 +2891,20 @@ filament_density = 1.20 [filament:Prusa ABS @MINI] inherits = *ABSMINI* -# alias = Prusa ABS filament_vendor = Made for Prusa filament_cost = 27.82 filament_density = 1.08 +fan_always_on = 0 +cooling = 1 +min_fan_speed = 15 +max_fan_speed = 15 +slowdown_below_layer_time = 20 +disable_fan_first_layers = 4 +fan_below_layer_time = 20 +bridge_fan_speed = 25 [filament:Generic HIPS @MINI] inherits = *ABSMINI* -# alias = Generic HIPS filament_vendor = Generic filament_cost = 27.3 filament_density = 1.04 @@ -2840,7 +2923,6 @@ temperature = 230 [filament:ColorFabb HT @MINI] inherits = *PETMINI* -# alias = ColorFabb HT filament_vendor = ColorFabb bed_temperature = 100 bridge_fan_speed = 30 @@ -2858,7 +2940,6 @@ temperature = 270 [filament:ColorFabb XT @MINI] inherits = *PETMINI* -# alias = ColorFabb XT filament_vendor = ColorFabb filament_type = PETG filament_cost = 62.9 @@ -2869,7 +2950,6 @@ temperature = 270 [filament:ColorFabb XT-CF20 @MINI] inherits = *PETMINI* -# alias = ColorFabb XT-CF20 filament_vendor = ColorFabb compatible_printers_condition = nozzle_diameter[0]>0.35 and printer_model=="MINI" extrusion_multiplier = 1.2 @@ -2883,7 +2963,6 @@ temperature = 260 [filament:Taulman T-Glase @MINI] inherits = *PETMINI* -# alias = Taulman T-Glase filament_vendor = Taulman filament_cost = 40 filament_density = 1.27 @@ -2897,7 +2976,6 @@ min_fan_speed = 0 [filament:E3D Edge @MINI] inherits = *PETMINI* -# alias = E3D Edge filament_vendor = E3D filament_cost = 56.9 filament_density = 1.26 @@ -2905,7 +2983,6 @@ filament_type = EDGE [filament:Prusa PETG @MINI] inherits = *PETMINI* -# alias = Prusa PETG filament_vendor = Made for Prusa filament_cost = 27.82 filament_density = 1.27 @@ -2913,7 +2990,6 @@ compatible_printers_condition = printer_model=="MINI" and nozzle_diameter[0]!=0. [filament:Prusa PETG @0.6 nozzle MINI] inherits = *PETMINI06* -# alias = Prusa PETG filament_vendor = Made for Prusa filament_cost = 27.82 filament_density = 1.27 diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index f45ef255a..5bcfc136c 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -187,8 +187,8 @@ bool GUI_App::on_init_inner() wxString::Format("Resources path does not exist or is not a directory: %s", resources_dir)); // Profiles for the alpha are stored into the PrusaSlicer-alpha directory to not mix with the current release. - // SetAppName(SLIC3R_APP_KEY); - SetAppName(SLIC3R_APP_KEY "-beta"); + SetAppName(SLIC3R_APP_KEY); +// SetAppName(SLIC3R_APP_KEY "-beta"); SetAppDisplayName(SLIC3R_APP_NAME); // Enable this to get the default Win32 COMCTRL32 behavior of static boxes. diff --git a/version.inc b/version.inc index 26b035484..2e916f261 100644 --- a/version.inc +++ b/version.inc @@ -3,7 +3,7 @@ set(SLIC3R_APP_NAME "PrusaSlicer") set(SLIC3R_APP_KEY "PrusaSlicer") -set(SLIC3R_VERSION "2.2.0-beta") +set(SLIC3R_VERSION "2.2.0-rc") set(SLIC3R_BUILD_ID "PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN") set(SLIC3R_RC_VERSION "2,2,0,0") set(SLIC3R_RC_VERSION_DOTS "2.2.0.0") -- cgit v1.2.3