GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-20 10:59:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed merging errors of the Slic3r profiles: Profiles were copied from the master

Browse Source
This commit is contained in:
bubnikv 2018-02-13 12:19:43 +01:00
parent 732553711f
commit 49df8bb84c
3 changed files with 1 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
resources/profiles/Original Prusa i3 MK2, MK2S, MK2MM and MK3.ini
View File

@ -1517,28 +1517,17 @@ first_layer_height = 0.2
first_layer_speed = 30
gap_fill_speed = 40
gcode_comments = 0
<<<<<<< HEAD
infill_acceleration = 3500
=======
infill_acceleration = 1500
>>>>>>> master
infill_every_layers = 1
infill_extruder = 1
infill_extrusion_width = 0.45
infill_first = 0
infill_only_where_needed = 0
infill_overlap = 25%
<<<<<<< HEAD
infill_speed = 200
interface_shells = 0
layer_height = 0.2
max_print_speed = 250
=======
infill_speed = 170
interface_shells = 0
layer_height = 0.2
max_print_speed = 170
>>>>>>> master
max_volumetric_extrusion_rate_slope_negative = 0
max_volumetric_extrusion_rate_slope_positive = 0
max_volumetric_speed = 0
@ -1566,11 +1555,7 @@ solid_infill_below_area = 0
solid_infill_every_layers = 0
solid_infill_extruder = 1
solid_infill_extrusion_width = 0.45
<<<<<<< HEAD
solid_infill_speed = 200
=======
solid_infill_speed = 170
>>>>>>> master
spiral_vase = 0
standby_temperature_delta = -5
support_material = 0
@ -1597,11 +1582,7 @@ threads = 4
top_infill_extrusion_width = 0.4
top_solid_infill_speed = 50
top_solid_layers = 5
<<<<<<< HEAD
travel_speed = 250
=======
travel_speed = 170
>>>>>>> master
wipe_tower = 1
wipe_tower_per_color_wipe = 15
wipe_tower_width = 60
@ -3579,11 +3560,7 @@ retract_speed = 35
serial_port =
serial_speed = 250000
single_extruder_multi_material = 0
<<<<<<< HEAD
start_gcode = M115 U3.1.1-RC4 ; tell printer latest fw version\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG1 Y-3.0 F1000.0 ; go outside print area\nG92 E0.0\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E12.5 F1000.0 ; intro line\nG92 E0.0\nM221 S95
=======
start_gcode = M115 U3.1.1-RC5 ; tell printer latest fw version\nM201 X1000 Y1000 Z200 E5000 ; sets maximum accelerations, mm/sec^2\nM203 X200 Y200 Z12 E120 ; sets maximum feedrates, mm/sec\nM204 S1250 T1250 ; sets acceleration (S) and retract acceleration (T)\nM205 X10 Y10 Z0.4 E2.5 ; sets the jerk limits, mm/sec\nM205 S0 T0 ; sets the minimum extruding and travel feed rate, mm/sec\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG1 Y-3.0 F1000.0 ; go outside print area\nG92 E0.0\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E12.5 F1000.0 ; intro line\nG92 E0.0\nM221 S{if layer_height==0.05}100{else}95{endif}
>>>>>>> master
toolchange_gcode =
use_firmware_retraction = 0
use_relative_e_distances = 1
@ -3593,10 +3570,6 @@ wipe = 1
z_offset = 0
[presets]
<<<<<<< HEAD
print = 0.05mm DETAIL MK3
=======
print = 0.15mm OPTIMAL MK3
>>>>>>> master
printer = Original Prusa i3 MK3
filament = Prusa PLA

2
resources/profiles/Original Prusa i3 MK2MM.ini
View File

@ -1,4 +1,4 @@
# generated by Slic3r Prusa Edition 1.38.6 on 2018-01-05 at 16:05:58
# generated by Slic3r Prusa Edition 1.39.0 on 2018-01-06 at 15:12:06
[print:0.05mm DETAIL]
avoid_crossing_perimeters = 0

23
resources/profiles/Original Prusa i3 MK3.ini
View File

@ -1517,28 +1517,17 @@ first_layer_height = 0.2
first_layer_speed = 30
gap_fill_speed = 40
gcode_comments = 0
<<<<<<< HEAD
infill_acceleration = 3500
=======
infill_acceleration = 1500
>>>>>>> master
infill_every_layers = 1
infill_extruder = 1
infill_extrusion_width = 0.45
infill_first = 0
infill_only_where_needed = 0
infill_overlap = 25%
<<<<<<< HEAD
infill_speed = 200
interface_shells = 0
layer_height = 0.2
max_print_speed = 250
=======
infill_speed = 170
interface_shells = 0
layer_height = 0.2
max_print_speed = 170
>>>>>>> master
max_volumetric_extrusion_rate_slope_negative = 0
max_volumetric_extrusion_rate_slope_positive = 0
max_volumetric_speed = 0
@ -1566,11 +1555,7 @@ solid_infill_below_area = 0
solid_infill_every_layers = 0
solid_infill_extruder = 1
solid_infill_extrusion_width = 0.45
<<<<<<< HEAD
solid_infill_speed = 200
=======
solid_infill_speed = 170
>>>>>>> master
spiral_vase = 0
standby_temperature_delta = -5
support_material = 0
@ -1597,11 +1582,7 @@ threads = 4
top_infill_extrusion_width = 0.4
top_solid_infill_speed = 50
top_solid_layers = 5
<<<<<<< HEAD
travel_speed = 250
=======
travel_speed = 170
>>>>>>> master
wipe_tower = 1
wipe_tower_per_color_wipe = 15
wipe_tower_width = 60
@ -3299,11 +3280,7 @@ retract_speed = 35
serial_port =
serial_speed = 250000
single_extruder_multi_material = 0
<<<<<<< HEAD
start_gcode = M115 U3.1.1-RC4 ; tell printer latest fw version\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG1 Y-3.0 F1000.0 ; go outside print area\nG92 E0.0\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E12.5 F1000.0 ; intro line\nG92 E0.0\nM221 S95
=======
start_gcode = M115 U3.1.1-RC5 ; tell printer latest fw version\nM201 X1000 Y1000 Z200 E5000 ; sets maximum accelerations, mm/sec^2\nM203 X200 Y200 Z12 E120 ; sets maximum feedrates, mm/sec\nM204 S1250 T1250 ; sets acceleration (S) and retract acceleration (T)\nM205 X10 Y10 Z0.4 E2.5 ; sets the jerk limits, mm/sec\nM205 S0 T0 ; sets the minimum extruding and travel feed rate, mm/sec\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG1 Y-3.0 F1000.0 ; go outside print area\nG92 E0.0\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E12.5 F1000.0 ; intro line\nG92 E0.0\nM221 S{if layer_height==0.05}100{else}95{endif}
>>>>>>> master
toolchange_gcode =
use_firmware_retraction = 0
use_relative_e_distances = 1