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
rytz
b78dadd25c UI label updates 2016-05-18 12:52:36 -07:00
johnlewin
61f63b75cf Merge pull request #786 from jlewin/master 
Wire up Delete printer
 2016-05-18 10:22:25 -07:00
John Lewin
a6ba5767d3 Wire up Delete printer 2016-05-17 18:30:47 -07:00
johnlewin
83a8a84965 Merge pull request #785 from jlewin/master 
Improve Duplicate preset
 2016-05-17 18:29:58 -07:00
John Lewin
576b8dbf22 Improve Duplicate preset 
- Update Material preset array when preset changed from presets window
 - Update PresetsContext.PersistenceLayer when presets are duplicated
 - Rebuild SliceSettingsWidget on duplicate without leaving window
 - Refactor GetTopRow to eliminate excess widgets & create a single row
 - Update presets name after leaving input rather than on window close
 2016-05-17 17:15:49 -07:00
Lars Brubaker
9468eb1a96 Merge pull request #783 from larsbrubaker/master 
Put in a delete printer button.
 2016-05-17 16:31:51 -07:00
Lars Brubaker
33876af4cc Put in a delete printer button. 2016-05-17 15:50:43 -07:00
Lars Brubaker
70c58ca784 Merge pull request #782 from larsbrubaker/master 
Made the auto level indicator button navigate to the auto level prope…
 2016-05-17 15:49:55 -07:00
Lars Brubaker
3290a91947 Made the auto level indicator button navigate to the auto level properties panel. 2016-05-17 15:30:39 -07:00
Lars Brubaker
c8ed6d6283 Merge pull request #779 from larsbrubaker/master 
Made pop out tabs take automation correctly.
 2016-05-17 10:59:06 -07:00
Lars Brubaker
483ce16453 Made pop out tabs take automation correctly. 
Made print level icon go to leveling settings
 2016-05-17 10:33:18 -07:00
Lars Brubaker
f6fe431b5f Merge pull request #774 from larsbrubaker/master 
Fixed the colors on movement controls
 2016-05-17 09:54:55 -07:00
Lars Brubaker
a6e6817969 Merge pull request #777 from unlimitedbacon/master 
Flexible materials for TAZ 6
 2016-05-17 09:50:05 -07:00
Lars Brubaker
ba88cd15a9 correct function signature 2016-05-17 09:47:10 -07:00
Lars Brubaker
519ad7045d Merge branch 'master' of https://github.com/MatterHackers/MatterControl 
Conflicts:
	SlicerConfiguration/SliceSettingsWidget.cs
 2016-05-17 09:44:05 -07:00
johnlewin
c6f4d9522a Merge pull request #778 from jlewin/master 
Add support for renaming and duplicating presets
 2016-05-16 18:29:35 -07:00
Lars Brubaker
47aa64ff28 right color for home button. 2016-05-16 17:56:52 -07:00
Lars Brubaker
f6dd491f7c Made the pencil icon the right color. 2016-05-16 17:47:25 -07:00
John Lewin
cb56e85776 Add support for renaming and duplicating presets 
- Fixes #720 - Changing preset names has no effect
 - Fixes #767 - Presets editor contains user overrides
 - Fixes #768 - Oem presets should be copied...
 - Migrate from int to string based printer IDs
 - Add json document migration capabilities
 2016-05-16 17:46:17 -07:00
Tyler Anderson
7de83b44e7 Flexible materials for TAZ 6 2016-05-16 17:37:28 -07:00
Lars Brubaker
f025759adc Merge pull request #776 from larsbrubaker/1.5.3 
make sure we do a wait when cooling if required.
 2016-05-16 17:20:19 -07:00
Tyler Anderson
15fed40032 make sure we do a wait when cooling if required. 2016-05-16 17:18:46 -07:00
Lars Brubaker
db19450e7c Merge remote-tracking branch 'lars/master' 2016-05-16 17:13:01 -07:00
Lars Brubaker
c4d53d054f Working on better printer editing behavior 2016-05-16 17:11:49 -07:00
larsbrubaker
19b0b5db71 Fixed the colors on movement controls 2016-05-15 22:12:35 -07:00
Lars Brubaker
9102a03dc6 Merge pull request #770 from larsbrubaker/master 
Edit button for printer
 2016-05-15 12:00:12 -07:00
Lars Brubaker
8f94679671 A bit more work on printer editing. 2016-05-15 11:52:40 -07:00
johnlewin
95f2fbadb6 Merge pull request #772 from gregory-diaz/1.5.3 
Added BCN to printer white list
 2016-05-13 17:52:57 -07:00
Greg
287bcc2a73 Added BCN to printer white list 2016-05-13 17:42:04 -07:00
Lars Brubaker
ba33eb1d37 Made automation able to show the software mouse whenever desired. 2016-05-13 14:24:00 -07:00
Lars Brubaker
ce13f6f59c Put in a hack for the printer edit button. 2016-05-13 14:23:33 -07:00
Lars Brubaker
d46b1d7d3b Merge pull request #769 from gregory-diaz/1.5.3 
Added new printer profile for TAZ 6 with Software Leveling.
 2016-05-13 14:19:41 -07:00
Greg
24f4cd8a60 Added new printer profile for TAZ 6 with Software Leveling. 2016-05-13 14:12:46 -07:00
Lars Brubaker
dd72281bc2 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-05-13 11:38:35 -07:00
Lars Brubaker
5a908c7973 Working on edit button for printer 2016-05-13 11:37:22 -07:00
johnlewin
94d1ca6de2 Merge pull request #766 from jlewin/master 
Add missing Net3dBool project
 2016-05-13 11:11:56 -07:00
John Lewin
34e12a4565 Add missing Net3dBool project 2016-05-13 11:10:21 -07:00
Lars Brubaker
4945580ae5 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-05-12 19:12:47 -07:00
Lars Brubaker
dd67d8055d Merge pull request #764 from larsbrubaker/master 
Changed Connection Info -> Connection in settings tab.
 2016-05-12 19:12:03 -07:00
Lars Brubaker
301316b82c Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-05-12 19:09:39 -07:00
Lars Brubaker
c33b3ac8b6 Changed Connection Info -> Connection in settings tab. 2016-05-12 18:56:40 -07:00
Lars Brubaker
6353f3c69c Merge pull request #760 from larsbrubaker/master 
TAZ6 profile
 2016-05-12 18:55:58 -07:00
Lars Brubaker
05fe8183f7 Merge remote-tracking branch 'origin/master' 2016-05-12 18:44:51 -07:00
Lars Brubaker
5e7e8f70dc Added a drop list to baud rate 
Added Printer to basic and Intermediate
Made clearing user override reset quick select settings drop lists
 2016-05-12 18:42:19 -07:00
johnlewin
2d80e740ec Merge pull request #762 from jlewin/master 
Latest Agg
 2016-05-12 17:46:36 -07:00
John Lewin
9d55274058 Latest Agg 2016-05-12 17:32:39 -07:00
Lars Brubaker
66fc9fa69a Merge pull request #761 from gregory-diaz/1.5.3 
Added new printer profile for BCN Sigma
 2016-05-12 16:32:47 -07:00
Lars Brubaker
9d268fb9c9 Merge pull request #741 from jlewin/per_printer_themes 
Experimental support for per printer themes
 2016-05-12 16:32:15 -07:00
Greg
0672c97a32 Added new printer profile for BCN Sigma 2016-05-12 16:16:26 -07:00
Lars Brubaker
9e9f1dc4a4 Merge remote-tracking branch 'origin/1.5.3' 2016-05-12 16:13:46 -07:00