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 |
|
Lars Brubaker
|
d5ef77ef4c
|
Merge branch 'master' into master
|
2016-12-01 18:28:26 -08:00 |
|
Lars Brubaker
|
17c78fc8e4
|
Merge pull request #1669 from unlimitedbacon/master
Moved networking and sailfish options to Connection page
|
2016-12-01 18:28:17 -08:00 |
|
Lars Brubaker
|
7a64ca382b
|
Merge branch 'master' into master
|
2016-12-01 18:24:02 -08:00 |
|
Lars Brubaker
|
6449ccc5cb
|
Merge branch 'master' into master
|
2016-12-01 18:23:52 -08:00 |
|
Lars Brubaker
|
634f77daa1
|
Merge pull request #1671 from larsbrubaker/master
Make it possible to pass command line arguments in test.
|
2016-12-01 18:23:26 -08:00 |
|
Lars Brubaker
|
19354a2a85
|
Merge branch 'master' into master
|
2016-12-01 18:22:48 -08:00 |
|
Lars Brubaker
|
7662e45586
|
Make it possible to pass command line arguments in test.
Made a new argument to do thumbnails as orthographic
Significantly speeds up tests
|
2016-12-01 18:03:40 -08:00 |
|
rytz
|
9396673523
|
help text changes
|
2016-12-01 16:20:26 -08:00 |
|
Lars Brubaker
|
4b21c9c573
|
Merge branch 'master' into master
|
2016-12-01 16:14:06 -08:00 |
|
Lars Brubaker
|
b1b807d674
|
Merge pull request #1670 from jlewin/master
Modify ClickByName automation helper to throw if not found
|
2016-12-01 16:13:56 -08:00 |
|
rytz
|
142a147494
|
minor help text changes.
|
2016-12-01 15:51:26 -08:00 |
|
John Lewin
|
4c7cb5deba
|
Fix issue with MatterControlRuns test when no printers exist
|
2016-12-01 15:44:13 -08:00 |
|
John Lewin
|
408fc580f4
|
Remove duplicate semicolons
|
2016-12-01 15:14:53 -08:00 |
|
John Lewin
|
d4196b7b64
|
Fix failing QueueThumbnailWidgetOpensPartPreview test
|
2016-12-01 15:02:49 -08:00 |
|
John Lewin
|
0cabc4af74
|
Modify ClickByName automation helper to throw if not found
|
2016-12-01 13:25:17 -08:00 |
|
Tyler Anderson
|
09e067133b
|
Moved networking and sailfish options to Connection page
|
2016-12-01 13:11:21 -08:00 |
|
johnlewin
|
a1e5750bb7
|
Merge pull request #1668 from larsbrubaker/master
Hook virtual functions rather than delegate for Enter and Leave bounds.
|
2016-12-01 12:16:02 -08:00 |
|
Lars Brubaker
|
5ebe0967c6
|
Hook virtual functions rather than delegate for Enter and Leave bounds.
|
2016-12-01 11:49:10 -08:00 |
|
Lars Brubaker
|
2c95837391
|
Merge pull request #1666 from larsbrubaker/master
Made it so that only canceling the printe causes it to be marked as c…
|
2016-12-01 11:48:46 -08:00 |
|
Lars Brubaker
|
fb1f5ff730
|
Made it so that only canceling the printe causes it to be marked as canceled
Disconnect and reconnect do not 'cancel' the print
Closing MC does not 'cancel' the print
|
2016-12-01 10:59:03 -08:00 |
|
Lars Brubaker
|
4b07153554
|
Merge pull request #1662 from larsbrubaker/master
also consider the extruder position when doing maxlength.
|
2016-11-30 13:49:15 -08:00 |
|
Lars Brubaker
|
7c2be58c6a
|
Fixed extruder unit test
|
2016-11-30 13:44:56 -08:00 |
|
Lars Brubaker
|
efe79dab81
|
Merge remote-tracking branch 'origin/master'
|
2016-11-30 13:34:14 -08:00 |
|
Lars Brubaker
|
f401a3323c
|
Moved Mocros to the top of the controls window
Putting in Macro Menu
Changed closeButton back to cancelButton
|
2016-11-30 13:31:19 -08:00 |
|
Lars Brubaker
|
24504e522c
|
Merge pull request #1660 from unlimitedbacon/master
Fixed more line endings for Smoothie compatability
|
2016-11-30 12:59:04 -08:00 |
|
Lars Brubaker
|
83a56dfbdb
|
also consider the extruder position when doing maxlength.
|
2016-11-29 16:52:58 -08:00 |
|
Lars Brubaker
|
9553cebe15
|
Merge branch 'master' into master
|
2016-11-29 16:23:32 -08:00 |
|
Lars Brubaker
|
e6c34a9eff
|
Merge pull request #1661 from mmoening/master
Send reset line number command on connect
|
2016-11-29 16:23:25 -08:00 |
|
Matt Moening
|
2cdca4860d
|
Send reset line number command on connect
|
2016-11-29 16:05:30 -08:00 |
|
Lars Brubaker
|
a0b6fb4ffa
|
Merge pull request #1659 from larsbrubaker/master
Make sure we try to send commands while attempting to connect.
|
2016-11-29 15:18:18 -08:00 |
|
Lars Brubaker
|
2476b1d1f2
|
Make queued commands parse as they are sent.
|
2016-11-29 15:14:38 -08:00 |
|
Lars Brubaker
|
f6d30fefaa
|
Merge branch 'master' of https://github.com/MatterHackers/MatterControl
|
2016-11-29 14:58:36 -08:00 |
|
Lars Brubaker
|
3928538f22
|
Make sure we try to send commands while attempting to connect.
|
2016-11-29 14:58:24 -08:00 |
|
Lars Brubaker
|
8acbe77fd6
|
Merge pull request #1658 from larsbrubaker/master
Load and Unload Macros working better
|
2016-11-29 14:44:56 -08:00 |
|
Lars Brubaker
|
7c9128c01c
|
Merge branch 'master' of https://github.com/MatterHackers/MatterControl
|
2016-11-29 14:18:03 -08:00 |
|