Commit graph

3782 commits

Author SHA1 Message Date
John Lewin
8867f07d8b Better naming, more explicit types, revised comments 2016-03-12 00:04:09 -08:00
John Lewin
1c1434909d Revise settings to slicer mappings 2016-03-11 23:39:08 -08:00
Lars Brubaker
8e84a45c0b Put in code to help debug bad boolean states. 2016-03-11 17:57:48 -08:00
Lars Brubaker
289df896ba Merge remote-tracking branch 'origin/1.5.1' 2016-03-11 16:54:42 -08:00
Lars Brubaker
f15d3aa08a Betting single layer output strings
Less processing.
Making changes for engraving
2016-03-11 16:54:27 -08:00
Lars Brubaker
9d5688d9c5 Merge pull request #608 from gregory-diaz/1.5.1
Start/End gcode changes from IRA3D
2016-03-11 14:43:05 -08:00
Greg
3b8ee5d18b Start/End gcode changes from IRA3D 2016-03-11 11:07:32 -08:00
Lars Brubaker
d586a2f0bc latest agg 2016-03-10 18:19:36 -08:00
Lars Brubaker
6a56c267f3 Merge remote-tracking branch 'origin/1.5.1' 2016-03-10 18:18:12 -08:00
Lars Brubaker
da35fa80c0 Put in setting for output only first layer
Took out non-reprap gcode output settings.
makerbot is supported in binary driver
ultimaker supports rep-rap gcode and ulti has errors
2016-03-10 18:18:03 -08:00
Lars Brubaker
ca91a6ceb7 Merge pull request #606 from gregory-diaz/1.5.1
Added profile changes for Jumpstart
2016-03-10 15:50:12 -08:00
Greg
f1d124f30a Added profile changes for Jumpstart 2016-03-10 15:46:24 -08:00
Lars Brubaker
121a4cef8f Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-03-10 14:57:44 -08:00
Lars Brubaker
bac32eec13 latest agg
Changed the mesh copy to be able to go slow and to only use indices.
2016-03-10 14:57:23 -08:00
johnlewin
465514b208 Merge pull request #605 from jlewin/master
Reduce VersionInfo to minimal complexity
2016-03-10 10:34:25 -08:00
John Lewin
68f0522ad2 Reduce VersionInfo to minimal complexity
- Consolidate three classes to expose four properties into one
2016-03-10 10:30:49 -08:00
Lars Brubaker
ece26a12e8 Default to old csg 2016-03-09 14:32:59 -08:00
Lars Brubaker
e0ddab26bb Merge remote-tracking branch 'origin/1.5.1' 2016-03-09 12:36:39 -08:00
Lars Brubaker
a3e4207d7a Merge remote-tracking branch 'origin/master' 2016-03-09 12:36:32 -08:00
Lars Brubaker
19c41f9460 Added in some more printer error messages 2016-03-09 12:36:24 -08:00
Lars Brubaker
6e732ca724 Merge pull request #604 from gregory-diaz/1.5.1
Added start/end gcode as requested by ME3D
2016-03-09 12:07:32 -08:00
Lars Brubaker
5674f59797 Merge pull request #603 from rytz/master
Changing copyright to 2016
2016-03-09 12:07:21 -08:00
Greg
72085fb992 Added start/end gcode as requested by ME3D 2016-03-09 10:33:14 -08:00
Lars Brubaker
6969ecf5f3 Merge branch '1.5.1'
Conflicts:
	SettingsManagement/ApplicationSettings.cs
2016-03-08 12:15:56 -08:00
Lars Brubaker
a27affab28 Making Extrude vertex source to mesh share more code internally
putting in boolean failure case.
2016-03-08 12:13:58 -08:00
Lars Brubaker
cdba47516f Merge pull request #602 from gregory-diaz/1.5.1
Fixed a broken unittest and fixed a bug that was not allowing us to a…
2016-03-07 17:35:49 -08:00
rytz
13b51efe53 Changing copyright to 2016 2016-03-07 17:27:51 -08:00
Greg
5184454dc5 Fixed a broken unittest and fixed a bug that was not allowing us to ad gcode files to the print queue. 2016-03-07 16:48:34 -08:00
Lars Brubaker
cd5a4ab5e5 Merge remote-tracking branch 'origin/1.5.1' 2016-03-07 15:38:37 -08:00
Lars Brubaker
752e1ac626 Merge pull request #601 from gregory-diaz/1.5.1
Refactored some code around hide/show firmware updater
2016-03-07 15:37:20 -08:00
Greg
78e94eb37c Added new default profile for Kossel Pro 2016-03-07 15:22:27 -08:00
Greg
760e20e427 Refactored some code around hide/show firmware updater 2016-03-07 15:16:12 -08:00
Lars Brubaker
68ba01a63e Put in all 3 boolean operations 2016-03-07 14:23:22 -08:00
Greg
a7d87ce6cd Added a hardware setting to show/hide marlin firmware updater. 2016-03-07 14:11:36 -08:00
Lars Brubaker
18eb33376b latest agg 2016-03-07 13:35:35 -08:00
larsbrubaker
ea196408d2 Experimenting with new boolean 3d library. 2016-03-05 15:54:38 -08:00
Lars Brubaker
d2de95aa7a latest agg
Refactoring
2016-03-04 18:35:39 -08:00
Lars Brubaker
edc3520e14 Merge pull request #597 from gregory-diaz/master
Created tests for File Menu Items
2016-03-04 14:38:33 -08:00
Greg
b18129c379 Created tests for File Menu Items 2016-03-04 14:36:49 -08:00
Lars Brubaker
89d126c564 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-03-04 13:41:14 -08:00
Lars Brubaker
a039828cbf Put in DepthMask function 2016-03-04 13:37:59 -08:00
Lars Brubaker
6c4276ea4d Merge pull request #595 from gregory-diaz/master
Master
2016-03-04 13:36:26 -08:00
Greg
21fafffd08 reverted master.txt changes. 2016-03-04 11:14:16 -08:00
Greg
97e1fb9d23 Fixed Bug: Slicing a part with no printer selected opens up Send Feedback form. We now open a message box prompting user to select a printer before slicing. 2016-03-04 11:11:20 -08:00
Lars Brubaker
cff31ca9dd Merge remote-tracking branch 'lars/master' 2016-03-04 10:11:16 -08:00
Lars Brubaker
bd096c46d6 Making side bar plugins possible 2016-03-04 10:11:05 -08:00
Lars Brubaker
5a399d5c38 Merge pull request #594 from gregory-diaz/master
Added automated test to ensure that setting values are being passed t…
2016-03-04 08:07:20 -08:00
larsbrubaker
dafe156d11 latest agg 2016-03-04 08:05:20 -08:00
larsbrubaker
0f7e47554a Merge remote-tracking branch 'origin/1.5.1' 2016-03-04 08:03:05 -08:00
Greg
f08680e9c9 Added test to make sure Bed Temperature options are not visible while "Has Heated Bed" checkbox is unchecked 2016-03-03 17:57:14 -08:00