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

5684 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Lewin
f19ffd5efe Use correct Assert method 2016-12-05 16:10:54 -08:00
John Lewin
716972896f Assert UserLayer is empty in production .printer files 2016-12-05 15:57:35 -08:00
Lars Brubaker
d364d4eff9 Merge pull request #1691 from jlewin/master 
Rewrite PrinterConfigTests to use .printer/PrinterSettings files
 2016-12-05 15:48:38 -08:00
Lars Brubaker
351fbbf9ec Merge branch 'master' into master 2016-12-05 15:44:17 -08:00
Lars Brubaker
ec4ede574e Merge pull request #1692 from larsbrubaker/master 
progress bar for heating
 2016-12-05 15:44:06 -08:00
John Lewin
57cfe64a5c Fix StaticData/Profiles path 2016-12-05 15:37:07 -08:00
Lars Brubaker
8733a73ab0 Better margin 2016-12-05 15:23:54 -08:00
John Lewin
755c7ac2aa Rewrite PrinterConfigTests to use .printer/PrinterSettings files 
- Migrate first_layer_speed to SettingsKey
- Use specialized Asserts to assist in troubleshooting
- Improve failure text to assist in troubleshooting
- Process all layers in .printer files
 2016-12-05 15:18:43 -08:00
Lars Brubaker
1876422bd9 Progress bar for temp and time. 2016-12-05 15:05:09 -08:00
johnlewin
900b492a4b Merge pull request #1689 from larsbrubaker/master 
Make sure the queue is passing all unit tests
 2016-12-05 12:07:14 -08:00
Lars Brubaker
c6d50d9907 Make sure the queue is passing all unit tests 
If single item selected add to array
Make sure we update selection visibility when going in and out of editor
Fixed some tests
 2016-12-05 11:55:08 -08:00
Lars Brubaker
03c6d16daf Merge pull request #1688 from larsbrubaker/master 
Putting progress bar on macro window.
 2016-12-04 19:30:27 -08:00
larsbrubaker
7423a675e2 Corret variable name 2016-12-04 19:22:37 -08:00
larsbrubaker
b53c9bf375 Merge remote-tracking branch 'lars/master' 2016-12-04 19:21:19 -08:00
larsbrubaker
142ab1817a Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-12-04 19:19:28 -08:00
Lars Brubaker
5fcc0b0084 Merge branch 'master' into master 2016-12-04 18:14:40 -08:00
larsbrubaker
106a52b368 Putting progress bar on macro window. 2016-12-04 18:13:58 -08:00
Lars Brubaker
2765261931 Merge pull request #1687 from larsbrubaker/master 
Refactoring select queue items
 2016-12-04 12:32:16 -08:00
larsbrubaker
541e4ef7b1 Fixed the test that had not been updated 2016-12-04 12:26:04 -08:00
larsbrubaker
166325734e latest agg 2016-12-04 12:20:13 -08:00
larsbrubaker
9b202feb37 Putting Selection List into QueueData 
Compiling but not worknig
 2016-12-04 12:06:51 -08:00
larsbrubaker
65e487dbc3 partial refactor to queue 2016-12-04 12:06:09 -08:00
larsbrubaker
95fec91905 Latest agg 2016-12-04 12:05:05 -08:00
Lars Brubaker
500f0f3ddb Merge pull request #1686 from larsbrubaker/master 
Made the macro and gcode edit windows edit faster
 2016-12-03 12:55:12 -08:00
larsbrubaker
1c9af30332 Made the macro and gcode edit windows edit faster 2016-12-03 12:48:19 -08:00
Lars Brubaker
b64fc1d5c2 Merge pull request #1685 from larsbrubaker/master 
Got the new mocros menu working well
 2016-12-03 12:25:33 -08:00
Lars Brubaker
db51ae76fa Merge branch 'master' into master 2016-12-03 12:15:08 -08:00
Lars Brubaker
d76c085a4f Merge pull request #1680 from gregory-diaz/master 
Removed failing experimental "stress" test
 2016-12-03 12:15:03 -08:00
Lars Brubaker
98594899df Merge branch 'master' into master 2016-12-03 12:09:50 -08:00
larsbrubaker
78439d34ab Got the new mocros menu working well 2016-12-03 12:08:39 -08:00
Lars Brubaker
ca98cd44ce Merge pull request #1682 from larsbrubaker/master 
Fixing up automation tests
 2016-12-02 18:09:48 -08:00
Lars Brubaker
2e93d43ccd Fixing up automation tests 2016-12-02 18:06:29 -08:00
johnlewin
a34b97ff44 Merge pull request #1681 from larsbrubaker/master 
Made it so that we can run tests in software mode.
 2016-12-02 16:55:35 -08:00
Lars Brubaker
21b45ec761 Made it so that we can run tests in software mode. 2016-12-02 16:49:18 -08:00
Greg
9763016567 Removed failing experimental "stress" test 2016-12-02 16:34:44 -08:00
johnlewin
fc7b576784 Merge pull request #1679 from larsbrubaker/master 
Make AddAndSelectPrinter more stable
 2016-12-02 16:23:54 -08:00
Lars Brubaker
23061f51cb Make AddAndSelectPrinter more stable 2016-12-02 15:44:12 -08:00
johnlewin
330d828f97 Merge pull request #1678 from larsbrubaker/master 
Make pause work correctly with always printing
 2016-12-02 14:09:21 -08:00
johnlewin
01aef489c4 Merge branch 'master' into master 2016-12-02 14:05:37 -08:00
johnlewin
a5e2b3ff11 Merge pull request #1677 from gregory-diaz/master 
Fix ExportItemsFromDownloads.ExportAsGcode
 2016-12-02 14:04:36 -08:00
Lars Brubaker
2ba531c384 Merge branch 'master' into master 2016-12-02 13:55:58 -08:00
Lars Brubaker
0c08c6c5ce Make pause work correctly with always printing 2016-12-02 13:51:58 -08:00
Greg
f0980c5031 Moved test from MatterControlAutomationTests to CloudServicesTests so that it works 2016-12-02 12:41:13 -08:00
Greg
8003114063 Fix ExportItemsFromDownloads.ExportAsGcode 
MatterHackers/MCCentral#878
 2016-12-02 11:38:13 -08:00
johnlewin
ce4bb874d1 Merge pull request #1676 from larsbrubaker/master 
Reverted new command line code
 2016-12-02 11:09:07 -08:00
Lars Brubaker
ae2bf7a8f7 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-12-02 10:53:50 -08:00
Lars Brubaker
2d0aa84c7d Reverted new command line code 
Set test to use orthographic thumbnails
 2016-12-02 10:52:33 -08:00
johnlewin
2ce34cb41d Merge pull request #1672 from larsbrubaker/master 
New translation strings
 2016-12-02 09:38:18 -08:00
Lars Brubaker
bfd5a63330 New translation strings 2016-12-01 19:12:03 -08:00
Lars Brubaker
2652ea978c Merge pull request #1628 from rytz/master 
minor help text changes.
 2016-12-01 18:32:50 -08:00