nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Lars Brubaker 2016-04-29 18:16:22 -07:00
commit abccddacd6
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PrinterCommunication/Io/ResumePrintingStream.cs
View file

@ -83,7 +83,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
queuedCommands.Add("G90; use absolute coordinates");
queuedCommands.Add("G92 E0; reset the expected extruder position");
queuedCommands.Add("M82; use absolute distance for extrusion");
queuedCommands.Add("M109 S{0}".FormatWith(ActiveSliceSettings.Instance.ExtruderTemperature(1)));
queuedCommands.Add("M109 S{0}".FormatWith(ActiveSliceSettings.Instance.ExtruderTemperature(0)));
resumeState = ResumeState.Raising;
return "";

2
SlicerConfiguration/SettingsControlBar.cs
View file

@ -58,7 +58,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
}
int colorIndex = i % colorList.Count;
RGBA_Bytes color = colorList[colorIndex];
this.AddChild(new PresetSelectorWidget(string.Format("{0} {1}", "Material".Localize(), i), color, "material", i));
this.AddChild(new PresetSelectorWidget(string.Format("{0} {1}", "Material".Localize(), i + 1), color, "material", i));
}
}
else