Commit graph

885 commits

Author SHA1 Message Date
larsbrubaker
11488ac4a0 Merge remote-tracking branch 'origin/1.5.1' 2016-03-13 22:30:18 -07:00
larsbrubaker
e7e4c1cc45 Fixed the engraving settings to work better 2016-03-13 22:26:41 -07: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
gregory-diaz
30098c3eca Fixed material presets name for 3d stuffmaker 2016-03-11 16:12:56 -08:00
gregory-diaz
10cc2c89d3 final changes for IRA3D 2016-03-11 16:01:26 -08:00
gregory-diaz
a66f1baa3d Added final changes from me3d 2016-03-11 15:11:33 -08:00
Greg
3b8ee5d18b Start/End gcode changes from IRA3D 2016-03-11 11:07:32 -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
Greg
f1d124f30a Added profile changes for Jumpstart 2016-03-10 15:46:24 -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
Greg
72085fb992 Added start/end gcode as requested by ME3D 2016-03-09 10:33:14 -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
rytz
13b51efe53 Changing copyright to 2016 2016-03-07 17:27:51 -08:00
Lars Brubaker
cd5a4ab5e5 Merge remote-tracking branch 'origin/1.5.1' 2016-03-07 15:38:37 -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
Greg
a7d87ce6cd Added a hardware setting to show/hide marlin firmware updater. 2016-03-07 14:11:36 -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
larsbrubaker
0f7e47554a Merge remote-tracking branch 'origin/1.5.1' 2016-03-04 08:03:05 -08:00
johnlewin
b9968d0052 Merge pull request #593 from gregory-diaz/1.5.1
Added new quality settings sent by IRA3D.
2016-03-03 13:47:55 -08:00
Greg
54c321dc8f Added new quality settings sent by IRA3D. 2016-03-03 10:50:11 -08:00
Lars Brubaker
570cd97e4a Only try to print for extruders that have content on a layer 2016-03-02 11:08:43 -08:00
Lars Brubaker
7a4c2dab90 Merge remote-tracking branch 'origin/1.5.1' 2016-03-01 17:44:11 -08:00
johnlewin
e429f12ab9 Merge pull request #587 from gregory-diaz/1.5.1
removed unicode characters from 3DStuffmaker material settings
2016-03-01 11:42:21 -08:00
Greg
beb4b50e02 removed unicode characters from 3DStuffmaker material settings 2016-03-01 11:38:46 -08:00
Lars Brubaker
a5a76f9677 Merge remote-tracking branch 'origin/1.5.1' 2016-02-29 16:41:38 -08:00
Lars Brubaker
e4760ab602 Merge pull request #584 from gregory-diaz/1.5.1
Added more material settings for IRA3D
2016-02-29 14:31:38 -08:00
Lars Brubaker
5197d1f62c Put in undo redo buttons
Put in more undo
2016-02-29 10:59:30 -08:00
Greg
b795b2a228 Added more material settings for IRA3D 2016-02-29 10:56:28 -08:00
Lars Brubaker
770f1318ec Merge branch '1.5.1' 2016-02-26 16:52:10 -08:00
Lars Brubaker
a8380a2856 Made jump start have better default queue, correct on connect gcode and start gcode
Don't crash on close enter share code when not logged in
Fixed jump start pla settings.
2016-02-26 14:40:20 -08:00
Lars Brubaker
abd480d9b9 Moving to single transform matrix for MeshGroups 2016-02-26 14:19:52 -08:00
Lars Brubaker
384fc25559 Merge remote-tracking branch 'origin/1.5.1' 2016-02-25 17:53:21 -08:00
Greg
62161b5e4c Added requested changes to 3DStuffmaker printer profiles 2016-02-25 13:28:37 -08:00
Greg
15260d8f07 Added requested printer profile changes to Altair 2016-02-25 13:12:17 -08:00
Lars Brubaker
6491718be4 Merge pull request #577 from rytz/master
Adding config.ini and calibration.ini to Ultimaker 2+ and 2 Extended+
2016-02-25 10:51:49 -08:00
Greg
6d2507370c Added printer profile for IRA3D 2016-02-25 10:17:43 -08:00
larsbrubaker
ef445cbb53 Added GetBottomCorners function 2016-02-25 08:13:06 -08:00
rytz
e7980c5815 Adding config.ini and calibration.ini to Ultimaker 2+ and 2 Extended+ 2016-02-24 17:03:19 -08:00
rytz
e24daf052d Help text changes and adding a User Manual link to the HELP menu 2016-02-24 16:58:28 -08:00
Lars Brubaker
f6060939dd Merge remote-tracking branch 'origin/1.5.1' 2016-02-24 12:31:39 -08:00
Greg
632b5dd95c Added calibration.ini files to profiles that did not already have them 2016-02-24 11:28:58 -08:00
Greg
2310cc0a66 Added requested printer profile changes from Me3D 2016-02-24 10:07:00 -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
Greg
bd840e968c Removed accidentally committed profile 2016-02-22 13:11:48 -08:00