Commit graph

3604 commits

Author SHA1 Message Date
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
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
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
Greg
a7d87ce6cd Added a hardware setting to show/hide marlin firmware updater. 2016-03-07 14:11:36 -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
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
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
Greg
b795b2a228 Added more material settings for IRA3D 2016-02-29 10:56:28 -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
5d6a88beb7 Merge pull request #582 from gregory-diaz/1.5.1
Added requested changes to 3DStuffmaker printer profiles
2016-02-25 17:46:25 -08:00
Greg
62161b5e4c Added requested changes to 3DStuffmaker printer profiles 2016-02-25 13:28:37 -08:00
johnlewin
a783dfec09 Merge pull request #580 from gregory-diaz/1.5.1
Added requested printer profile changes to Altair
2016-02-25 13:25:34 -08:00
Greg
15260d8f07 Added requested printer profile changes to Altair 2016-02-25 13:12:17 -08:00
Lars Brubaker
318c2e44c7 Merge pull request #578 from gregory-diaz/1.5.1
Added printer profile for IRA3D
2016-02-25 10:52:19 -08:00
Greg
6d2507370c Added printer profile for IRA3D 2016-02-25 10:17:43 -08:00
Lars Brubaker
7ca8b710a7 Merge pull request #575 from gregory-diaz/1.5.1
Added calibration.ini files to profiles that did not already have them
2016-02-24 15:57:31 -08:00
Greg
632b5dd95c Added calibration.ini files to profiles that did not already have them 2016-02-24 11:28:58 -08:00
johnlewin
1cec76d7bb Merge pull request #574 from gregory-diaz/1.5.1
Fixed broken unit tests
2016-02-24 11:21:03 -08:00
Greg
426520a52b Fixed broken unit tests 2016-02-24 11:03:23 -08:00
Lars Brubaker
6e89887203 Merge pull request #572 from gregory-diaz/1.5.1
Added requested printer profile changes from Me3D
2016-02-24 10:28:11 -08:00
Greg
2310cc0a66 Added requested printer profile changes from Me3D 2016-02-24 10:07:00 -08:00
Lars Brubaker
ace23de8fd Removed convex bridge attempt as it caused a regression. 2016-02-23 15:41:53 -08:00
johnlewin
30074fde28 Merge pull request #567 from gregory-diaz/1.5.1
Temporarily ignore test until it is refactored
2016-02-23 15:35:26 -08:00
Greg
12f4b76447 Temporarily ignore test until it is refactored 2016-02-23 15:15:39 -08:00
Lars Brubaker
a93b993b75 Don't crash when FORCE_SOFTWARE_RENDERING 2016-02-23 11:35:51 -08:00
Lars Brubaker
7dc03336dc Merge pull request #564 from gregory-diaz/1.5.1
1.5.1
2016-02-22 13:25:27 -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
ecb9476f2a Cherry picked the support extruder settings fix. 2016-02-18 17:07:16 -08:00
Lars Brubaker
1804e01fec Default SeeMe to having interface layers. 2016-02-17 15:13:26 -08:00
Lars Brubaker
7da7970d1a Keep the old SelectedValue goal.
Spelling
2016-02-12 16:55:18 -08:00
Lars Brubaker
1727beb7b8 Made the add to queue button work again. 2016-02-12 15:10:23 -08:00
Lars Brubaker
cda645d03d Made Marlin EEProm have import and export 2016-02-12 10:26:40 -08:00
Lars Brubaker
9d5c9c0181 New Import and Export for RepetierEeprom Window. 2016-02-12 09:30:24 -08:00
johnlewin
ba01f22dc5 Merge pull request #554 from jlewin/master
Revise waitForOK logic for Repetier
2016-02-11 16:33:12 -08:00
John Lewin
b12bb0f6ac Revise waitForOK logic for Repetier 2016-02-11 16:32:05 -08:00
johnlewin
879914a73c Merge pull request #553 from jlewin/master
Fix NotImplementedException during slicing
2016-02-11 15:55:33 -08:00
John Lewin
5d7a066464 Fix NotImplementedException during slicing
- Ensure invalid extensions don't make it into the queue
 - Ignore invalid extensions when slicing
2016-02-11 15:54:01 -08:00
Lars Brubaker
133764fa3b Fixed the white spacing collapse in the HtmlWidget. 2016-02-11 15:38:32 -08:00
Lars Brubaker
426cd4d74a Comment update 2016-02-11 15:26:14 -08:00
Lars Brubaker
2732d73e3f Don't add polygons to perimeters to check if they have no points.
Make sure we check if we found a point to start on or not.
2016-02-10 16:56:36 -08:00
Lars Brubaker
72b4a1f8d2 Merge branch '1.5.0' 2016-02-10 14:03:09 -08:00
Lars Brubaker
775f057863 Put back in support angle. 2016-02-10 13:19:48 -08:00
Lars Brubaker
9ed2949a96 Put back in support angle. 2016-02-10 13:19:31 -08:00
johnlewin
69b9fc0e27 Merge pull request #552 from jlewin/master
Latest MS - optimized insets
2016-02-10 12:48:32 -08:00
John Lewin
1a078dc50f Latest MS - optimized insets 2016-02-10 12:47:50 -08:00