nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4115 commits 1 branch 0 tags 103 MiB
Commit graph

4115 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lars Brubaker
8f94679671 A bit more work on printer editing. 2016-05-15 11:52:40 -07:00
Lars Brubaker
ba33eb1d37 Made automation able to show the software mouse whenever desired. 2016-05-13 14:24:00 -07:00
Lars Brubaker
ce13f6f59c Put in a hack for the printer edit button. 2016-05-13 14:23:33 -07:00
Lars Brubaker
dd72281bc2 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-05-13 11:38:35 -07:00
Lars Brubaker
5a908c7973 Working on edit button for printer 2016-05-13 11:37:22 -07:00
johnlewin
94d1ca6de2 Merge pull request #766 from jlewin/master 
Add missing Net3dBool project
 2016-05-13 11:11:56 -07:00
John Lewin
34e12a4565 Add missing Net3dBool project 2016-05-13 11:10:21 -07:00
Lars Brubaker
4945580ae5 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-05-12 19:12:47 -07:00
Lars Brubaker
dd67d8055d Merge pull request #764 from larsbrubaker/master 
Changed Connection Info -> Connection in settings tab.
 2016-05-12 19:12:03 -07:00
Lars Brubaker
301316b82c Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-05-12 19:09:39 -07:00
Lars Brubaker
c33b3ac8b6 Changed Connection Info -> Connection in settings tab. 2016-05-12 18:56:40 -07:00
Lars Brubaker
6353f3c69c Merge pull request #760 from larsbrubaker/master 
TAZ6 profile
 2016-05-12 18:55:58 -07:00
Lars Brubaker
05fe8183f7 Merge remote-tracking branch 'origin/master' 2016-05-12 18:44:51 -07:00
Lars Brubaker
5e7e8f70dc Added a drop list to baud rate 
Added Printer to basic and Intermediate
Made clearing user override reset quick select settings drop lists
 2016-05-12 18:42:19 -07:00
johnlewin
2d80e740ec Merge pull request #762 from jlewin/master 
Latest Agg
 2016-05-12 17:46:36 -07:00
John Lewin
9d55274058 Latest Agg 2016-05-12 17:32:39 -07:00
Lars Brubaker
9d268fb9c9 Merge pull request #741 from jlewin/per_printer_themes 
Experimental support for per printer themes
 2016-05-12 16:32:15 -07:00
Lars Brubaker
9e9f1dc4a4 Merge remote-tracking branch 'origin/1.5.3' 2016-05-12 16:13:46 -07:00
Lars Brubaker
0bb91039c1 latest agg 2016-05-12 16:13:17 -07:00
Lars Brubaker
2f4fdd5c8e Merge pull request #745 from gregory-diaz/1.5.3 
Added printer profile for TAZ 6
 2016-05-12 16:09:58 -07:00
Lars Brubaker
19c7e032db Merge pull request #744 from larsbrubaker/master 
Make sure clicking the revert user settings button refreshes required…
 2016-05-12 11:10:50 -07:00
John Lewin
6c837c4f4c Fix null reference exposed by unit tests 2016-05-12 11:05:45 -07:00
Greg
8c1572db2e Added printer profile for TAZ 6 2016-05-12 11:05:38 -07:00
Lars Brubaker
d4bf7ecd04 Make sure clicking the revert user settings button refreshes required displays 
Default to min homing (more common)
Invert the colors of the gear icon

Fixes MatterHackers/MCentral#79
Fixes MatterHackers/MCentral#97
 2016-05-12 10:57:41 -07:00
John Lewin
284b2d8c24 Per printer themes 
- Fixes #738
 2016-05-12 07:30:11 -07:00
johnlewin
9c0bbe763b Merge pull request #740 from jlewin/master 
Fix icons and improve profile imports
 2016-05-11 21:40:28 -07:00
John Lewin
d292e64ede Fix icons and improve profile imports 
- Invert Camera image
 - Set first imported profile as active
 - Import profiles from db if missing
 - Edit presets button should do nothing on '- default -'
 2016-05-11 21:31:29 -07:00
johnlewin
aee22882e6 Merge pull request #739 from jlewin/master 
Rename file to match TypeName
 2016-05-11 20:35:03 -07:00
John Lewin
c0d2b563f4 Rename file to match TypeName 2016-05-11 20:20:13 -07:00
Lars Brubaker
6613015ede Merge pull request #736 from larsbrubaker/1.5.3 
Only send G28 when requesting all 3 axis.
 2016-05-11 17:16:12 -07:00
Lars Brubaker
3af6293bb2 Merge pull request #735 from jlewin/master 
Fix broken tests - ensure db is initialized before test execution
 2016-05-11 17:10:41 -07:00
Lars Brubaker
e07a1a07b3 Only send G28 when requesting all 3 axis. 2016-05-11 17:04:30 -07:00
John Lewin
92774df91c Fix broken tests - ensure db is initialized before test execution 2016-05-11 16:18:54 -07:00
johnlewin
002313505a Merge pull request #734 from jlewin/master 
Fix broken stream tests, use AreEqual to improve failure troubleshooting
 2016-05-11 15:45:36 -07:00
John Lewin
bf744385e5 Fix broken test - ensure db is initialized before l10n 2016-05-11 14:54:32 -07:00
johnlewin
f3ab057612 Merge pull request #733 from jlewin/master 
Fix broken stream tests, use AreEqual to improve failure troubleshooting
 2016-05-11 13:06:09 -07:00
John Lewin
e580c886a9 Improve failure logging, move unstable test to FixNeeded 2016-05-11 12:44:04 -07:00
John Lewin
d68a5d6d07 Fix broken stream tests, use AreEqual to improve failure troubleshooting 2016-05-11 12:41:13 -07:00
Lars Brubaker
4c7c074faf Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-05-11 12:26:53 -07:00
Lars Brubaker
5614563530 let .net do the rounding 2016-05-11 12:26:20 -07:00
johnlewin
c9317f9000 Merge pull request #732 from jlewin/master 
Move automation tests to "MatterControl.UI.Automation" category
 2016-05-11 12:02:53 -07:00
John Lewin
c255e46032 Move automation tests to "MatterControl.UI.Automation" category 
- Change namespaces to MatterHackers.MatterControl.Tests.Automation
 - Cleanup using statements
 2016-05-11 09:16:03 -07:00
John Lewin
ca52328202 Fix "imported type conflicts with existing" warnings 2016-05-11 09:10:55 -07:00
Lars Brubaker
7f1255ace1 Latest agg 2016-05-10 16:25:14 -07:00
Lars Brubaker
4cb2d95fff Improved settings naming. 2016-05-10 15:04:43 -07:00
Lars Brubaker
6237997de5 Fixed the arrow icons to render correctly. 2016-05-10 14:53:40 -07:00
Lars Brubaker
34c2b1ced6 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-05-10 13:31:09 -07:00
Lars Brubaker
c324a9a545 Added the printer name to slice settings ui 
Reorganized settings layout a bit for printer/ fatures
Made more invert lightness extension method uses
 2016-05-10 13:30:51 -07:00
johnlewin
f0599e4f36 Merge pull request #730 from jlewin/master 
Fix issue preventing tests from overriding AppData in Release
 2016-05-10 13:29:54 -07:00
John Lewin
d1309a9942 Fix issue preventing tests from overriding AppData in Release 2016-05-10 13:20:02 -07:00