Greg
|
e7b686d46b
|
Added function for permanent printer profile deletes.
|
2016-06-23 15:15:11 -07:00 |
|
Lars Brubaker
|
a810c7a562
|
Make sure we don't create a macro name that is wrapped or too big.
Fixes #1010
|
2016-06-23 12:12:55 -07:00 |
|
Lars Brubaker
|
0fdc6a03e0
|
Make sure we don't create a macro name that is wrapped or too big.
|
2016-06-23 12:12:01 -07:00 |
|
Lars Brubaker
|
dc1186d4bf
|
Merge branch 'master' of https://github.com/MatterHackers/MatterControl
|
2016-06-23 11:30:38 -07:00 |
|
johnlewin
|
4fafd36f2a
|
Merge pull request #1009 from jlewin/master
Add initial MCWS profile updates
|
2016-06-23 10:29:06 -07:00 |
|
Lars Brubaker
|
a4ea7ca4cf
|
latest matterslice
|
2016-06-23 09:39:30 -07:00 |
|
Lars Brubaker
|
bb43a38623
|
Merge branch 'master' of https://github.com/MatterHackers/MatterControl
|
2016-06-23 09:30:33 -07:00 |
|
John Lewin
|
2188f76a91
|
Remove unused System.Net.Http reference
|
2016-06-22 19:39:36 -07:00 |
|
John Lewin
|
d97e1b72fb
|
Add initial MCWS profile updates
|
2016-06-22 19:29:13 -07:00 |
|
John Lewin
|
ff42287f02
|
Replace hardcoded paths with common reference
|
2016-06-22 19:29:13 -07:00 |
|
johnlewin
|
9d6084778e
|
Merge pull request #1008 from mmoening/master
Implemented MC side receive of Public Profile list and public profiles
|
2016-06-22 18:23:21 -07:00 |
|
Matt Moening
|
bc5ef8a5b3
|
Implemented MC side receive of Public Profile list and public profiles
|
2016-06-22 18:05:52 -07:00 |
|
Lars Brubaker
|
e926186f6b
|
Merge pull request #1007 from larsbrubaker/master
Fixed #1002 bed temp not being set on pre-heat.
|
2016-06-22 17:20:14 -07:00 |
|
Lars Brubaker
|
531152fd92
|
Merge branch 'master' of https://github.com/MatterHackers/MatterControl
|
2016-06-22 17:13:25 -07:00 |
|
Lars Brubaker
|
6f1760e33b
|
Fixed #1002 bed temp not being set on pre-heat.
|
2016-06-22 17:13:05 -07:00 |
|
Lars Brubaker
|
d19acdc802
|
Merge pull request #1006 from larsbrubaker/master
Made the scale control work with single transforms
|
2016-06-22 16:35:09 -07:00 |
|
Lars Brubaker
|
591dcb17da
|
Made the scale control work with single transforms
scale control was in transition and this makes it usable. fixes #1005
made clearing an override send an update message.
|
2016-06-22 16:29:14 -07:00 |
|
johnlewin
|
476f39001a
|
Merge pull request #1004 from larsbrubaker/master
Removing settings base layer from being strode in users data
|
2016-06-22 16:05:17 -07:00 |
|
Lars Brubaker
|
3e44555497
|
Ability to set base layer for testing.
|
2016-06-22 15:47:22 -07:00 |
|
Lars Brubaker
|
328204b14b
|
Create the baseLayerCache on first request rather than static init.
|
2016-06-22 15:38:20 -07:00 |
|
Lars Brubaker
|
768d555f2a
|
Removing settings base layer from being strode in users data
|
2016-06-22 15:29:20 -07:00 |
|
Lars Brubaker
|
527ccb06bb
|
Merge pull request #1003 from larsbrubaker/master
Moved publish_bed_image string int SettingsKey conts strings.
|
2016-06-22 14:30:38 -07:00 |
|
Lars Brubaker
|
abd5d113ad
|
Merge branch 'master' of https://github.com/larsbrubaker/MatterControl
|
2016-06-22 14:09:54 -07:00 |
|
Lars Brubaker
|
a78af79bdc
|
Moved publish_bed_image string int SettingsKey conts strings.
|
2016-06-22 14:09:19 -07:00 |
|
larsbrubaker
|
f2fecc9f51
|
Spelling
|
2016-06-22 11:08:39 -07:00 |
|
Lars Brubaker
|
1c6deffc74
|
Merge pull request #999 from larsbrubaker/master
Change the too big to render message to Reduce Polygons to Render
|
2016-06-22 10:25:53 -07:00 |
|
Lars Brubaker
|
d8a27f4b4f
|
Change the too big to render message to Reduce Polygons to Render
fixes #921
|
2016-06-22 09:55:57 -07:00 |
|
Lars Brubaker
|
44b7de57f2
|
Merge pull request #998 from larsbrubaker/master
Don't try to load material and quality settings if there aren't any.
|
2016-06-22 09:54:52 -07:00 |
|
Lars Brubaker
|
56ee8d81b0
|
Don't try to load material and quality settings if there aren't any.
Don't throw on cura file in release.
|
2016-06-22 09:47:01 -07:00 |
|
Lars Brubaker
|
25e3e862b0
|
Merge pull request #995 from larsbrubaker/master
Make sure clicking "add new printer" always runs the add new printer …
|
2016-06-21 19:16:30 -07:00 |
|
larsbrubaker
|
a1680ca2d1
|
Make sure clicking "add new printer" always runs the add new printer wizard.
|
2016-06-21 19:02:04 -07:00 |
|
Lars Brubaker
|
5671ef09c5
|
Merge pull request #994 from larsbrubaker/master
Improving setup experience.
|
2016-06-21 19:01:30 -07:00 |
|
larsbrubaker
|
ad221690be
|
Improving setup experience.
issue #917
|
2016-06-21 18:55:34 -07:00 |
|
Lars Brubaker
|
4f0408c7d4
|
Merge pull request #993 from jlewin/master
Finished import to settings overrides
|
2016-06-21 17:17:48 -07:00 |
|
John Lewin
|
b63551aee6
|
Finished import to settings overrides
|
2016-06-21 17:06:20 -07:00 |
|
John Lewin
|
493b2b2b3f
|
Import into new preset layer
|
2016-06-21 16:36:11 -07:00 |
|
Lars Brubaker
|
7b1fa6c202
|
start the import to settings.
|
2016-06-21 15:43:09 -07:00 |
|
Lars Brubaker
|
93530a64c1
|
can merge from .printer into current.
|
2016-06-21 15:39:18 -07:00 |
|
Lars Brubaker
|
e74e0c1108
|
Merge branch 'master' of https://github.com/MatterHackers/MatterControl
|
2016-06-21 13:58:38 -07:00 |
|
Lars Brubaker
|
f710ee965a
|
Merge pull request #992 from jlewin/master
Refactor tab control, remove exceptions when requested pages missing
|
2016-06-21 13:58:24 -07:00 |
|
Lars Brubaker
|
50afeea7dc
|
More work on macro test
|
2016-06-21 13:48:28 -07:00 |
|
John Lewin
|
e92c2f0b2b
|
Refactor tab control, remove exceptions when requested pages missing
- Fixes #986
- Rename TabePageControlledByTab to TabPage
- Remove excess TabPage setter (SwitchToPage)
|
2016-06-21 13:44:03 -07:00 |
|
John Lewin
|
bc99339219
|
Add missing settings keys to eliminate migration exceptions
|
2016-06-21 13:44:02 -07:00 |
|
John Lewin
|
ccb7a0cfee
|
Fix invalid entry in master.txt
|
2016-06-21 13:43:15 -07:00 |
|
Lars Brubaker
|
3f61d6ccd8
|
Merge pull request #991 from larsbrubaker/master
Refactoring print settings strings into SettingsKey string consts
|
2016-06-21 11:31:59 -07:00 |
|
Lars Brubaker
|
4ac3003346
|
Fixed #990
wrote unit test
made mapping classes
|
2016-06-21 11:23:26 -07:00 |
|
Lars Brubaker
|
6ee626e794
|
Refactoring print settings strings into SettingsKey string consts
Made a new ReloadUiWhenChanged propertie for Properties.json
|
2016-06-21 09:38:37 -07:00 |
|
Lars Brubaker
|
42adfced92
|
Merge pull request #989 from unlimitedbacon/profiles
Don't heat M3D before probing
|
2016-06-21 09:06:52 -07:00 |
|
Lars Brubaker
|
899b1bc6ed
|
Merge pull request #988 from larsbrubaker/master
import from .printer
|
2016-06-21 09:03:13 -07:00 |
|
Tyler Anderson
|
9eb46dcb87
|
Don't head M3D before probing
|
2016-06-20 16:04:12 -07:00 |
|