nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4898 commits 1 branch 0 tags 103 MiB
Commit graph

4898 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Lars Brubaker
c1c82c0999 latest agg 2016-06-20 15:46:51 -07:00
Lars Brubaker
9b42fac41a Import merge from .printer starting to work. 
Ability to center model windows
 2016-06-20 15:45:17 -07:00
johnlewin
bed39a2354 Merge pull request #985 from jlewin/master 
Fix missing printers and presets
 2016-06-20 13:34:53 -07:00
John Lewin
e6234ebbc6 Fix missing printers and presets 
- Add code to save ProfileManager contents on Add Printer
 - Revise and rerun printer profile generation tool
 - Move CollectionChanged registration, don't run during deserialization
 - CollectionChanged.Remove no longer valid as Deletes are deferred
 - Fixes #982, #983
 - Remove dead code
 2016-06-20 13:22:00 -07:00
johnlewin
2427f3996d Merge pull request #984 from larsbrubaker/master 
Now we can import a .ini or .slice file into a quality preset.
 2016-06-20 13:21:35 -07:00
Lars Brubaker
8d487138dd Enabled import to Material 
Made "Done" button show
 2016-06-20 12:56:11 -07:00
Lars Brubaker
836cbffc53 Now we can import a .ini or .slice file into a quality preset. 2016-06-20 12:47:10 -07:00
johnlewin
8c726e3c49 Merge pull request #979 from jlewin/master 
Fix invalid cast exception after print
 2016-06-18 14:09:14 -07:00
John Lewin
0a2064fa5e Fix invalid cast exception after print 2016-06-17 15:07:43 -07:00
johnlewin
7e2f5a673a Merge pull request #977 from larsbrubaker/master 
Working on importing to presets.
 2016-06-17 14:48:37 -07:00
Lars Brubaker
66dffe2319 Working on importing to presets. 2016-06-17 14:44:35 -07:00
johnlewin
6feabfdd33 Merge pull request #976 from jlewin/master 
Fix presets assignment regression
 2016-06-17 14:42:48 -07:00
John Lewin
4d61e769b0 Fix presets assignment regression 2016-06-17 13:59:16 -07:00
Lars Brubaker
068645ad40 Merge pull request #975 from larsbrubaker/master 
Don't need to filter these (they are not there)
 2016-06-17 13:36:21 -07:00
Lars Brubaker
2ee8a6c5e5 latest agg 2016-06-17 12:42:13 -07:00
Lars Brubaker
bd6bd0ce38 Fixed a config name. 2016-06-17 12:37:31 -07:00
Lars Brubaker
6bd273ec47 Don't need to filter these (they are not there) 2016-06-17 12:26:34 -07:00
Lars Brubaker
c31695a6c4 Merge pull request #974 from unlimitedbacon/profiles 
Profile for M3D Micro
 2016-06-17 12:02:28 -07:00
Lars Brubaker
634b5b6434 Merge pull request #972 from jlewin/master 
Fix regression in preset selection, clean up SetValue/ClearValue, unify movement speeds
 2016-06-17 12:02:07 -07:00
Lars Brubaker
f00fc3ebf6 Merge pull request #973 from larsbrubaker/master 
Only show "support_material_threshold" in cura and slic3r
 2016-06-17 12:01:58 -07:00
Lars Brubaker
754f4c5c68 Only show "support_material_threshold" in cura and slic3r 2016-06-17 11:20:08 -07:00