Commit graph

1719 commits

Author SHA1 Message Date
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
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
3173d056c6 Snapping is finally working well. 2016-02-20 09:17:25 -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
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
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
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
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
3142b80514 Putting in a Snap Grid menu. 2016-02-14 17:53:44 -08:00
larsbrubaker
e594fb3dfa Created a new merge option in the queue menu
Made Arrange part of the plating helper
2016-02-14 08:41:50 -08:00