larsbrubaker c5f88756f2 Merge remote-tracking branch 'Greg/development' into development ... Conflicts: StaticData/PrinterSettings/Printrbot/Simple Metal/config.ini StaticData/PrinterSettings/Printrbot/Simple Metal/setup.ini		2014-07-02 16:30:26 -07:00
..
material	Adding some printer profiles.	2014-07-02 13:32:13 -07:00
quality	Adding some printer profiles.	2014-07-02 13:32:13 -07:00
config.ini	Edited strings in Taz 4 slice files. Also changed config files so that parts can be sliced in MatterSlice and CuraEngine.	2014-07-02 16:23:59 -07:00
setup.ini	Added TAZ 4 Printer Profiles	2014-07-02 14:01:39 -07:00