johnlewin
|
3c571b562a
|
Merge pull request #1905 from jlewin/master
Fix typo, call Dispose
|
2017-02-14 10:23:59 -08:00 |
|
John Lewin
|
6233620705
|
Fix typo, call Dispose
|
2017-02-14 10:15:13 -08:00 |
|
Lars Brubaker
|
344e0f71e4
|
Merge pull request #1904 from larsbrubaker/master
Make sure comments not parsed in gcode
|
2017-02-13 17:27:16 -08:00 |
|
Lars Brubaker
|
f030ff0c59
|
latest ms and agg
|
2017-02-13 17:23:31 -08:00 |
|
Lars Brubaker
|
2026812b2f
|
Comments and more checks.
|
2017-02-13 17:18:24 -08:00 |
|
Lars Brubaker
|
dec7b2859a
|
Merge branch 'master' of https://github.com/MatterHackers/MatterControl
|
2017-02-13 16:16:16 -08:00 |
|
Lars Brubaker
|
db200ea67c
|
Merge pull request #1903 from larsbrubaker/master
Make sure we show the z offset if it is set.
|
2017-02-13 16:14:54 -08:00 |
|
Lars Brubaker
|
4bc94f8b5c
|
Merge branch 'master' of https://github.com/MatterHackers/MatterControl
|
2017-02-13 15:15:23 -08:00 |
|
Lars Brubaker
|
3eb86c2976
|
Merge branch 'master' into master
|
2017-02-13 15:15:02 -08:00 |
|
Lars Brubaker
|
aa32192485
|
Make sure we show the z offset if it is set.
|
2017-02-13 15:10:46 -08:00 |
|
Lars Brubaker
|
1265098d77
|
Merge pull request #1901 from jlewin/master
Change EnsureSamplePartsExist to call synchronous .AddItem() signature
|
2017-02-13 14:20:15 -08:00 |
|
John Lewin
|
de643868e8
|
Change EnsureSamplePartsExist to call synchronous .AddItem() signature
- Use streams instead of file paths
- Copy directly from StaticData stream to Library
|
2017-02-13 13:56:59 -08:00 |
|
johnlewin
|
b51529bb40
|
Merge pull request #1900 from larsbrubaker/master
Wrote new test for cancel working.
|
2017-02-13 12:34:53 -08:00 |
|
Lars Brubaker
|
b72d6b0c85
|
Wrote new test for cancel working.
|
2017-02-13 11:52:56 -08:00 |
|
johnlewin
|
176f324345
|
Merge pull request #1899 from larsbrubaker/master
Make sure we get our position any time we create stream processors.
|
2017-02-10 15:01:46 -08:00 |
|
Lars Brubaker
|
2430becc9d
|
Make sure we get our position any time we create stream processors.
|
2017-02-10 14:44:07 -08:00 |
|
Lars Brubaker
|
5b13d044c3
|
Current translations
|
2017-02-10 11:32:29 -08:00 |
|
Lars Brubaker
|
15cefda821
|
Merge pull request #1897 from larsbrubaker/master
Fixed passing in the outer layer extrusion width.
|
2017-02-10 11:27:36 -08:00 |
|
Lars Brubaker
|
0519185028
|
Fixed passing in the outer layer extrusion width.
|
2017-02-10 10:08:42 -08:00 |
|
johnlewin
|
690b78e33f
|
Merge pull request #1896 from jlewin/master
Add screensaver images
|
2017-02-09 18:31:45 -08:00 |
|
John Lewin
|
cefc965207
|
Add screensaver images
|
2017-02-09 18:22:28 -08:00 |
|
johnlewin
|
79832e9093
|
Merge pull request #1895 from jlewin/master
Enable raytraced thumbnails
|
2017-02-09 17:49:19 -08:00 |
|
John Lewin
|
992fa99b98
|
Enable raytraced thumbnails
|
2017-02-09 17:43:47 -08:00 |
|
Lars Brubaker
|
c838cd4d6d
|
Merge pull request #1894 from jlewin/master
Tune PrintingWindow settings
|
2017-02-09 17:35:18 -08:00 |
|
John Lewin
|
ce481823a4
|
Tune PrintingWindow settings
|
2017-02-09 16:53:34 -08:00 |
|
johnlewin
|
92d3e909e9
|
Merge pull request #1893 from larsbrubaker/master
Don't attempt recovery if not enabled.
|
2017-02-09 14:41:15 -08:00 |
|
Lars Brubaker
|
f15318faf9
|
Actually check if we have a printer selected.
|
2017-02-09 14:33:27 -08:00 |
|
Lars Brubaker
|
286e89ad63
|
Don't attempt recovery if not enabled.
|
2017-02-09 14:26:15 -08:00 |
|
johnlewin
|
071eb4c182
|
Merge pull request #1892 from larsbrubaker/master
Un-broke print cancel
|
2017-02-09 13:59:52 -08:00 |
|
Lars Brubaker
|
990fd13a19
|
Un-broke print cancel
Only finishing gcode sets the printer to connected not canceling (it still needs to print cancel gcode if present)
|
2017-02-09 13:51:16 -08:00 |
|
Lars Brubaker
|
11d984f3af
|
Merge pull request #1891 from jlewin/issue-1192
Issue 1192
|
2017-02-09 11:37:13 -08:00 |
|
John Lewin
|
c875f622f1
|
Stream test must run in separate application domains
|
2017-02-09 11:10:42 -08:00 |
|
John Lewin
|
538d3c480a
|
Refactor GCodeStream
- Use AppendFormat
|
2017-02-09 09:01:45 -08:00 |
|
John Lewin
|
b665091e18
|
Multiplier streams must acquire and track dependant settings
- Correct whitespace
|
2017-02-09 09:01:03 -08:00 |
|
Lars Brubaker
|
fd38803330
|
Merge pull request #1890 from jlewin/master
Refactor PrintActionRow
|
2017-02-09 07:32:30 -08:00 |
|
John Lewin
|
11297849e0
|
Refactor PrintActionRow
- Remove single use variables
- Assign events after object creation
|
2017-02-09 05:40:39 -08:00 |
|
johnlewin
|
c13a5683f9
|
Merge pull request #1889 from larsbrubaker/master
Fixed keyboard movement
|
2017-02-08 17:22:25 -08:00 |
|
Lars Brubaker
|
63fcda6532
|
change it's to its
Refactor
|
2017-02-08 17:17:06 -08:00 |
|
Lars Brubaker
|
b576e1fb78
|
Needed to rest stream processing after a print is canceled
MatterHackers/MatterControl#1877
Controls: Extrude buttons twisted
|
2017-02-08 14:40:18 -08:00 |
|
Lars Brubaker
|
cecf01769c
|
Fixed keyboard movement
|
2017-02-08 14:34:16 -08:00 |
|
johnlewin
|
b2a2068bd7
|
Merge pull request #1886 from larsbrubaker/master
Made sure that reset connection disconnects
|
2017-02-08 14:06:23 -08:00 |
|
Lars Brubaker
|
397398cf85
|
Put in a warning message if print recovery on a min z printer.
|
2017-02-08 13:16:29 -08:00 |
|
Lars Brubaker
|
1f76ba1cde
|
Fixing code review issues
|
2017-02-08 10:02:39 -08:00 |
|
larsbrubaker
|
ac4a2ed9ce
|
Made sure that reset connection disconnects
and reconnects if auto connect
and works when not connected (like it is supposed to)
|
2017-02-07 18:49:06 -08:00 |
|
johnlewin
|
f49f4e7b85
|
Merge pull request #1885 from jlewin/master
Revert to NUnit 3.5
|
2017-02-07 11:59:03 -08:00 |
|
John Lewin
|
07f7d90533
|
Revert to NUnit 3.5
|
2017-02-07 11:47:57 -08:00 |
|
johnlewin
|
ed1baa1f56
|
Merge pull request #1884 from jlewin/master
Upgrade NUnit, Raygun
|
2017-02-07 09:50:03 -08:00 |
|
John Lewin
|
92e75900be
|
Upgrade NUnit, Raygun
|
2017-02-07 09:41:41 -08:00 |
|
johnlewin
|
a14b765730
|
Merge pull request #1883 from larsbrubaker/master
Finished up new macro code
|
2017-02-06 14:51:50 -08:00 |
|
Lars Brubaker
|
6b0b8ace6e
|
Fixed a bug with the progress bar
|
2017-02-06 14:23:55 -08:00 |
|