John Lewin
|
a92e1ad724
|
Delete unused function, use TryGetValue
|
2017-01-04 16:00:22 -08:00 |
|
johnlewin
|
8b519db6c9
|
Merge pull request #1786 from larsbrubaker/master
Saving and restoring baby stepping
|
2017-01-04 15:59:55 -08:00 |
|
Lars Brubaker
|
1f6d210a9c
|
Don't present in interface.
|
2017-01-04 15:55:21 -08:00 |
|
Lars Brubaker
|
f0933631e1
|
Saving and restoring baby stepping
|
2017-01-04 15:35:38 -08:00 |
|
Lars Brubaker
|
044bd31329
|
Merge pull request #1784 from larsbrubaker/master
Added support for M83 and M82 extruder relative / absolute positioning
|
2017-01-04 15:04:56 -08:00 |
|
Lars Brubaker
|
a2cdad80f0
|
make sure the tests pass
|
2017-01-04 14:20:18 -08:00 |
|
Lars Brubaker
|
522a049cc6
|
Added support for M83 and M82 extruder relative / absolute positioning
|
2017-01-04 14:13:05 -08:00 |
|
Lars Brubaker
|
77511a3154
|
Merge pull request #1783 from larsbrubaker/master
latest agg and ms
|
2017-01-04 13:42:45 -08:00 |
|
Lars Brubaker
|
cf86446c02
|
latest agg and ms
|
2017-01-04 13:38:30 -08:00 |
|
Lars Brubaker
|
ad2dc54c1d
|
Merge pull request #1781 from jlewin/master
Use .Localize extension function
|
2017-01-04 13:36:08 -08:00 |
|
John Lewin
|
ace89e1e5a
|
Use .Localize extension function
|
2017-01-04 10:52:06 -08:00 |
|
Lars Brubaker
|
06af3e220e
|
Merge pull request #1782 from larsbrubaker/master
Expanded translation set
|
2017-01-04 10:38:43 -08:00 |
|
Lars Brubaker
|
68bab80fb2
|
Merge branch 'master' into master
|
2017-01-04 10:26:36 -08:00 |
|
Lars Brubaker
|
43d95e8486
|
Expanded translation set
Made more settings be count or mm
made more buttons translated
|
2017-01-04 10:25:19 -08:00 |
|
Lars Brubaker
|
3d17eea05b
|
Merge pull request #1779 from larsbrubaker/master
merge 1.6
|
2017-01-03 16:01:04 -08:00 |
|
Lars Brubaker
|
4fb4d3a15f
|
Merge remote-tracking branch 'origin/1.6'
# Conflicts:
# Submodules/agg-sharp
|
2017-01-03 15:22:52 -08:00 |
|
johnlewin
|
f079a17ba5
|
Merge pull request #1778 from larsbrubaker/1.6
refactoring
|
2017-01-03 13:19:24 -08:00 |
|
Lars Brubaker
|
949ee7a086
|
Merge branch '1.6' of https://github.com/larsbrubaker/MatterControl into 1.6
|
2017-01-03 13:15:12 -08:00 |
|
Lars Brubaker
|
35f4882608
|
Make sure we check for null
|
2017-01-03 13:14:21 -08:00 |
|
Lars Brubaker
|
981cb2505c
|
Merge branch '1.6' of https://github.com/MatterHackers/MatterControl into 1.6
|
2017-01-03 13:13:55 -08:00 |
|
Lars Brubaker
|
2f4a471220
|
Merge branch '1.6' into 1.6
|
2017-01-03 13:07:40 -08:00 |
|
Lars Brubaker
|
135f5b4fc1
|
refactoring
|
2017-01-03 13:05:57 -08:00 |
|
Lars Brubaker
|
c67e251b72
|
Merge pull request #1777 from larsbrubaker/1.6
put try catch around download update
|
2017-01-03 12:41:38 -08:00 |
|
Lars Brubaker
|
ba61e8b508
|
put try catch around download update
|
2017-01-03 12:27:36 -08:00 |
|
Lars Brubaker
|
cc042de7cf
|
Merge pull request #1776 from larsbrubaker/1.6
Created a new printer turns of temps test
|
2017-01-03 11:24:56 -08:00 |
|
Lars Brubaker
|
515966b0f0
|
Created a new printer turns of temps test
Fixed the test to pass
Made emulator turn off bed temp correctly.
|
2017-01-03 10:45:16 -08:00 |
|
johnlewin
|
3bb9ab01f8
|
Merge pull request #1774 from jlewin/master
Add missing localizations
|
2017-01-02 10:44:53 -08:00 |
|
John Lewin
|
3fdf5a83e7
|
Add missing localizations
- Use .Localize() extension function
|
2017-01-02 10:38:29 -08:00 |
|
johnlewin
|
4a1a878db9
|
Merge pull request #1773 from jlewin/master
Move download helper to instance
|
2017-01-01 16:30:03 -08:00 |
|
John Lewin
|
ac035d1956
|
Move download helper to instance
|
2017-01-01 16:22:58 -08:00 |
|
johnlewin
|
7215080288
|
Merge pull request #1772 from jlewin/master
Latest agg-sharp
|
2017-01-01 16:19:26 -08:00 |
|
John Lewin
|
62213043c5
|
Latest agg-sharp
|
2017-01-01 15:38:09 -08:00 |
|
johnlewin
|
ea9bd1d48e
|
Merge pull request #1771 from jlewin/master
Move DownloadToImageAsync to ApplicationController
|
2017-01-01 13:56:14 -08:00 |
|
John Lewin
|
4797841cbe
|
Move DownloadToImageAsync to ApplicationController
- Long-term this will get moved into the network stack
|
2017-01-01 12:55:16 -08:00 |
|
johnlewin
|
38474afdc3
|
Merge pull request #1769 from jlewin/master
Simplify LibraryProvider abstract class
|
2016-12-30 10:23:23 -08:00 |
|
johnlewin
|
a9f86c804f
|
Merge branch 'master' into master
|
2016-12-30 10:16:29 -08:00 |
|
Lars Brubaker
|
5b2fdb3fa7
|
Merge pull request #1768 from larsbrubaker/master
Include bed heating to recover consideration
|
2016-12-30 10:06:38 -08:00 |
|
John Lewin
|
711ba4f36c
|
Simplify LibraryProvider abstract class
|
2016-12-30 09:51:24 -08:00 |
|
Lars Brubaker
|
84c0032b05
|
Include bed heating to recover consideration
|
2016-12-29 14:51:45 -08:00 |
|
johnlewin
|
a1b474756d
|
Merge pull request #1767 from larsbrubaker/master
Fix io error on printrboard
|
2016-12-29 13:50:01 -08:00 |
|
Lars Brubaker
|
0d69a1d365
|
cleaning up error reporting and showing more in terminal
|
2016-12-29 13:39:16 -08:00 |
|
Lars Brubaker
|
bc1cac87ca
|
Merge branch 'master' of https://github.com/MatterHackers/MatterControl
|
2016-12-29 12:55:29 -08:00 |
|
Lars Brubaker
|
b2e676454a
|
io write error can happen if the printer is not responding while executing a command
don't close the connection in these circumstances.
|
2016-12-29 12:52:12 -08:00 |
|
johnlewin
|
3a3edb84d3
|
Merge pull request #1766 from jlewin/master
Revise ReloadAll and event/EventHandler usage
|
2016-12-29 12:02:52 -08:00 |
|
John Lewin
|
704cc13c04
|
Refactor ReloadAll
|
2016-12-29 11:11:56 -08:00 |
|
John Lewin
|
05250f4dd7
|
Remove PrivateClick, clean up progress bars
|
2016-12-29 10:49:15 -08:00 |
|
John Lewin
|
535a161115
|
Remove event keyword from private fields
|
2016-12-29 06:57:42 -08:00 |
|
Lars Brubaker
|
09178e11d5
|
Merge pull request #1764 from larsbrubaker/master
Made firmware updater report state into terminal
|
2016-12-28 14:15:12 -08:00 |
|
Lars Brubaker
|
7bb3b342d9
|
Made firmware updater report state into terminal
Refactoring
Firmware update strings
|
2016-12-28 13:10:39 -08:00 |
|
Lars Brubaker
|
6aa10d7f4a
|
Merge pull request #1760 from larsbrubaker/master
merge 1.6 dynamic slider size
|
2016-12-27 18:18:39 -08:00 |
|