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

1268 commits

This branch
This branch
All branches
Author SHA1 Message Date
larsbrubaker
7ab9b2719b Put in new settings from SeeMeCNC 2014-10-31 11:57:05 -07:00
larsbrubaker
9acebbdd3c Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-10-31 11:07:40 -07:00
larsbrubaker
e445042d88 Made it so we write the config file contents to the gcode we are outputting. 2014-10-31 11:06:51 -07:00
Kevin Pope
21ac7ad655 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-10-31 10:20:05 -07:00
Kevin Pope
0a5b387366 Add support for apk downloads. 2014-10-31 10:19:50 -07:00
Lars Brubaker
33d0079dde Merge pull request #82 from mmoening/development 
Improved auto-name feature to change on model change
 2014-10-31 09:50:39 -07:00
Matt Moening
64628b4132 Improved auto-name feature to change on model change 
Will not change name if user types value into name box
 2014-10-31 09:36:30 -07:00
larsbrubaker
61536cb01b Made all the code that was only handling stl also do amf 2014-10-30 17:37:28 -07:00
larsbrubaker
0e0ca82d21 Made output to folder understand amfs 2014-10-30 17:23:32 -07:00
larsbrubaker
fb182a078c Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-10-30 16:47:48 -07:00
larsbrubaker
1560dd5bfc Make sure we don't send empty lines to the printer. 2014-10-30 16:44:16 -07:00
Lars Brubaker
d3c5621346 Merge pull request #81 from jlewin/development 
Reset active slicer to MatterSlice for multi-extruder printers
 2014-10-30 16:41:37 -07:00
John Lewin
afbd336940 Reset active slicer to MatterSlice for multi-extruder printers 2014-10-30 15:19:53 -07:00
larsbrubaker
2a195b49ea Updated setting for new airwolf models. 2014-10-30 14:49:16 -07:00
larsbrubaker
dda44300a1 Made the part window close right. 2014-10-30 14:42:00 -07:00
larsbrubaker
25b11b88b7 Merge remote-tracking branch 'Greg/development' into development 2014-10-30 13:39:24 -07:00
larsbrubaker
6c33e4d084 fixed the escape key to cancel a drag in 3d. 2014-10-30 13:39:03 -07:00
Gregory Diaz
defdca5cb0 Merge remote-tracking branch 'origin/development' into development 2014-10-30 10:02:39 -07:00
Kevin Pope
2cec1b224c Fix bug when closing preview window popout. 2014-10-29 19:35:08 -07:00
Lars Brubaker
cde58a3148 Merge pull request #79 from mmoening/development 
Added feature to replace "Default Printer" with the Make and Model of th...
 2014-10-29 18:14:51 -07:00
Matt Moening
b7957f7124 Added feature to replace "Default Printer" with the Make and Model of the printer if the name of the printer was not changed when added 2014-10-29 17:46:05 -07:00
Kevin Pope
7f06d069e0 Widened the print connection buttons a bit and made a separate part preview container widget. 2014-10-29 16:55:44 -07:00
larsbrubaker
330d75079c More allocation validation. 2014-10-29 15:47:10 -07:00
larsbrubaker
e306d80c74 Make sure we are on T0 before we start printing. 2014-10-29 14:38:25 -07:00
Lars Brubaker
aae65a8568 Merge pull request #78 from jlewin/fixes 
Additional updates to Queue
 2014-10-29 14:30:01 -07:00
John Lewin
dde50031ee Remove Import from Zip option from QueueOptionsMenu 2014-10-29 13:48:02 -07:00
larsbrubaker
262f3e51bc Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-10-29 13:16:26 -07:00
larsbrubaker
2a822b15a4 Put in a group button and made it work. 2014-10-29 13:15:53 -07:00
Gregory Diaz
175842b577 Merge remote-tracking branch 'origin/development' into development 2014-10-29 12:56:24 -07:00
John Lewin
326d35ae96 Ensure Queue status label has correct color 2014-10-29 12:55:18 -07:00
Kevin Pope
2d3adf5098 Merge pull request #77 from gregory-diaz/development 
Finished up work for Printer Connection Window and PrinterList Items.
 2014-10-29 12:52:09 -07:00
John Lewin
71d99f8e09 Improve documentation of ConditionalClickWidget behavior 2014-10-29 12:51:59 -07:00
larsbrubaker
b8b0fddaec Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-10-29 12:37:44 -07:00
larsbrubaker
f7e0adc1bb Took out repair_overlaps 2014-10-29 12:37:05 -07:00
Kevin Pope
850c7b3783 Merge pull request #76 from jlewin/fixes 
Rollup of Queue and Library Fixes
 2014-10-29 12:35:10 -07:00
Gregory Diaz
58a3d34938 Finished up work for Printer Connection Window and PrinterList Items. 2014-10-29 12:34:01 -07:00
larsbrubaker
82acb01d9e Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-10-29 12:03:47 -07:00
larsbrubaker
ed9bcbc1b4 removing dead code 2014-10-29 12:02:35 -07:00
John Lewin
b5d399b933 Revise formatting style of ConditionalClickWidget 2014-10-29 11:46:10 -07:00
John Lewin
21b46d25d6 Do not autocheck selected/active part when entering EditMode - Fixes #81701156 2014-10-29 10:23:10 -07:00
John Lewin
171d781a05 Avoid firing SelectedIndexChanged when thumbnail icon is clicked - Fixes #81694554 2014-10-29 10:07:12 -07:00
larsbrubaker
e58e7cf049 Made ExtruderShareTemperature go through the api rather than direct query. 2014-10-29 09:51:52 -07:00
John Lewin
5c5e57f2be Revise checkbox and selection behavior in Queue and Library views - Fixes #81695578 2014-10-29 09:40:50 -07:00
larsbrubaker
40b633b158 Make sure we include the launcher app. 2014-10-29 08:46:56 -07:00
Lars Brubaker
126e7fd0f6 Merge pull request #75 from jlewin/Fixes 
Remove unneeded ClickContainer on Queue Items
 2014-10-28 16:05:36 -07:00
John Lewin
5a2fcb995f Avoid setting properties on shopButton when ShowShopButton is false 2014-10-28 15:36:12 -07:00
larsbrubaker
4f3b9194d0 align now makes a group after doing the align. 2014-10-28 12:27:22 -07:00
John Lewin
ab704b13e3 Remove unneeded ClickContainer on Queue Items 2014-10-28 12:11:38 -07:00
larsbrubaker
9a96f88a04 Fixed a bug in ungroup (duplicating the wrong transform) 
Put in some exceptions for bad conditions.
 2014-10-28 12:07:51 -07:00
Kevin Pope
74566b3f01 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-10-28 09:25:32 -07:00