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

943 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kevin Pope
e98cd09b28 Merge branch 'development' of https://github.com/gregory-diaz/MatterControl into development 2014-08-27 12:22:10 -07:00
gregory-diaz
c02e86441a Export X3g Stuff 2014-08-27 12:02:15 -07:00
larsbrubaker
e801528a7e If our printer allows negative z heights make sure the level edit wizard can also let us enter - z's. 2014-08-27 10:25:17 -07:00
gregory-diaz
949968817a Merge remote-tracking branch 'upstream/development' into development 
Conflicts:
	StaticData/Translations/Master.txt
 2014-08-27 10:00:46 -07:00
gregory-diaz
5e0be675d0 Merge remote-tracking branch 'upstream/development' into development 
Conflicts:
	CustomWidgets/ExportPrintItemWindow.cs
 2014-08-27 09:59:35 -07:00
Kevin Pope
237194ed0d Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-08-27 09:35:04 -07:00
Kevin Pope
cb28044712 Change r3d driver to Rumba 2014-08-27 09:34:28 -07:00
larsbrubaker
58b6326c14 Check if ActivePrinter before we use it. 2014-08-27 09:18:59 -07:00
larsbrubaker
0db380572b Put in a allow less than zero in print leveling. 2014-08-26 18:44:36 -07:00
gregory-diaz
3731559ff8 uncommented export x3g work 2014-08-26 18:34:54 -07:00
Kevin Pope
687262a098 Move x3g processing to separate method. 2014-08-26 18:29:03 -07:00
Kevin Pope
fda76316f7 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-08-26 18:12:10 -07:00
larsbrubaker
363ea294ab Put back in debug view of non-manifold. 2014-08-26 18:11:45 -07:00
Kevin Pope
a69d76acba Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 
Conflicts:
	StaticData/Translations/Master.txt
 2014-08-26 18:11:37 -07:00
Kevin Pope
c2721f5ef5 Added close and clear button to terminal window. Terminal window ui cleanup. 2014-08-26 18:09:23 -07:00
larsbrubaker
4a481fb867 Made the gcode 3d view recreate the bed correctly 
Made the printer separate position tracking from bed leveling re-write
 2014-08-26 17:38:23 -07:00
larsbrubaker
9e623a2f4a Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 
Conflicts:
	StaticData/PrinterSettings/RoBo 3D/R1/setup.ini
	StaticData/Translations/Master.txt
 2014-08-26 12:09:17 -07:00
larsbrubaker
841ea5e071 Made RoBo default to MatterSlice 
Made consol draw faster
took out dead code
white space
 2014-08-26 12:06:16 -07:00
Kevin Pope
9e2eb6e267 Added turkish translation. Changes to default settings. 2014-08-26 11:45:47 -07:00
larsbrubaker
74dacdb90a Made the "(refresh)" button not change the current selection of the 'auto save' checkbox in the edit profile window. 2014-08-25 20:22:06 -07:00
larsbrubaker
ba2068cffa Moved some code 2014-08-25 20:11:20 -07:00
gregory-diaz
c21dcb0631 Merge branch 'development' of https://github.com/gregory-diaz/MatterControl into development 2014-08-20 15:04:37 -07:00
Kevin Pope
89b8f38e35 Update R1 material settings. 2014-08-20 15:04:03 -07:00
larsbrubaker
ef0e133a88 Put in an HDL printer config 2014-08-20 15:03:59 -07:00
Kevin Pope
1a0a03542b Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-08-20 12:57:35 -07:00
Kevin Pope
08f3b4050c Update R1 material settings. 2014-08-20 12:57:00 -07:00
larsbrubaker
11857df1cb Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-08-20 12:25:06 -07:00
larsbrubaker
765c68e02f Put in an HDL printer config 2014-08-20 12:24:55 -07:00
Kevin Pope
2b3481ff75 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 
Conflicts:
	SlicerConfiguration/SlicingQueue.cs
 2014-08-20 12:17:50 -07:00
Kevin Pope
02022b8589 Slice engine info refactoring. 2014-08-20 12:14:45 -07:00
Kevin Pope
c782181ea9 Disable x3g export (for now) 2014-08-20 12:14:17 -07:00
larsbrubaker
be9ec01b36 don't run in process. 2014-08-20 12:10:31 -07:00
larsbrubaker
6b5caf0859 Put in some debugging for recreating the third panel view. 
fixed a mem leak in third panel
made the first layer show in sync to print
Made the current layer show in sync to print
 2014-08-20 11:04:43 -07:00
Kevin Pope
4d84481758 Merge branch 'development' into greg-development 2014-08-20 10:53:44 -07:00
Kevin Pope
4759adbf3b Merge branch 'development' into greg-development 
Conflicts:
	MatterControl.csproj
	StaticData/Translations/Master.txt
 2014-08-20 10:52:47 -07:00
Kevin Pope
61e243ef80 Remove missing file. 2014-08-20 10:47:40 -07:00
gregory-diaz
a9bfdf9fd3 implementing part of export as x3g 2014-08-19 18:10:38 -07:00
gregory-diaz
c8530bc699 Restructured logic on how we look for slice engines and implemented work in settingscontrolselector 2014-08-19 18:08:40 -07:00
larsbrubaker
b443e8fb34 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-08-19 11:41:31 -07:00
larsbrubaker
7d1f698141 Turning off the rooted weak event stuff 2014-08-19 11:41:13 -07:00
Kevin Pope
fca25dd045 Merge commit '3771ec374f' into development 2014-08-19 11:14:07 -07:00
Kevin Pope
16dc551ea3 Add ability to detect device code (along with firmware version). 2014-08-19 11:13:52 -07:00
larsbrubaker
4b405a6aa8 Add a store state before change slice settings panel. 2014-08-19 10:10:08 -07:00
larsbrubaker
3771ec374f Getting the sync to print working better. 2014-08-18 16:42:04 -07:00
larsbrubaker
f202a3336f Turned the 3d view render options into radio buttons. 
Made the 2D gcode view able to show speed and extrusion simulation.
Made the 3D gcode view able to turn off speed and extrusion simulation.
 2014-08-18 11:02:00 -07:00
larsbrubaker
66e0fb3b4d Put in some code for me to see a graph of the ms count of each frame. 2014-08-17 20:53:00 -07:00
Kevin Pope
4c422cbf20 Making auto-update process more robust. Added secondary download attempt and connection error handling. 2014-08-16 11:18:12 -07:00
Kevin Pope
23842ae901 Merge commit 'e1184db77b' into development 2014-08-16 10:45:03 -07:00
Kevin Pope
ba386f1725 Working on auto-updater. 2014-08-16 10:44:56 -07:00
larsbrubaker
e1184db77b Made MatterSlice use interface layers. 2014-08-15 16:37:24 -07:00