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

4898 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lars Brubaker
1c12b620fb Moved quoted settings to SettingsKey 2016-07-28 16:45:45 -07:00
Lars Brubaker
1c5a326be7 Merge pull request #1217 from larsbrubaker/master 
Clear one time settings on import from DB
 2016-07-28 16:42:09 -07:00
Lars Brubaker
d7fcfa8b14 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-07-28 16:38:15 -07:00
Lars Brubaker
6066185b0d Clear one time settings on import from DB 
Make sure we don't show create printers if imported printers from DB
Make sure we don't crash if can't find date in oemlayer
 2016-07-28 16:37:24 -07:00
Lars Brubaker
49efa92ee3 Clear one time settings on import from DB 
Make sure we don't show create printers if imported printers from DB
Make sure we don't crash if can't find date in oemlayer
 2016-07-28 16:36:47 -07:00
johnlewin
21c2d91d23 Merge pull request #1216 from jlewin/master 
Add Mac nunit config file
 2016-07-28 16:27:55 -07:00
John Lewin
55afba3842 Add Mac nunit config file 2016-07-28 16:03:53 -07:00
Lars Brubaker
ce6ae492a1 Merge pull request #1214 from larsbrubaker/master 
Don't try to install the windows driver on mac & linux
 2016-07-28 12:32:38 -07:00
Lars Brubaker
db80421b14 Merge pull request #1211 from rytz/master 
minor help text/settings edits
 2016-07-28 12:20:59 -07:00
Lars Brubaker
8996aee110 Made the time format consistent with the history times 2016-07-28 12:19:30 -07:00
Lars Brubaker
583bcde991 Don't try to install the windows driver on mac & linux 2016-07-28 12:04:43 -07:00
Lars Brubaker
ef1addf8dd Merge pull request #1213 from larsbrubaker/master 
We can now go to the com port page rather than driver
 2016-07-28 12:03:59 -07:00
Lars Brubaker
040a15f068 We can now go to the com port page rather than driver 2016-07-28 11:53:10 -07:00
Tyler Anderson
a3d44a22d8 added some more infill patterns for slic3r 2016-07-28 11:15:36 -07:00
johnlewin
065908e403 Merge pull request #1212 from jlewin/master 
DownloadPrinterProfile should return an instance of PrinterSettings
 2016-07-28 09:52:16 -07:00
John Lewin
43e94f6ed4 DownloadPrinterProfile should return an instance of PrinterSettings 
- Persistence of profile moves to caller
 - Rename to GetPrinterProfileAsync
 - Expose PrinterSettings.Save for use in external assemblies
 - Issue MatterHackers/MCCentral#227,  MatterHackers/MCCentral#242
 2016-07-28 09:46:12 -07:00
rytz
cf60c3caf4 minor help text/settings edits 2016-07-28 09:39:48 -07:00
Lars Brubaker
48518f4314 Merge pull request #1208 from larsbrubaker/master 
Made the license agreement text do wrapping in a background thread.
 2016-07-27 17:26:11 -07:00
Lars Brubaker
054d552289 Changed the signature of WrappedTextWidget 2016-07-27 17:17:33 -07:00
Lars Brubaker
3fbf40237a Made the license agreement text do wrapping in a background thread. 2016-07-27 15:36:19 -07:00
Lars Brubaker
2e9262fa31 Merge pull request #1205 from larsbrubaker/master 
put back in  perimeter_start_end_overlap
 2016-07-27 09:45:17 -07:00
Lars Brubaker
9b54d5f114 put back in perimeter_start_end_overlap 2016-07-27 09:33:04 -07:00
Lars Brubaker
4f1a03d2f9 Merge pull request #1202 from unlimitedbacon/helptext 
Moved some settings around
 2016-07-26 20:54:45 -07:00
Tyler Anderson
ffc9c94d4d Moved some settings around 2016-07-26 17:55:40 -07:00
Lars Brubaker
030c4d28c4 Merge pull request #1201 from larsbrubaker/master 
Set the visibility of the reset connection correctly.
 2016-07-26 17:36:07 -07:00
