nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3547 commits 1 branch 0 tags 103 MiB
Commit graph

3547 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lars Brubaker
c414cf9f92 Fixing a problem with support generating an extremely complex outer perimeter. 2016-02-05 12:47:56 -08:00
johnlewin
5108720604 Merge pull request #550 from jlewin/master 
Clean up solution file
 2016-02-04 15:36:53 -08:00
John Lewin
0b64dbd226 Clean up solution file 2016-02-04 15:36:03 -08:00
Lars Brubaker
535f3f6cef Merge pull request #548 from gregory-diaz/master 
Final printer profile changes for ROBO 3D
 2016-02-04 14:11:04 -08:00
Lars Brubaker
b84e7cbf5b latest agg 2016-02-04 14:02:09 -08:00
johnlewin
d4fff4efe1 Merge pull request #549 from jlewin/master 
Revise ManufacturerNameMapping DropList support
 2016-02-04 13:07:53 -08:00
John Lewin
ac279ccbe3 Revise ManufacturerNameMapping DropList support 
- Ensure list items use the ASCII file system values
 - Use mapped Unicode manufacturer names where appropriate
 2016-02-04 12:38:24 -08:00
Gregory Diaz
2f189789c2 Final printer profile changes for ROBO 3D 2016-02-04 12:36:53 -08:00
Lars Brubaker
fb860d31f9 Merge branch '1.5.0' 
Conflicts:
	Submodules/MatterSlice
 2016-02-04 10:17:02 -08:00
Lars Brubaker
00a092d261 Make sure we always start the next extrusion at the layer height that it is supposed to be at. 
Spelling.
 2016-02-04 10:06:27 -08:00
Lars Brubaker
2b17c16b45 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 
Conflicts:
	StaticData/Translations/Master.txt
 2016-02-04 09:50:40 -08:00
Lars Brubaker
933c90d1a4 Put in a warning for having a G29 or G30 in the start gcode and having print leveling turned on. 2016-02-04 09:50:00 -08:00
larsbrubaker
2a96c584d4 Updating to corrected MS. 2016-02-04 07:58:50 -08:00
larsbrubaker
c7f3f82a3e Removed code from MS that should not be in use yet. 2016-02-04 07:55:49 -08:00
Lars Brubaker
fe9f131d94 Merge remote-tracking branch 'origin/1.5.0' 2016-02-03 16:25:02 -08:00
Lars Brubaker
f6ae70a20b Back to the 1.5 versions of agg and ms 2016-02-03 14:53:43 -08:00
Lars Brubaker
c076afa9c9 Change print level stream to only eat G29 when in print leveling. 2016-02-03 14:45:34 -08:00
Lars Brubaker
4b0a0157c7 Turn off the fan options if the printer does not have a fan 2016-02-03 12:16:48 -08:00
Lars Brubaker
573b1e361e Latest agg and ms 2016-02-03 11:30:20 -08:00
johnlewin
432932cb50 Merge pull request #547 from gregory-diaz/1.5.0 
Added printer profiles for new affiliate Tosingraf
 2016-02-03 10:44:34 -08:00
Gregory Diaz
dafef4394b Added printer profiles for new affiliate Tosingraf 2016-02-03 10:35:14 -08:00
Lars Brubaker
dd41142816 More work on mini-html widget 2016-02-02 17:49:19 -08:00
Lars Brubaker
203f35474a Compile and continue bug. Didn't check in the final code that I planned. 2016-02-02 12:10:21 -08:00
larsbrubaker
770cc6e4b1 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-02-01 23:12:33 -08:00
larsbrubaker
b0a53c5577 Did a bit of work on the mini-html parser. 2016-02-01 23:11:26 -08:00
Lars Brubaker
9a9f869c57 Merge pull request #546 from gregory-diaz/master 
Unit tests for printerwhitelist
 2016-02-01 17:54:49 -08:00
Gregory Diaz
2d42ec52e1 Added unittest for ensuring that when has_hardware_leveling = 1 we dont show the Print Leveling tab in Slice Settings and also that when has_hardware_leveling = 0 we do show Print Leveling 2016-02-01 17:20:18 -08:00
Gregory Diaz
316920638b Added unit tests to make sure sample parts are included in Sample Parts folder and that parts are flagged in settings.json on android and desktop 2016-02-01 14:33:40 -08:00
Gregory Diaz
bef405da28 Skip Configuration tests for now. Not yet finished. 2016-02-01 14:33:39 -08:00
larsbrubaker
95a3798304 latest MatterSlice 2016-02-01 07:32:04 -08:00
Lars Brubaker
5cab6649d9 Merge remote-tracking branch 'origin/1.5.0' 2016-01-29 15:25:23 -08:00
Lars Brubaker
3edee26813 Making it possible to hide control settings based on machine hardware settings. 2016-01-29 15:25:14 -08:00
johnlewin
eaebab147d Merge pull request #544 from jlewin/1.5.0 
Remove Thumbs.db
 2016-01-29 13:12:02 -08:00
John Lewin
ec1399df32 Remove Thumbs.db 2016-01-29 13:11:25 -08:00
johnlewin
6a67f7c97a Merge pull request #542 from gregory-diaz/1.5.0 
1.5.0
 2016-01-29 13:08:58 -08:00
Gregory Diaz
8a532c3a18 New ROBO material settings 2016-01-29 12:36:40 -08:00
Gregory Diaz
f4d5b7a7de Added Calibration part mappings to Settings.json 2016-01-29 11:57:32 -08:00
Gregory Diaz
82d48a8701 Merge branch '1.5.0' of https://github.com/MatterHackers/MatterControl into 1.5.0 2016-01-29 11:29:48 -08:00
johnlewin
a3e075cdd2 Merge pull request #543 from jlewin/1.5.0 
Add Ultimaker printer and MC Coin/Stand parts
 2016-01-29 11:25:35 -08:00
John Lewin
2be87c82ae Add Ultimaker printer and MC Coin/Stand parts 2016-01-29 11:24:34 -08:00
Lars Brubaker
6b2b611496 Merge branch '1.5.0' 
Conflicts:
	ControlElements/PopOutManager.cs
	StaticData/Translations/Master.txt
 2016-01-28 17:02:37 -08:00
Lars Brubaker
ee640eb665 MatterSlice and agg 1.5 2016-01-28 16:40:55 -08:00
Gregory Diaz
6acd604be5 Merge branch '1.5.0' of https://github.com/MatterHackers/MatterControl into 1.5.0 2016-01-28 15:48:08 -08:00
johnlewin
f666ec4f0c Merge pull request #541 from gregory-diaz/1.5.0 
Removed support_material_create_internal_support from most printer pr…
 2016-01-28 15:45:30 -08:00
Gregory Diaz
7f3f6ee0f4 Merge branch '1.5.0' of https://github.com/MatterHackers/MatterControl into 1.5.0 2016-01-28 15:38:32 -08:00
Gregory Diaz
721cbda1c3 Removed support_material_create_internal_support from most printer profiles. 2016-01-28 15:29:11 -08:00
johnlewin
0432ceb772 Merge pull request #540 from gregory-diaz/1.5.0 
Most recent JumpStart profile
 2016-01-28 14:43:50 -08:00
Gregory Diaz
1f54577a6b Most recent JumpStart profile 2016-01-28 14:38:04 -08:00
Lars Brubaker
a0f9227791 Merge pull request #539 from jlewin/master 
Misc. UI changes
 2016-01-28 14:04:46 -08:00
rytz
b7c93a60fd Misc. UI changes 2016-01-28 12:52:53 -08:00