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

970 commits

This branch
This branch
All branches
Author SHA1 Message Date
larsbrubaker
15cc3dd35c Merge branch '1.1.3' into development 2014-09-05 16:15:08 -07:00
larsbrubaker
2ac4bed04e Merge commit '905794eaa6' into 1.1.3 2014-09-05 16:14:04 -07:00
gregory-diaz
dd0a63dd77 Merge remote-tracking branch 'upstream/development' into development 2014-09-05 15:26:33 -07:00
gregory-diaz
905794eaa6 Added new material and quality presets for Revolution 3d 2014-09-05 15:25:59 -07:00
larsbrubaker
6c4951e198 Merge remote-tracking branch 'origin/1.1.3' into development 2014-09-05 13:11:30 -07:00
Kevin Pope
f668c132e3 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-09-05 13:06:20 -07:00
Kevin Pope
5354d3976c Fix slice engine ui handling. 2014-09-05 13:04:41 -07:00
Kevin Pope
0b8e4fc092 Fix whitelisted makes. 2014-09-03 17:32:38 -07:00
larsbrubaker
b65412a2c0 Put all the agg-sharp stuff in a folder 2014-09-03 14:18:01 -07:00
larsbrubaker
4d96053446 added support for @pause and M226 (user requested pause) 2014-09-03 10:43:23 -07:00
gregory-diaz
c907b98560 Changing default watermark image back to the MatterControl logo(set the wrong one in previous commit). 2014-09-02 16:39:10 -07:00
gregory-diaz
60512e7667 Merge remote-tracking branch 'upstream/1.1.3' into development 2014-09-02 16:35:09 -07:00
gregory-diaz
ce67d6e004 Added Printer and Slice Setting information for Me3D and Revolution 3D 2014-09-02 16:33:17 -07:00
gregory-diaz
be348cedc2 Edited OEMSettings.json file to include Me3D and Revolution 3D 2014-09-02 16:30:11 -07:00
larsbrubaker
9589e03450 Fixed a bug where print leveling could not be disabled if it had been enable at one point. 2014-09-02 12:49:14 -07:00
larsbrubaker
c97f4d8f8f Making MC be able to adapt to a global change in the point size of all text. 2014-08-30 16:03:28 -07:00
larsbrubaker
c9ffc3eb98 Made fixed width and height in button factory doubles. 2014-08-30 13:28:13 -07:00
larsbrubaker
9bbd272467 Cleaned up the GetRenderType call to eventually improve the 3d gcode layer creation speed 
Made setting the extruder temp to 0 suppress outputting M109
 2014-08-29 10:45:21 -07:00
larsbrubaker
5454316591 Set the z axis speed to be right 2014-08-28 15:40:47 -07:00
larsbrubaker
e93d38ec90 Made macros disabled during pining 
Made it possible to set movement speed in setting.ini
Updated orion and rostockMax settings
Made orion and rostockMax have fast manual z moment
Made some printers have the calibration box at startup
 2014-08-28 12:22:57 -07:00
Kevin Pope
d7977022ef Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-08-27 16:42:11 -07:00
Kevin Pope
8b3a0d8e13 Fix MatterSlice engine path. 2014-08-27 16:41:25 -07:00
Kevin Pope
3465606e36 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-08-27 14:16:16 -07:00
Kevin Pope
3fe41a6dc8 Made 3d render type a persistent user setting, defaulting to outline. Made 'Add' buttons on action bar and queue menu consistent. 2014-08-27 14:15:41 -07:00
larsbrubaker
c2744b7587 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-08-27 12:53:03 -07:00
larsbrubaker
37ebc4ce9b Fixed a problem with exporting to SD card when print leveling is enabled. 
Checked that the files loaded from sd card have a gcode extension.
 2014-08-27 12:51:59 -07:00
Kevin Pope
3885e83c5b Use primary color in OutputScrollWindow (for improved readability). 2014-08-27 12:46:33 -07:00
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