Lars Brubaker
cc0be8788b Set the visibility of the reset connection correctly. 2016-07-26 17:35:11 -07:00
Lars Brubaker
dbb087f67d Merge pull request #1199 from larsbrubaker/master 
eula and queue options menu working
 2016-07-26 17:22:08 -07:00
Lars Brubaker
27a64277b3 latest agg 2016-07-26 17:12:10 -07:00
Lars Brubaker
abc73afa7b Make sure the eula stays on top 2016-07-26 17:03:30 -07:00
Lars Brubaker
414aa5bc79 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-07-26 16:51:07 -07:00
Lars Brubaker
52e2666dc8 enabling eula on mac and android 2016-07-26 16:50:07 -07:00
johnlewin
5ebf0f5883 Merge pull request #1198 from jlewin/master 
Update OemProfiles to comply with new M109 tests
 2016-07-26 15:43:23 -07:00
Lars Brubaker
da082c006e Turn off options that are not working on Android. 2016-07-26 15:41:05 -07:00
Lars Brubaker
e8406f6d39 Turn off options that are not working on Android. 2016-07-26 15:40:12 -07:00
John Lewin
4f2ea7d539 Rename ConfigIniTests to OemProfileTests 2016-07-26 15:34:52 -07:00
John Lewin
1df6fc18d6 Update OemProfiles to comply with new M109 tests 
- Fix Creator and Evolution printers
 - Ignore base layer for Slice preset by using OemLayer.ValueOrDefault rather than GetValue
 - Rename test to StartGCodeWithExtrudesMustFollowM109Heatup
 2016-07-26 15:32:36 -07:00
johnlewin
e2ddda99e9 Merge pull request #1197 from mmoening/master 
removed random extra semicolin
 2016-07-26 15:17:23 -07:00
Matt Moening
2c927b48ad removed random extra semicolin 2016-07-26 14:34:37 -07:00
johnlewin
5aac8d0d3a Merge pull request #1196 from jlewin/master 
Make LoadCacheable collector return instance of T rather than string
 2016-07-26 13:49:26 -07:00
John Lewin
4ece8d18a7 Make LoadCacheable collector return instance of T rather than string 
- Issue #1195, #1188
 2016-07-26 13:22:24 -07:00
johnlewin
b1c51490a8 Merge pull request #1194 from gregory-diaz/master 
Added ability to start a print when MatterControl initially loads.
 2016-07-26 13:00:28 -07:00
johnlewin
c1aa41dc70 Merge pull request #1193 from mmoening/master 
Fixed oemProfiles to oemprofiles for last outlying spot
 2016-07-26 12:44:56 -07:00
Matt Moening
cc93bed424 Fixed oemProfiles to oemprofiles for last outlying spot 2016-07-26 12:43:59 -07:00
Greg
de337be1d5 Added ability to start a print when MatterControl initially loads. 
*  Check to see if there is a specially named file on disk
*  If the file exists we skip the PrinterSetupWizard
* Then we connect to a printer, add a file to the queue, slice, then start printing
 2016-07-26 12:42:03 -07:00
johnlewin
80a52c8355 Merge pull request #1190 from mmoening/master 
Fixed bug where would try to write to a OemProfile Twice throwing an exception
 2016-07-26 12:41:55 -07:00
Lars Brubaker
dc7de12e69 Merge pull request #1187 from unlimitedbacon/density 
Fixed estimated cost
 2016-07-26 10:56:14 -07:00
Lars Brubaker
109895c4d0 Merge pull request #1191 from larsbrubaker/master 
Refactored PrinterActionRow
 2016-07-26 10:51:38 -07:00
Lars Brubaker
67baebbb19 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-07-26 10:46:04 -07:00
Matt Moening
ffc280da73 Fixed bug where would try to write to a OemProfile Twice throwing an exception 
- Removed ReloadOemProfiles form on load (ReloadOemProfiles is called in sync and sync is called on start up so two calls were going out at once)
 - DownloadMissingProfiles is no longer a separate task so that we don't resync and try to run a second download of missing profiles
 2016-07-26 10:42:55 -07:00
Lars Brubaker
a3c0cdcea5 Refactored PrinterActionRow 
made show_reset_connection a SettingsKey
Made the show_reset_connection less expensive to change
 2016-07-26 09:30:12 -07:00