Commit graph

902 commits

Author SHA1 Message Date
Lars Brubaker
09aaa2b046 Merge remote-tracking branch 'origin/1.5.1' 2016-03-18 13:53:26 -07:00
Lars Brubaker
774d768e8d Merge remote-tracking branch 'origin/1.5.1' 2016-03-18 12:03:05 -07:00
Greg
65a6bc01f4 WIP StaticData changes IRA3D 2016-03-18 11:54:19 -07:00
Greg
afa5d49e5a Added final changes to IRA3D 2016-03-18 10:41:06 -07:00
Lars Brubaker
fd1f2270c3 Merge remote-tracking branch 'origin/1.5.1'
Conflicts:
	StaticData/PrinterSettings/IRA3D/Poetry Infinity/config.ini
2016-03-18 10:39:06 -07:00
Greg
4559d7e24c Added final printer profile settings for IRA3D 2016-03-17 16:36:43 -07:00
Lars Brubaker
08e0fae0ca Make sure engraver has correct size on layer 0. 2016-03-17 14:25:01 -07:00
Lars Brubaker
594065dc5f Merge remote-tracking branch 'origin/1.5.1' 2016-03-17 11:46:00 -07:00
Lars Brubaker
fd0c37ef29 Merge remote-tracking branch 'origin/master' 2016-03-17 11:45:52 -07:00
Lars Brubaker
68d14ac6e4 Merge remote-tracking branch 'origin/1.5.1'
Conflicts:
	StaticData/PrinterSettings/Tosingraf/Cover Engraving/config.ini
2016-03-17 10:37:55 -07:00
rytz
9607339ee5 fixing incorrect Ultimaker start G-Code 2016-03-17 10:13:19 -07:00
Greg
564b1d38fb Added t -10 stand to sample parts folder. 2016-03-17 10:10:46 -07:00
Greg
16f5254f8d Added final quality settings changes to IRA3D 2016-03-16 11:53:43 -07:00
John Lewin
1f42c05a20 Remove empty layer_gcode overrides 2016-03-15 13:55:41 -07:00
Greg
f47efeea03 Final start_gcode fix for IRA3D Poetry Infinity 2016-03-14 15:15:45 -07:00
Greg
0b5839d653 Changed default infill type from Triangles to Lines 2016-03-14 13:07:34 -07:00
larsbrubaker
cf766a68b9 Fixed the engraving settings to work better 2016-03-14 11:20:19 -07:00
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