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

2056 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lars Brubaker
7370964df5 Put in TAZ 5 settings 2015-04-16 10:00:01 -07:00
Lars Brubaker
f2ee388013 Put in a profile for Huxley 2015-04-15 17:10:43 -07:00
Lars Brubaker
441c798efe Made the editor reload the part if it has been edited in another view and saved. 2015-04-15 16:59:12 -07:00
Lars Brubaker
55948212e9 Make the 3D view update the model if it changes in another view. (but only if not edited). 2015-04-15 16:39:37 -07:00
Lars Brubaker
2daf050f92 Merge branch '1.2.2' into development 2015-04-15 10:10:01 -07:00
Lars Brubaker
43b658a5a7 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2015-04-15 10:09:25 -07:00
Lars Brubaker
6d7b0280bb Made the library actually copy gcode to the library folder 
Working on adding support for reporting errors when enabled
Made PrintActiveItem check for error conditions.
 2015-04-15 10:08:36 -07:00
Lars Brubaker
f737db4d8f Merge pull request #236 from gregory-diaz/development 
added material settings for PrintSpace, Altair
 2015-04-15 09:39:24 -07:00
Lars Brubaker
2b698bda5a Merge pull request #235 from gregory-diaz/mattercontrol_test 
Created command line utility to start MatterControl and export gcode.
 2015-04-15 09:39:16 -07:00
Lars Brubaker
915d4813cc Merge pull request #237 from gregory-diaz/1.2.2 
added material settings for PrintSpace Altair
 2015-04-15 09:39:05 -07:00
Gregory Diaz
0290cf758b added material settings for PrintSpace Altair 2015-04-14 17:29:56 -07:00
Gregory Diaz
1e78809ff7 added material settings for PrintSpace, Altair 2015-04-14 17:20:58 -07:00
Gregory Diaz
61a5b564a6 Created command line utility to start MatterControl and export gcode. 2015-04-14 17:15:58 -07:00
Lars Brubaker
e00d12959b ran codemaid 2015-04-14 15:50:34 -07:00
Lars Brubaker
29bb77e952 latest agg 2015-04-14 15:48:37 -07:00
Lars Brubaker
37e9cb1972 merged another touch file. 2015-04-14 15:48:21 -07:00
Lars Brubaker
97c0ef053c bsd 2015-04-14 15:40:15 -07:00
Lars Brubaker
df615b5ec3 ran cleanup 2015-04-14 15:33:52 -07:00
Lars Brubaker
86175bd500 Fixed some strange M190 settings in configs 
Made the html widget not show debug
Made the mapping classes not use unsetable temperatures in MatterSlice
 2015-04-14 15:27:11 -07:00
Lars Brubaker
cc410e7617 Make sure we mark prints that are stopped while paused as canceled. 
Make sure we cancel sd card prints correctly while paused.
 2015-04-13 12:28:33 -07:00
Lars Brubaker
164f1ee80f Made the remove quotes be more consistent. 2015-04-13 11:41:32 -07:00
Lars Brubaker
398c64a3c6 Fixed the parsing of class 2015-04-13 11:38:45 -07:00
Lars Brubaker
c70ecd0f6a Make sure we invalidate after updating the image. 2015-04-13 11:22:51 -07:00
Lars Brubaker
7b458d7ce8 latest agg 2015-04-11 16:01:29 -07:00
Lars Brubaker
187cde1222 Working on a wrapping text widget 
More test code for html rendering of p
 2015-04-11 16:01:17 -07:00
Lars Brubaker
08abfe9930 Moving more HTML code into its own classes. 2015-04-11 14:29:35 -07:00
Lars Brubaker
fbce0036c4 Working on making the html widget more generically useful. 2015-04-11 13:30:20 -07:00
Lars Brubaker
d1964a04c9 Made a ImageWidgetDelayedLoad class that loads from a URI 2015-04-11 12:01:40 -07:00
Lars Brubaker
ec865af371 new string in Spanish master 2015-04-11 10:50:44 -07:00
Lars Brubaker
e6be79c2ec latest agg 2015-04-10 18:49:09 -07:00
Lars Brubaker
1a5b1ec78c Merge touch datastore.cs 
Worked on HTML renderer.
 2015-04-10 18:48:57 -07:00
Lars Brubaker
f46947cad0 simple reorganize 2015-04-10 09:54:05 -07:00
Lars Brubaker
81b09633ce Reorganized 2015-04-09 17:45:14 -07:00
Lars Brubaker
43668bd955 Reorganizing code 2015-04-09 17:39:21 -07:00
Lars Brubaker
3cab6e5395 Shared the PrintActionRow file. 2015-04-09 12:05:05 -07:00
Lars Brubaker
d9b4381e19 Reorganized this file 2015-04-09 09:46:42 -07:00
Lars Brubaker
020b54ab75 Merge pull request #233 from mmoening/development 
Streaming GCode message check adjusted to work with all negative numbers
 2015-04-09 09:39:04 -07:00
Matt Moening
34167ac0f3 update agg 2015-04-08 19:28:05 -07:00
Matt Moening
330d3b4df6 Streaming GCode message check adjusted to work with all negative numbers 2015-04-08 19:01:51 -07:00
Lars Brubaker
e09e26db3c Fix bad change during android merge. 2015-04-08 18:09:37 -07:00
Lars Brubaker
5c0c983c9b Added the ability to force open matter control to not do any 3d rendering. 2015-04-08 17:47:17 -07:00
Lars Brubaker
5b23d2406f Need the break. 2015-04-08 15:54:31 -07:00
Lars Brubaker
188c8e6b02 Needed some usings. 2015-04-08 15:26:36 -07:00
Lars Brubaker
591528ee91 Ran code maid against this code. 2015-04-08 15:20:10 -07:00
Lars Brubaker
1445945d9c latest agg 2015-04-08 13:20:32 -07:00
Lars Brubaker
2b31beb864 latest matterslice 2015-04-08 12:30:16 -07:00
Lars Brubaker
412b23a1aa Removed some dependencies. 
Made sure paths correct on android
 2015-04-07 17:29:38 -07:00
Lars Brubaker
7c8acf199e Made UpdateControlData shared. 2015-04-07 15:54:20 -07:00
Lars Brubaker
2a2a9c2ebd Merge branch '1.2.2' into development 
Conflicts:
	StaticData/PrinterSettings/RoBo 3D/R1/config.ini
 2015-04-07 11:25:01 -07:00
Lars Brubaker
0c4e5866dc Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2015-04-07 11:23:47 -07:00