GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-31 14:31:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into fs_svg_SPE-1517

Browse Source
This commit is contained in:
Filip Sykala - NTB T15p 2023-09-22 11:01:03 +02:00
commit 7e8594069b
5 changed files with 85 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/profiles/CocoaPress.idx
View File

@ -1,3 +1,4 @@
min_slic3r_version = 2.6.0-alpha2
1.0.2 Removed invalid compatible_print condition.
1.0.1 Swapped Pause GCode, Fixed Chocolate Colors, Resolved Output Format issue from Inheriting Keyword Typo
1.0.0 Initial

4
resources/profiles/CocoaPress.ini
View File

@ -5,7 +5,7 @@
name = Cocoa Press
# 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.0.1
config_version = 1.0.2
# Where to get the updates from?
config_update_url = https://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/CocoaPress/
# changelog_url = https://files.prusa3d.com/?latest=slicer-profiles&lng=%1%
@ -439,8 +439,6 @@ filament_settings_id = "Cocoa Press Chocolate"
filament_type = CHOCOLATE
compatible_printers =
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_COCOA_PRESS.*/
compatible_prints =
compatible_prints_condition = printer_notes=~/.PRINTER_MODEL_MINICHEF.*/
[printer:*0.8mm*]
printer_variant = 0.8

2
resources/profiles/PrusaResearch.idx
View File

@ -1,8 +1,10 @@
min_slic3r_version = 2.6.2-alpha0
1.11.0-alpha3 Added new print profiles for Prusa MINI Input Shaper (Alpha). Updated MK4 IS profiles.
1.11.0-alpha2 Added MK3.9 and Prusa MINI Input Shaper (alpha). Enabled binary g-code, arc fitting and QOI/PNG for MINI and MINI IS.
1.11.0-alpha1 Updated ramming parameters. Updated start-gcode for XL Multi-Tool. Updated output filename format.
1.11.0-alpha0 Binary g-code, arc fitting, QOI/PNG thumbnails, 90degree XL tower, XL specific filament variants.
min_slic3r_version = 2.6.0-beta2
1.9.10 Added new print profiles for Prusa MINI Input Shaper (Alpha). Updated MK4 IS profiles.
1.9.9 Added Original Prusa MK3.9 and Original Prusa MINI/MINI+ Input Shaper (Alpha). FW version notification (5.0.0 final with input shaper). Updated output filename format. Added additional thumbnail resolution.
1.9.8 FW version notification (MK2.5/3 family). Minor update of MK4IS profiles. Updated MK4IS thumbnail.
1.9.7 MK4 Input Shaper RC firmware notification.

86
resources/profiles/PrusaResearch.ini
View File

