3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-10 07:15:08 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' into updating

Browse source
This commit is contained in:
Vojtech Kral 2018-04-16 17:26:02 +02:00
commit 214ad2925b
52 changed files with 3331 additions and 1146 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
resources/icons/action_undo.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 616 B

After

Width:  |  Height:  |  Size: 491 B

Before After
Before After

BIN
resources/icons/sys_lock.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 448 B

After

Width:  |  Height:  |  Size: 510 B

Before After
Before After

BIN
resources/icons/sys_unlock.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 454 B

After

Width:  |  Height:  |  Size: 419 B

Before After
Before After

4
resources/profiles/PrusaResearch.ini
View file

@ -600,6 +600,7 @@ temperature = 255
[filament:*FLEX*]
inherits = *common*
bed_temperature = 50
bridge_fan_speed = 100
compatible_printers_condition = nozzle_diameter[0]>0.35 and num_extruders==1
cooling = 0
@ -950,6 +951,7 @@ variable_layer_height = 0
[printer:Original Prusa i3 MK2]
inherits = *common*
default_print_profile = 0.15mm OPTIMAL
[printer:Original Prusa i3 MK2 0.25 nozzle]
inherits = *common*
@ -968,6 +970,7 @@ max_layer_height = 0.35
min_layer_height = 0.1
nozzle_diameter = 0.6
printer_variant = 0.6
default_print_profile = 0.20mm NORMAL 0.6 nozzle
[printer:Original Prusa i3 MK2 MM Single Mode]
inherits = *mm-single*
@ -976,6 +979,7 @@ inherits = *mm-single*
inherits = *mm-single*
nozzle_diameter = 0.6
printer_variant = 0.6
default_print_profile = 0.20mm NORMAL 0.6 nozzle
[printer:Original Prusa i3 MK2 MultiMaterial]
inherits = *mm-multi*