Merge branch '1.1.3' into development

This commit is contained in:
larsbrubaker 2014-09-25 16:20:12 -07:00
commit b306be1dd5
3 changed files with 3 additions and 3 deletions

View file

@ -95,6 +95,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
//endCode=M104 S0
new MapEndGCode("endCode", "end_gcode"),
new MapItem("zOffset", "z_offset"),
//extruderOffsets=[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]]
new MapItem("extruderOffsets", "extruder_offset"),

View file

@ -140,4 +140,4 @@ use_relative_e_distances = 0
vibration_limit = 0
wipe = 0
wipe_shield_distance = 0
z_offset = 0
z_offset = 1

View file

@ -2,5 +2,3 @@ baud_rate = 250000
windows_driver = RRD_RUMBA_TAURINO_DriverSetup.exe
default_material_presets = PLA
default_quality_preset = Medium
needs_print_leveling = 1
print_leveling_type = 2Point