Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development

Conflicts:
	StaticData/Translations/Master.txt
This commit is contained in:
Gregory Diaz 2015-04-30 09:38:41 -07:00
commit 88cbb22e19
15 changed files with 540 additions and 429 deletions

View file

@ -3,7 +3,7 @@ bed_shape = rectangular
bed_size = 228,254
bed_temperature = 90
bottom_clip_amount = 0
bottom_solid_layers = 3
bottom_solid_layers = 1mm
bridge_acceleration = 0
bridge_fan_speed = 100
bridge_flow_ratio = 1
@ -134,7 +134,7 @@ threads = 2
toolchange_gcode =
top_infill_extrusion_width = 0
top_solid_infill_speed = 50
top_solid_layers = 3
top_solid_layers = 1mm
travel_speed = 150
use_firmware_retraction = 0
use_relative_e_distances = 0

View file

@ -3,7 +3,7 @@ bed_shape = rectangular
bed_size = 200,200
bed_temperature = 70
bottom_clip_amount = 0
bottom_solid_layers = 3
bottom_solid_layers = 1mm
bridge_acceleration = 0
bridge_fan_speed = 100
bridge_flow_ratio = 1
@ -128,7 +128,7 @@ support_material_extruder = 1
support_material_extrusion_width = 0
support_material_infill_angle = 45
support_material_interface_extruder = 1
support_material_interface_layers = 3
support_material_interface_layers = .9mm
support_material_interface_spacing = 0
support_material_pattern = honeycomb
support_material_spacing = 2.5
@ -136,7 +136,7 @@ support_material_speed = 60
support_material_threshold = 0
support_material_xy_distance = 0.7
support_material_z_distance = 0.15
support_material_z_gap_layers = 1
support_material_z_gap_layers = .3mm
support_type = LINES
temperature = 200
thin_walls = 1
@ -144,7 +144,7 @@ threads = 2
toolchange_gcode =
top_infill_extrusion_width = 0
top_solid_infill_speed = 50
top_solid_layers = 3
top_solid_layers = 1mm
travel_speed = 130
use_firmware_retraction = 0
use_relative_e_distances = 0