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

1615 commits

This branch
This branch
All branches
Author SHA1 Message Date
larsbrubaker
2db0d9ea0b Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-12-31 18:08:50 -08:00
Lars Brubaker
ed48949350 Merge pull request #149 from jlewin/development 
Cleanup resources after USB disconnect while Connected - Fixes #85321330
 2014-12-31 18:07:44 -08:00
larsbrubaker
c0ff2f5121 Merge remote-tracking branch 'origin/1.1.4' into development 2014-12-31 14:49:12 -08:00
Kevin Pope
c773f35e8d Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-12-31 14:17:38 -08:00
Kevin Pope
2c106fa44f Working on slice settings widget UI. 2014-12-31 14:17:18 -08:00
John Lewin
914a58f2a2 Cleanup resources after USB disconnect while Connected - Fixes #85321330 2014-12-31 14:08:22 -08:00
Lars Brubaker
d1f73271d3 Merge pull request #148 from gregory-diaz/1.1.4 
Added new slice settings for 3DStuffmaker
 2014-12-31 12:42:02 -08:00
Lars Brubaker
cb49c6a434 comment 2014-12-31 12:37:04 -08:00
Lars Brubaker
a65a1407c0 Better tester 2014-12-31 12:32:00 -08:00
Gregory Diaz
6f8a8b67cb Added new slice settings for 3DStuffmaker 2014-12-31 12:08:22 -08:00
Lars Brubaker
114ad7cbac Changed OPEN_WITH_ACTIVE_PRINTER > CREATE_AND_SELECT_PRINTER 
Made it a bit more generic.
 2014-12-31 11:37:08 -08:00
Lars Brubaker
b10ee7c140 Merge pull request #147 from gregory-diaz/development 
Added code so that when MatterControl is started with command line args(...
 2014-12-31 11:13:37 -08:00
Lars Brubaker
5dff18c421 Made the gcode warning checkbox work 
Made the terminal view show correctly when printing.
 2014-12-31 11:09:57 -08:00
Gregory Diaz
e8b2439ec2 Added code so that when MatterControl is started with command line args("OPEN_WITH_ACTIVE_PRINTER"). MatterControl will open with a printer selected. 2014-12-31 10:33:38 -08:00
Kevin Pope
7216823c7a Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-12-31 10:15:05 -08:00
Kevin Pope
4d10e76f47 Add spacer to gcode warning box. 2014-12-31 10:14:53 -08:00
Lars Brubaker
7a9de67a98 no message 2014-12-31 10:01:13 -08:00
Lars Brubaker
a82b30698b Put in printrbot driver 2014-12-31 09:52:22 -08:00
Lars Brubaker
58353881e5 Make the generate button show up after a print is done. 2014-12-30 11:48:53 -08:00
Lars Brubaker
58ec7718f9 Merge branch '1.1.4' into development 2014-12-30 09:41:23 -08:00
Lars Brubaker
f5f31acc7d Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-12-30 09:41:17 -08:00
Lars Brubaker
c3f2638384 Slicing queue does not need anything in the queue to exist or be selected to do slicing. 2014-12-30 09:41:08 -08:00
Kevin Pope
ae1f2418ba Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-12-29 18:35:54 -08:00
Kevin Pope
097d0cfc12 Updated visuals of pop-out placeholder info. 2014-12-29 18:35:38 -08:00
Lars Brubaker
dc0b3e641a Got the support interface extruder to be settable. 2014-12-29 17:14:56 -08:00
Lars Brubaker
ffe200c19f Made the average timer a shared resource 
Put in the interface material extruder setting
 2014-12-29 16:31:30 -08:00
Lars Brubaker
519c857832 Took out the outline stuff on android as it currently doesn't work. 2014-12-29 11:45:26 -08:00
Lars Brubaker
e815566aff nuget 2014-12-29 10:36:28 -08:00
Lars Brubaker
0761a9b75c Added OpenTK as a nuget 2014-12-29 10:33:45 -08:00
Kevin Pope
6993a6541e Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-12-28 17:29:56 -08:00
Kevin Pope
66726af531 Set max height for model chooser in setup wizard. 2014-12-28 17:28:39 -08:00
Kevin Pope
27f5bcfddd Adjust spacing of 3D View buttons. 2014-12-28 17:28:09 -08:00
Kevin Pope
4f546458a8 Ensure selection of part on load of QueueDataView. 2014-12-28 17:27:48 -08:00
larsbrubaker
5697cbae2d Fixed problems introduced when directly creating from images. 2014-12-28 13:58:16 -08:00
larsbrubaker
54422e50bc Reduced the drawing in part thumbnail widget a bit 
Made the draw ms be averaged over 64 draws so it is easier to see.
 2014-12-28 08:26:29 -08:00
Lars Brubaker
a68276154b Messing with drawing the buttons. 2014-12-27 16:21:30 -08:00
larsbrubaker
0a97cf0a1d Started work on z height turning controls. 2014-12-27 08:19:48 -08:00
Kevin Pope
60bc071b97 Merge pull request #142 from jlewin/development 
Add Android ActivePrinter.ComPort override, add exception dumps to IDE w...
 2014-12-24 12:30:02 -08:00
John Lewin
4456b1bfc1 Add Android ActivePrinter.ComPort override, add exception dumps to IDE when debugging 2014-12-24 12:12:11 -08:00
Kevin Pope
133ccd88d3 Add PrinterSetupStatus file to project. 2014-12-24 08:18:03 -08:00
Kevin Pope
f8d53056b4 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-12-24 08:15:12 -08:00
Kevin Pope
ac98f1a852 Move PrinterSetupStatus to a separate file. 2014-12-24 08:14:30 -08:00
larsbrubaker
9f4c463f08 Made the pop outs match the theme better. 2014-12-23 14:16:01 -08:00
larsbrubaker
a2aee95c56 less redundant code 2014-12-23 13:17:10 -08:00
larsbrubaker
f532d8cdf8 Made the pop up TextTab work much better 
Made a PopOutManager class to make it easier to create lots of pop outs.
 2014-12-23 12:41:56 -08:00
larsbrubaker
057c13d88f Got it to show with the app 2014-12-23 08:17:57 -08:00
larsbrubaker
1dd3e9c2a8 Merge branch '1.1.4' into development 2014-12-22 23:12:53 -08:00
larsbrubaker
4914f8d4b6 Put in the open beam printer driver. 2014-12-22 23:12:29 -08:00
larsbrubaker
842fc9b1f0 Put in the open beam printer driver. 2014-12-22 23:03:03 -08:00
larsbrubaker
739ad1b86a Merge branch '1.1.4' into development 2014-12-22 22:50:13 -08:00