@ -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.11.0-alpha2
config_version = 1.11.0-alpha3
# 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%
@ -234,7 +234,7 @@ extruder_clearance_height = 20
extruder_clearance_radius = 45
extrusion_width = 0.45
fill_angle = 45
fill_density = 20%
fill_density = 15%
fill_pattern = cubic
first_layer_acceleration = 800
first_layer_extrusion_width = 0.42
@ -4040,6 +4040,7 @@ inherits = *MK4IS_common*
perimeter_speed = 80
external_perimeter_speed = 45
small_perimeter_speed = 45
infill_speed = 140
gap_fill_speed = 60
top_solid_infill_speed = 80
support_material_speed = 120
@ -4076,6 +4077,7 @@ top_solid_layers = 6
bottom_solid_layers = 5
support_material_contact_distance = 0.17
raft_contact_distance = 0.15
infill_speed = 120
[print:0.10mm FAST DETAIL @MK4IS 0.4]
inherits = 0.15mm SPEED @MK4IS 0.4
@ -4084,6 +4086,15 @@ top_solid_layers = 8
bottom_solid_layers = 7
support_material_contact_distance = 0.17
raft_contact_distance = 0.15
external_perimeter_acceleration = 2500
perimeter_acceleration = 2500
infill_speed = 140
perimeters = 3
perimeter_extrusion_width = 0.4
external_perimeter_extrusion_width = 0.4
infill_extrusion_width = 0.4
solid_infill_extrusion_width = 0.4
top_infill_extrusion_width = 0.4
# 0.25mm nozzle IS
@ -4686,8 +4697,69 @@ gcode_binary = 1
arc_fitting = emit_radius
output_filename_format = {input_filename_base}_0.4n_{layer_height}mm_{printing_filament_types}_{printer_model}_{print_time}.bgcode
[print:0.20mm SPEED @MINIIS]
[print:0.20mm SPEED @MINIIS 0.4]
inherits = *MINIIS_common*
renamed_from = "0.20mm SPEED @MINIIS"
[print:0.20mm STRUCTURAL @MINIIS 0.4]
inherits = *MINIIS_common*
perimeter_speed = 80
external_perimeter_speed = 45
small_perimeter_speed = 45
gap_fill_speed = 60
top_solid_infill_speed = 80
infill_speed = 130
support_material_speed = 100
support_material_interface_speed = 50
external_perimeter_acceleration = 1500
perimeter_acceleration = 2000
solid_infill_acceleration = 3000
default_acceleration = 2000
overhang_speed_3 = 80%
[print:0.15mm SPEED @MINIIS 0.4]
inherits = *MINIIS_common*
layer_height = 0.15
top_solid_layers = 6
bottom_solid_layers = 5
support_material_contact_distance = 0.17
raft_contact_distance = 0.15
gap_fill_speed = 80
support_material_speed = 100
support_material_interface_speed = 50
external_perimeter_acceleration = 2500
perimeter_acceleration = 3000
solid_infill_acceleration = 3500
default_acceleration = 2000
overhang_speed_3 = 60
[print:0.15mm STRUCTURAL @MINIIS 0.4]
inherits = 0.20mm STRUCTURAL @MINIIS 0.4
layer_height = 0.15
top_solid_layers = 6
bottom_solid_layers = 5
support_material_contact_distance = 0.17
raft_contact_distance = 0.15
infill_speed = 120
[print:0.10mm FAST DETAIL @MINIIS 0.4]
inherits = 0.15mm SPEED @MINIIS 0.4
layer_height = 0.1
top_solid_layers = 8
bottom_solid_layers = 7
support_material_contact_distance = 0.17
raft_contact_distance = 0.15
external_perimeter_acceleration = 2000
perimeter_acceleration = 2000
solid_infill_acceleration = 3000
infill_acceleration = 3000
default_acceleration = 2000
perimeters = 3
perimeter_extrusion_width = 0.4
external_perimeter_extrusion_width = 0.4
infill_extrusion_width = 0.4
solid_infill_extrusion_width = 0.4
top_infill_extrusion_width = 0.4
# XXXXXXxxXXXXXXXXXXXXXX
# XXX--- filament ---XXX
@ -4900,7 +4972,7 @@ start_filament_gcode = "M900 K{if nozzle_diameter[0]==0.6}0.12{elsif nozzle_diam
[filament:*PETMINIIS*]
inherits = *PETMINI*
filament_max_volumetric_speed = 12
filament_max_volumetric_speed = 11
slowdown_below_layer_time = 10
compatible_printers_condition = printer_notes=~/.*MINIIS.*/
start_filament_gcode = "M572 S{if nozzle_diameter[0]==0.6}0.2{elsif nozzle_diameter[0]==0.4}0.4{else}0{endif}"
@ -6352,7 +6424,7 @@ inherits = Generic PETG @PG 0.8; *PET08XL*
[filament:Generic PETG @PGIS]
inherits = Generic PETG @PG
renamed_from = "Generic PETG @MK4IS"
filament_max_volumetric_speed = 13
filament_max_volumetric_speed = 11
min_fan_speed = 35
max_fan_speed = 60
first_layer_temperature = 240
@ -10421,7 +10493,7 @@ inherits = Prusament PETG @PG 0.8; *PET08XL*
[filament:Prusament PETG @PGIS]
inherits = Prusament PETG @PG
renamed_from = "Prusament PETG @MK4IS"
filament_max_volumetric_speed = 15
filament_max_volumetric_speed = 12
min_fan_speed = 35
max_fan_speed = 60
filament_retract_length = 0.8
@ -18758,7 +18830,7 @@ printer_variant = 0.4
thumbnails = 16x16/QOI, 220x124/QOI, 200x240/QOI, 640x480/PNG
bed_shape = 0x0,180x0,180x180,0x180
default_filament_profile = "Prusament PLA @MINIIS"
default_print_profile = 0.20mm SPEED @MINIIS
default_print_profile = 0.20mm SPEED @MINIIS 0.4
gcode_flavor = marlin2
machine_max_acceleration_extruding = 4000
machine_max_acceleration_travel = 4000

3
src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -2639,9 +2639,10 @@ void GLCanvas3D::reload_scene(bool refresh_immediately, bool force_full_scene_re
raycaster->set_active(v->is_active);
}
// check activity/visibility of the modifiers in SLA mode
for (GLVolume* volume : m_volumes.volumes)
if (volume->object_idx() < (int)m_model->objects.size() && m_model->objects[volume->object_idx()]->instances[volume->instance_idx()]->is_printable()) {
if (volume->is_modifier && m_model->objects[volume->object_idx()]->volumes[volume->volume_idx()]->is_modifier())
if (volume->is_active && volume->is_modifier && m_model->objects[volume->object_idx()]->volumes[volume->volume_idx()]->is_modifier())
volume->is_active = printer_technology != ptSLA;
}