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
John Lewin
1f2f1904b8 Preserve some user overrides during Reset to Defaults 
- Issue #899
 2016-06-09 19:29:48 -07:00
Lars Brubaker
3a638e7620 Merge pull request #919 from larsbrubaker/master 
Made MatterControl top export
 2016-06-09 18:18:59 -07:00
Lars Brubaker
0929ec1893 Made MatterControl top export 
Fixed some profile import stuff
 2016-06-09 18:16:07 -07:00
Lars Brubaker
664a2f15d0 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-06-09 17:38:40 -07:00
Lars Brubaker
a29ac88c02 Merge pull request #911 from jlewin/master 
Apply test exception to SupportInterfaceMaterialAssignedToExtruderOne
 2016-06-09 17:37:19 -07:00
John Lewin
4f159245d9 Apply test exception to SupportInterfaceMaterialAssignedToExtruderOne 2016-06-09 16:03:12 -07:00
johnlewin
4bbbb3f5b1 Merge pull request #909 from jlewin/master 
Take failing tests offline
 2016-06-09 15:59:15 -07:00
John Lewin
fa7e6cb815 Take failing tests offline 2016-06-09 15:46:40 -07:00
John Lewin
67b9c71d05 Add test exception for 3D Stuffmaker/SupportMaterialAssignedToExtruderOne 2016-06-09 15:46:40 -07:00
johnlewin
0ebfd29d1b Merge pull request #906 from jlewin/master 
Add Export options
 2016-06-09 15:15:56 -07:00
John Lewin
3c15c336c7 Add Export options 2016-06-09 15:09:41 -07:00
johnlewin
81282b0f31 Merge pull request #905 from larsbrubaker/master 
Made all panels update when edited in any panel (printer wizard)
 2016-06-09 15:08:43 -07:00
Lars Brubaker
96781c75e7 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-06-09 14:53:31 -07:00
Lars Brubaker
46006c7f41 Made all panels update when edited in any panel (printer wizard) 
Added BaudRate to printer edit wizard
 2016-06-09 14:53:20 -07:00
Lars Brubaker
5613857af1 Made all panels update when edited in any panel (printer wizard) 
Added BaudRate to printer edit wizard
 2016-06-09 14:52:58 -07:00
Lars Brubaker
091940e391 Merge pull request #904 from larsbrubaker/master 
Filter files from LibraryProviderFileSystem that have no extension.
 2016-06-09 14:49:53 -07:00
Lars Brubaker
c5edde8edb Filter files from LibraryProviderFileSystem that have no extension. 2016-06-09 14:20:03 -07:00
Lars Brubaker
6fff38a5d4 Merge pull request #903 from larsbrubaker/master 
Made the printer selection drop list have correct height
 2016-06-09 13:44:25 -07:00
Lars Brubaker
23d8fc5534 Made the printer selection drop list have the same height as the buttons on that row 2016-06-09 13:41:24 -07:00
Lars Brubaker
76012aeef9 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-06-09 12:17:50 -07:00
johnlewin
0862b53769 Merge pull request #902 from jlewin/master 
Rebuild PrinterSelector data on printer name changed
 2016-06-09 09:51:48 -07:00
John Lewin
be27c5403b Rebuild PrinterSelector data on printer name changed 
- Add Rebuild method to PrinterSelector
 - Hook settings change in PrinterSelector and rebuild on name change
 - Issues #880, #894
 - Use initializer syntax
 2016-06-09 09:24:59 -07:00
johnlewin
67937bc769 Merge pull request #900 from jlewin/master 
Add bake overrides prototype
 2016-06-09 09:24:20 -07:00
John Lewin
ab092139cd Add bake overrides prototype 2016-06-09 08:38:57 -07:00
johnlewin
99cb538160 Merge pull request #898 from jlewin/master 
Implement 'Reset to defaults' for printer settings
 2016-06-09 08:18:05 -07:00
John Lewin
433de0c20b Implement 'Reset to defaults' for printer settings 2016-06-09 08:03:05 -07:00
Lars Brubaker
992e20f347 Merge pull request #897 from larsbrubaker/master 
Change menu item to merge
 2016-06-09 07:53:02 -07:00
Lars Brubaker
5ab323df85 Merge pull request #896 from jlewin/master 
Convert preset layers from Dictionaries to Lists
 2016-06-09 07:26:31 -07:00
larsbrubaker
78b41e8c2f Merge branches 'master' and 'master' of https://github.com/MatterHackers/MatterControl 2016-06-09 07:25:49 -07:00
Lars Brubaker
e5447a9fc2 Merge pull request #895 from larsbrubaker/master 
make sure we close editor on delete printer
 2016-06-09 07:24:39 -07:00
larsbrubaker
61ad82c362 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-06-09 07:21:15 -07:00
larsbrubaker
08b719e1b8 Change menu item to merge 2016-06-09 07:20:53 -07:00
John Lewin
17f15a9e10 Convert preset layers from Dictionaries to Lists 
- Add migration for existing profiles
 2016-06-08 19:06:16 -07:00
Lars Brubaker
c6e1119921 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-06-08 18:26:21 -07:00
Lars Brubaker
105734cccf make sure we close editor on delete printer 
don't flash content
 2016-06-08 18:26:08 -07:00
johnlewin
00d7690c2c Merge pull request #893 from larsbrubaker/master 
New edit printer settings page.
 2016-06-08 18:04:52 -07:00
Lars Brubaker
35080277d7 New edit printer settings page. 2016-06-08 17:59:03 -07:00
Lars Brubaker
aa4262f698 Merge pull request #892 from jlewin/master 
Add WizardWindow.Show<T>
 2016-06-08 17:02:33 -07:00
John Lewin
9b60f0ff88 Add WizardWindow.Show<T> 2016-06-08 16:54:13 -07:00
Lars Brubaker
e422ec3ea0 Merge pull request #890 from larsbrubaker/master 
Took out the move to print leveling settings
 2016-06-08 12:12:54 -07:00
Lars Brubaker
168ee4d885 Make sure we reload the screen when we need to on app loading. 2016-06-08 12:00:12 -07:00
Lars Brubaker
e871890f00 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-06-08 11:47:12 -07:00
Lars Brubaker
6a6fade3e1 Took out the move to print leveling settings 
Made touchscreen on desktop update the view correctly on printer change.
 2016-06-08 11:46:46 -07:00
Lars Brubaker
5cc454ba77 Renamed CustomeSaveFunction to ShowAsOveride 2016-06-08 11:18:53 -07:00
Lars Brubaker
46ae52c80e Merge pull request #885 from larsbrubaker/master 
Don't show connection settings in presets
 2016-06-08 11:18:50 -07:00
Lars Brubaker
0380e84a4f Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-06-08 11:13:12 -07:00
johnlewin
97123744b5 Merge pull request #883 from jlewin/master 
Rename WizardPanels to WizardPage
 2016-06-08 10:24:52 -07:00
John Lewin
e24e302938 Rename SetupWizardHome to AndroidSetupOptionsPage 2016-06-08 09:54:31 -07:00
John Lewin
6ff04a73d2 Rename WizardPanels to WizardPage 2016-06-08 09:37:43 -07:00
John Lewin
5c926cc1a1 Free up WizardPage term, rename WizardPage to WizardControlPage 2016-06-08 09:37:41 -07:00