Commit graph

8 commits

Author SHA1 Message Date
larsbrubaker
5c0993f83e Changed the interface to translations. 2014-03-11 15:24:47 -07:00
larsbrubaker
ab0950e0d0 Merge branch '1.0.5' into development
Conflicts:
	MatterControl.csproj
2014-03-11 11:09:38 -07:00
larsbrubaker
db8ff174c2 Merge remote-tracking branch 'origin/development' into development 2014-03-05 21:04:32 -08:00
larsbrubaker
f52eae0f33 Merge branch '1.0.5' of https://github.com/MatterHackers/MatterControl into development 2014-03-05 21:04:28 -08:00
larsbrubaker
0cebab830a Moved frosted serial into agg
changed some namespaces
2014-03-05 10:33:19 -08:00
larsbrubaker
1e5e8d672a Deleted a bunch of OnMouse code that did not add value.
Merge remote-tracking branch 'origin/1.0.5' into development

Conflicts:
	PartPreviewWindow/GcodeViewBasic.cs
2014-03-04 07:32:11 -08:00
larsbrubaker
841ddc2a2c Using the new GetFirstNumberAfter interface in GCodeFile 2014-03-03 10:15:21 -08:00
Kevin Pope
8ab9f15a70 Refactoring and cleanup. Added new separate tab for configuration actions. 2014-03-01 13:10:48 -08:00