larsbrubaker
7ffdbcbba8
Put in a z height snap grid of 1. Will make a menu in the future.
2014-12-12 07:34:25 -08:00
Lars Brubaker
dcb288ddef
Merge branch '1.1.4' into development
2014-12-11 18:14:00 -08:00
Lars Brubaker
182191a464
Put in the right driver for Me3D
2014-12-11 18:07:25 -08:00
Lars Brubaker
3d8d19185a
Merge pull request #122 from gregory-diaz/1.1.4
...
New slice config files for Me3D
2014-12-11 18:04:03 -08:00
Lars Brubaker
3c41775a54
Making the Standard and Advanced ui control work and be available.
2014-12-11 17:35:57 -08:00
Gregory Diaz
d29ad1a80e
New slice config files for Me3D
2014-12-11 17:32:08 -08:00
Lars Brubaker
538bb6abdc
Fixed a bug with adding gcode to the library.
...
Made drag and drop to the library add it correctly to the library folder when needed.
2014-12-11 17:19:32 -08:00
Lars Brubaker
806fde6512
Merge pull request #121 from gregory-diaz/development
...
new slice settings, material and quality settings for Me3D
2014-12-11 15:52:18 -08:00
Gregory Diaz
d93a86c450
new slice settings, material and quality settings for Me3D
2014-12-11 15:21:24 -08:00
Lars Brubaker
9849a1871a
Faster trace data
2014-12-11 11:31:07 -08:00
Lars Brubaker
cd1a9c5833
Fixed a bug importing new slic3r ini files.
2014-12-11 09:56:03 -08:00
Lars Brubaker
46e7d6c2f1
Made bed image load through static data.
2014-12-10 12:27:24 -08:00
Lars Brubaker
834f090ea9
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-12-10 12:07:16 -08:00
Lars Brubaker
ccbdde24b7
Made the replacement strings for gcode happen in macros and pause resume.
2014-12-10 12:07:06 -08:00
Lars Brubaker
58d33dd0b4
Merge pull request #119 from jlewin/ImportRefactor
...
Import project refactoring
2014-12-10 11:21:31 -08:00
John Lewin
6ffb66a7ca
Import project refactoring
2014-12-10 11:03:07 -08:00
larsbrubaker
f4aaa5107f
Moved some bools to enums to make the code more readable.
2014-12-10 08:18:42 -08:00
Lars Brubaker
0b934dcc52
Made the default size bigger.
...
Fixed a problem on starting first time (new to this build)
2014-12-09 17:53:15 -08:00
Lars Brubaker
220b386a26
Cleaning up some interfaces
2014-12-09 16:40:52 -08:00
Lars Brubaker
a54a59e25f
Putting a menu to switch view settings.
...
Made the trace data build faster.
Made ungroup understand mesh collections better
Made the slice settings layer index be an enum so it is clearer what is being accessed
Put menu items into separate files
2014-12-09 15:16:08 -08:00
Lars Brubaker
de0070eb35
Some working on streamlining the ui and creating a new 'simple' mode.
2014-12-08 18:18:38 -08:00
Lars Brubaker
59cb80f894
Put in a description.
2014-12-08 16:46:23 -08:00
Lars Brubaker
0b22f099e7
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-12-08 16:40:56 -08:00
Lars Brubaker
f8e92931e1
Made the pre-heat use the temperature and bed_temperature .
...
Put in a menu to select the slice settings level.
2014-12-08 16:40:50 -08:00
Lars Brubaker
56d156f62a
Merge pull request #117 from jlewin/development
...
Drop SharpZipLib and refactor for System.IO.Compression
2014-12-08 16:03:47 -08:00
John Lewin
891c03deae
Remove compiled assemblies from project root
2014-12-08 13:09:29 -08:00
John Lewin
10dfe6ec8c
Drop SharpZipLib and refactor for System.IO.Compression
2014-12-08 13:08:09 -08:00
Lars Brubaker
c0e878a45d
Fixe the e speed for SeeMeCNC in 1.1.4
2014-12-08 10:44:43 -08:00
larsbrubaker
527757b314
Put in a z-height display.
2014-12-08 07:53:10 -08:00
larsbrubaker
d94ab42f24
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-12-08 07:25:12 -08:00
larsbrubaker
6d4320983b
Improved the z axis movement plane
...
Made the skirt values have a menu
2014-12-08 07:25:02 -08:00
kevinepope
1a1d505b14
Added custom progress bar control.
2014-12-07 20:10:24 -08:00
larsbrubaker
4ef5f15d03
Put upArrow3D into its own file.
2014-12-07 08:05:31 -08:00
larsbrubaker
7bac6919b4
Fixed a couple more selection issues.
...
Made the arrow render the same way as the other meshes. (same api)
2014-12-06 23:06:08 -08:00
larsbrubaker
e37af2f143
Fixed a bug with some zip files that seem to have an empty entry.
2014-12-06 11:38:35 -08:00
larsbrubaker
30c77146ec
Took out all the user folder stuff and put it into the file dialog.
...
Also made file dialog remember what folder was last used and use that one if it has been set.
Does the old user folder when not set.
2014-12-06 11:12:05 -08:00
larsbrubaker
6b7bf6edfa
Merge remote-tracking branch 'origin/1.1.4' into development
2014-12-05 23:35:17 -08:00
Lars Brubaker
5c4c66f9f5
Back ported the terminal filter code.
2014-12-05 17:35:50 -08:00
Lars Brubaker
b49d83f60b
Cleaning up the interface a bit. Removing unused parameter and some dead code.
2014-12-05 16:23:24 -08:00
Lars Brubaker
6fe0ad8b15
Don't try to build a thumbnail if the file is not on disk.
2014-12-04 15:53:28 -08:00
Lars Brubaker
f02dcfb250
Made TAZ setting a bit better.
2014-12-04 15:46:28 -08:00
Lars Brubaker
44bf98b216
Merge pull request #116 from jlewin/StaticData
...
StaticData Abstraction
2014-12-04 13:58:52 -08:00
John Lewin
3b5b65f822
Remove IEnumberable assumptions from ReadLines callers and cleanup invokes
2014-12-04 13:41:16 -08:00
John Lewin
59cf8782a3
Remove all remaining ApplicationStaticDataPath dependencies
2014-12-04 12:50:37 -08:00
John Lewin
6feac79ee3
Remove ApplicationStaticData references
2014-12-04 12:44:28 -08:00
John Lewin
0b052b375e
Remove ApplicationStaticData references
2014-12-04 12:22:36 -08:00
John Lewin
fca5b47159
Resolve merge issues
2014-12-04 12:22:35 -08:00
John Lewin
28159053ab
Add LoadIcon helper function
2014-12-04 12:22:35 -08:00
John Lewin
eba756966b
Initial StaticData platform abstraction
2014-12-04 12:22:34 -08:00
Lars Brubaker
62730c186d
Don't hide top container on touch screen.
...
Better words on support angle.
2014-12-04 11:23:33 -08:00
