Commit graph

590 commits

Author SHA1 Message Date
Kevin E. Pope
e8a5af2816 Remove spacer from library button row. 2015-06-30 17:52:47 -07:00
Lars Brubaker
49ed433f4d Updated the folder icons. 2015-06-25 18:10:52 -07:00
Lars Brubaker
f6d32a62a5 Changed Changing some delegate defs to use EventHandler<> instead.
Took out some EventHandler new s that were from old code
Now Provider code
Create Folder in library and working some in provider.
New tests in MatterSlice
2015-06-24 16:59:10 -07:00
larsbrubaker
b3ed720152 Additional strings added to French file. 2015-06-16 22:34:52 -07:00
larsbrubaker
98117c5567 Merge remote-tracking branch 'origin/master' into development 2015-06-16 22:31:19 -07:00
Gregory Diaz
c258e8bae7 Added new 3D Stuffmaker printer profiles. 2015-06-16 18:09:07 -07:00
Nutz95
04b5e4a0d5 Fix translation typos
Fix translation typos
2015-06-16 22:14:38 +02:00
Nutz95
4e354a7ff1 French Translation
Finish french tranlation
2015-06-16 21:44:57 +02:00
Nutz95
c0709408e1 French Translation: First Half done
Done first half of french translation
2015-06-16 18:51:05 +02:00
Lars Brubaker
c38b4de0ba Made the file system provider able to navigate folders. 2015-06-15 12:12:18 -07:00
Lars Brubaker
d2f1ba4b22 Made the update available message have a marker on it to make it more visible. 2015-06-15 09:55:38 -07:00
Lars Brubaker
ba2f54e652 New library code to support collections. 2015-06-12 17:21:51 -07:00
Lars Brubaker
61605b866a Merge branch '1.2.3' into development 2015-06-10 17:53:37 -07:00
Gregory Diaz
a30cae6de3 Last printer profile changes for Maker's Tool Kit. 2015-06-10 15:11:58 -07:00
Lars Brubaker
7f0968f19a Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2015-06-09 17:28:01 -07:00
Gregory Diaz
2afb0e1ed7 removed Wanhao USA from printer whitelist 2015-06-09 16:17:59 -07:00
Gregory Diaz
1071ed4f5b Revert "Removed printers from build who's printer profiles are not completed"
This reverts commit 43391c2142.
2015-06-09 16:16:33 -07:00
Gregory Diaz
2713071910 Removed Wanhao from printer whitelist 2015-06-09 16:14:23 -07:00
Gregory Diaz
ecf31a06c6 Revert "Removed printers from build who's printer profiles are not completed"
This reverts commit 43391c2142.
2015-06-09 16:11:49 -07:00
Lars Brubaker
9ed4972915 Merge branch '1.2.3' into development
Conflicts:
	Submodules/MatterSlice
	Submodules/agg-sharp
2015-06-09 11:40:52 -07:00
Lars Brubaker
b373d5c14a Fixed a bug in first layer extrusion width. 2015-06-09 11:30:14 -07:00
larsbrubaker
219b14aaf4 Merge branch '1.2.3' into development 2015-06-06 07:44:47 -07:00
Lars Brubaker
6a28094c1b Working on support for MakerBot printers. 2015-06-05 17:20:30 -07:00
Lars Brubaker
4b99dcf0e0 Merge pull request #281 from gregory-diaz/1.2.3
Removed printers from build who's printer profiles are not completed
2015-06-05 15:24:52 -07:00
Gregory Diaz
43391c2142 Removed printers from build who's printer profiles are not completed 2015-06-05 15:19:36 -07:00
Lars Brubaker
d16eb78b15 Good feedback about redundant naming. Eliminated a bunch of 'Settings' names. 2015-06-05 11:17:28 -07:00
Lars Brubaker
5f7c31ce57 Merge branch '1.2.3' into development 2015-06-04 12:36:36 -07:00
Gregory Diaz
3a291513be Added updated "Maker's Tool Works" printer profile 2015-06-04 10:40:44 -07:00
Gregory Diaz
ed929db757 Added a Maker's Tool Works printer profile 2015-06-04 10:36:55 -07:00
Gregory Diaz
b9cf1f6795 Changed name from MakeIt to MAKEiT 2015-06-03 14:26:23 -07:00
Gregory Diaz
834a3c435b temporary commit 2015-06-03 14:23:48 -07:00
Gregory Diaz
a6202b65ac Added the new default printer settings that MakeIt requested us to include. 2015-06-02 10:01:35 -07:00
Lars Brubaker
4fdfe1efe2 Code maid 2015-05-30 12:48:16 -07:00
Gregory Diaz
aa62be2193 committing Make it setup.ini 2015-05-29 18:16:31 -07:00
Lars Brubaker
3d43b1e9c3 Merge branch '1.2.3' into development
Conflicts:
	Submodules/agg-sharp
2015-05-29 18:15:04 -07:00
Gregory Diaz
0d8be37515 Added MakeIt to Printer Whitelist 2015-05-28 12:17:25 -07:00
Gregory Diaz
c8c7234a2b Added setup.ini and calibtration.ini to MakeIt Pro profile 2015-05-28 11:28:32 -07:00
Lars Brubaker
7d8dff4040 handle bad requests better (don't fail when connection not available)
Don't crash when writing log to protected directory.
2015-05-28 11:03:45 -07:00
larsbrubaker
ab0f591773 Changed send to share 2015-05-28 07:49:33 -07:00
larsbrubaker
d59813a407 Merge branch '1.2.3' of https://github.com/MatterHackers/MatterControl into development 2015-05-28 07:37:20 -07:00
Lars Brubaker
bfbcf227fd Making settings more consistent 2015-05-27 18:22:01 -07:00
Gregory Diaz
519fadc377 Added printer profile for MakeIt Pro 2015-05-27 18:05:22 -07:00
Gregory Diaz
9845ee82e5 Fixed bad default settings that were preventing prints from being started. 2015-05-26 18:46:15 -07:00
larsbrubaker
b7b79ba918 Deleting dead code.
Moved the queue item menu to the top
2015-05-23 18:48:00 -07:00
Lars Brubaker
61dab45d0b Put in the speeds legend
Removed unused icons
2015-05-22 15:07:48 -07:00
Lars Brubaker
4d4841adf3 Merge branch 'master' into development 2015-05-22 14:44:05 -07:00
Lars Brubaker
108dbee140 Put in a check for updates menu 2015-05-22 12:33:59 -07:00
Gregory Diaz
5f9d67422c Merge branch 'development' of https://github.com/MatterHackers/MatterControl into color_gradient_work 2015-05-21 17:44:27 -07:00
Lars Brubaker
6be1916c89 Improved the message for gcode loading error. 2015-05-21 15:09:59 -07:00
Gregory Diaz
b98120bcc1 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into color_gradient_work 2015-05-20 13:52:34 -07:00