johnlewin
efb7f7cba9
Merge pull request #1915 from unlimitedbacon/master
...
Changed labels for skirt and brim
2017-02-15 16:54:40 -08:00
johnlewin
57c781e200
Merge branch 'master' into master
2017-02-15 16:49:17 -08:00
johnlewin
352c5106bc
Merge pull request #1914 from jlewin/master
...
Fix typo
2017-02-15 16:49:08 -08:00
johnlewin
39ef7b433f
Merge branch 'master' into master
2017-02-15 16:47:09 -08:00
Tyler Anderson
f6c6bbef66
Changed labels for skirt and brim
2017-02-15 15:52:01 -08:00
John Lewin
0c485fd639
Fix typo
2017-02-15 15:45:52 -08:00
johnlewin
dd0c664a81
Merge pull request #1913 from larsbrubaker/master
...
Get the right thumbnail to show for screen saver
2017-02-15 15:42:37 -08:00
Lars Brubaker
6034208e24
Turn off using ms in memory.
2017-02-15 15:32:56 -08:00
Lars Brubaker
a78fe21e7a
Fixed failing unit test.
2017-02-15 14:30:06 -08:00
Lars Brubaker
74eb21e82e
Get the right thumbnail to show for screen saver
...
colorize image
move show help into options menu
2017-02-15 14:11:37 -08:00
johnlewin
ab2173fe84
Merge pull request #1912 from larsbrubaker/master
...
Improved theme colors
2017-02-15 12:54:37 -08:00
johnlewin
81c6832e39
Merge branch 'master' into master
2017-02-15 12:50:34 -08:00
Lars Brubaker
5505258a6a
Merge pull request #1911 from jlewin/master
...
Add missing localizations
2017-02-15 12:16:58 -08:00
Lars Brubaker
77ffb2d002
Improved theme colors
...
bed temp working
2017-02-15 12:14:36 -08:00
John Lewin
17bea4cc20
Add missing localizations
2017-02-15 10:04:10 -08:00
johnlewin
d0854ba953
Merge pull request #1910 from jlewin/master
...
Refactor ActionBar/ActionRow
2017-02-15 09:40:13 -08:00
John Lewin
778439bb48
Refactor ActionBar/ActionRow
...
- Convert SlicingOutputMessage event to EventHandler<StringEventArgs>
- Remove redundant PrintStatusRow base type, use FlowLayoutWidget
- Rename DesktopPrintStatusRow to PrintStatusRow
2017-02-15 07:04:36 -08:00
John Lewin
e7a5659492
Extract class to file
2017-02-15 06:17:00 -08:00
Lars Brubaker
1c391ba9fb
Merge pull request #1909 from jlewin/master
...
Guard against null reference
2017-02-14 23:03:42 -08:00
John Lewin
3cfd40b6a0
Guard against null reference
2017-02-14 17:21:57 -08:00
John Lewin
0544ba38b8
Guard against null reference
2017-02-14 16:13:51 -08:00
johnlewin
af1fb005d6
Merge pull request #1908 from larsbrubaker/master
...
Make com port drop list look disabled when disabled.
2017-02-14 15:41:03 -08:00
Lars Brubaker
7c34c3625e
Make com port drop list look disabled when disabled.
2017-02-14 15:11:34 -08:00
Lars Brubaker
7eeb7c69ae
Merge pull request #1907 from jlewin/master
...
Move CancelPrint code for reuse in screensaver
2017-02-14 15:11:09 -08:00
John Lewin
bc3021cb3a
Move CancelPrint code for reuse in screensaver
...
- Revise screensaver styling to better match template
2017-02-14 14:34:02 -08:00
johnlewin
81c5915822
Merge pull request #1906 from larsbrubaker/master
...
Make sure we don't have the printer waiting for position before it is…
2017-02-14 14:16:53 -08:00
Lars Brubaker
a206586736
Make sure we don't have the printer waiting for position before it is connected.
2017-02-14 11:42:48 -08:00
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
