Commit graph

9 commits

Author SHA1 Message Date
John Lewin
4496720772 Json Profiles 2016-04-27 14:35:57 -07:00
Lars Brubaker
591528ee91 Ran code maid against this code. 2015-04-08 15:20:10 -07:00
Kevin Pope
5354d3976c Fix slice engine ui handling. 2014-09-05 13:04:41 -07:00
Kevin Pope
d7977022ef Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-08-27 16:42:11 -07:00
Kevin Pope
8b3a0d8e13 Fix MatterSlice engine path. 2014-08-27 16:41:25 -07:00
gregory-diaz
c02e86441a Export X3g Stuff 2014-08-27 12:02:15 -07:00
Kevin Pope
02022b8589 Slice engine info refactoring. 2014-08-20 12:14:45 -07:00
Kevin Pope
4759adbf3b Merge branch 'development' into greg-development
Conflicts:
	MatterControl.csproj
	StaticData/Translations/Master.txt
2014-08-20 10:52:47 -07:00
gregory-diaz
c8530bc699 Restructured logic on how we look for slice engines and implemented work in settingscontrolselector 2014-08-19 18:08:40 -07:00