Commit graph

3630 commits

Author SHA1 Message Date
John Lewin
ebf66bb849 Remove duplicate code, reuse GetMacros function 2016-02-23 11:15:14 -08:00
John Lewin
2aef5b2be6 Better convey when Enumerable.Empty is returned 2016-02-23 11:15:14 -08:00
Lars Brubaker
2fae50dd2e Merge remote-tracking branch 'origin/master' 2016-02-23 10:34:28 -08:00
johnlewin
e30cc1ab8f Merge pull request #566 from jlewin/master
More concise db query
2016-02-23 09:57:16 -08:00
John Lewin
7567110bfb Fix whitespace 2016-02-23 09:55:08 -08:00
John Lewin
231adae246 More concise db query 2016-02-23 09:55:08 -08:00
Lars Brubaker
537d77e515 Made the terminal use a mono spaced font. 2016-02-23 09:25:59 -08:00
Lars Brubaker
c9ee69ac3a Merge branch '1.5.1' of https://github.com/MatterHackers/MatterControl
Conflicts:
	Submodules/MatterSlice
2016-02-22 13:27:25 -08:00
Lars Brubaker
7dc03336dc Merge pull request #564 from gregory-diaz/1.5.1
1.5.1
2016-02-22 13:25:27 -08:00
Greg
bd840e968c Removed accidentally committed profile 2016-02-22 13:11:48 -08:00
Greg
70054955f0 Added changes Maker Tool Work's printer profiles and material settings 2016-02-22 12:59:10 -08:00
Lars Brubaker
f7356b7102 Make sure we reset the "Finish Setup..." button after completing print leveling wizard. 2016-02-22 10:24:41 -08:00
Lars Brubaker
d94ad423cf Made the leveling wizard show up after connect if required
Put in a "finish setup" button
Refactored some of the print leveling test code
Auto close printer setup wizard on connect
2016-02-22 10:14:07 -08:00
larsbrubaker
338fa2559a Made it possible to add 3D tool plugins. 2016-02-21 13:18:29 -08:00
larsbrubaker
c4fc5ef6b1 Got the snapping indicators drawing much better. 2016-02-20 15:39:54 -08:00
larsbrubaker
3173d056c6 Snapping is finally working well. 2016-02-20 09:17:25 -08:00
johnlewin
9d60e4ee6a Merge pull request #563 from jlewin/master
Latest MC - ConvexHull updates
2016-02-19 22:05:11 -08:00
John Lewin
c8dc683d24 Latest MC - ConvexHull updates 2016-02-19 22:02:40 -08:00
johnlewin
bff19bbe38 Merge pull request #562 from jlewin/convexhull
Add ConvexHull and Brim support
2016-02-19 17:37:49 -08:00
John Lewin
1c63ab2db4 Add ConvexHull and Brim support 2016-02-19 17:31:21 -08:00
Lars Brubaker
842d0beb98 Merge pull request #559 from rytz/helptext
Help text changes
2016-02-19 17:10:53 -08:00
Lars Brubaker
9773a50c72 Merge pull request #558 from rytz/master
Printer settings and UI changes
2016-02-19 17:07:11 -08:00
johnlewin
d823f1bf2f Merge pull request #561 from jlewin/master
Spelling
2016-02-19 11:29:21 -08:00
John Lewin
0d86184329 Spelling 2016-02-19 11:27:55 -08:00
johnlewin
0e35d91f9f Merge pull request #560 from jlewin/master
Add UI config files to csproj for discoverability/VS search
2016-02-19 11:18:10 -08:00
John Lewin
31447f525d Add UI config files to csproj for discoverability/VS search 2016-02-19 11:17:13 -08:00
rytz
92ca7d0f19 Help text changes 2016-02-19 11:11:17 -08:00
rytz
30c871a821 Printer profiles - generic X3G and Ultimaker 2 Extended+ 2016-02-19 09:59:29 -08:00
rytz
8e2f238ef6 UI label changes 2016-02-19 09:59:29 -08:00
rytz
85004ffef9 Renaming to Rostock MAX 2016-02-19 09:59:28 -08:00
rytz
b1b0f5cbf8 adding 2+ profile to Ultimaker folder 2016-02-19 09:59:27 -08:00
larsbrubaker
f2197e5e15 Made snapping work better in xy. 2016-02-19 08:29:49 -08:00
Lars Brubaker
ecb9476f2a Cherry picked the support extruder settings fix. 2016-02-18 17:07:16 -08:00
Lars Brubaker
f85bb706c6 Have to use extrusion width. 2016-02-18 16:23:20 -08:00
Lars Brubaker
bddec5a3e3 Make support on layer 0 be solid infill to hold to the bed better. 2016-02-18 15:46:11 -08:00
Lars Brubaker
ec420f32ba put in layer change info for slic3r so we can detect layer changes.
Be more aggressive about trying to find the filament diameter then set it to a sane value if it can't be found.
2016-02-18 10:45:10 -08:00
Lars Brubaker
b6810f6db6 Grid snapping is working in x and y. 2016-02-18 09:36:01 -08:00
Lars Brubaker
36a46d58ef More work on xy snapping. 2016-02-17 18:06:32 -08:00
Lars Brubaker
136d7759f3 Merge branch '1.5.1' 2016-02-17 15:43:34 -08:00
Lars Brubaker
c117c00a13 Writing tests for zlift. 2016-02-17 15:43:27 -08:00
Lars Brubaker
1804e01fec Default SeeMe to having interface layers. 2016-02-17 15:13:26 -08:00
Lars Brubaker
01fb600b7d Default SeeMe to having interface layers. 2016-02-17 14:38:04 -08:00
larsbrubaker
a865ff8c77 Getting the snap grid to work in x and y. 2016-02-17 08:23:09 -08:00
Lars Brubaker
cfddadb144 Made the new support system support outputting with the correct extruder.
Made the combine in the queue ask for a name and add a new item.
Fixed Save clipping
2016-02-16 17:41:51 -08:00
Lars Brubaker
47959fc922 Put in leading 0s 2016-02-16 11:07:34 -08:00
larsbrubaker
10a1753529 Making it easier to add more interaction volumes
Added a new shadow on ground
2016-02-16 08:30:13 -08:00
larsbrubaker
202925f8c7 Made the PrinteItemAction also get the QueueDataWidget so we can act on the view (exit edit mode).
Made merge queue items exit edit mode
2016-02-15 13:03:33 -08:00
larsbrubaker
3142b80514 Putting in a Snap Grid menu. 2016-02-14 17:53:44 -08:00
larsbrubaker
0558aef596 Make the interaction volumes render on top of everything they can.
Put in ColorMask gl function.
2016-02-14 16:56:44 -08:00
larsbrubaker
4f89614358 Much easier to edit if we don't snap to the bed all the time. 2016-02-14 10:49:09 -08:00