Commit graph

59 commits

Author SHA1 Message Date
Lars Brubaker
6cc61c53d0 Don't set new printer name to current printer
If no white list is set than do not filter
Make default MC white list be none
2016-06-07 17:39:17 -07:00
John Lewin
4fd2eee3c7 Merge remote-tracking branch 'origin/1.5.3'
# Conflicts:
#	PrinterCommunication/Io/WaitForTempStream.cs
2016-05-19 18:03:57 -07:00
Greg
287bcc2a73 Added BCN to printer white list 2016-05-13 17:42:04 -07:00
Lars Brubaker
4bb141339e Merge branch '1.5.2'
Conflicts:
	ApplicationView/MenuRow/MenuOptionSettings.cs
	StaticData/Translations/Master.txt
2016-04-14 15:42:42 -07:00
Greg
05f5136e0d Temporary hack to make sure that the T7 stand is included in preloaded library parts 2016-03-29 11:41:02 -07:00
John Lewin
71540ef149 Remove invalid SamplePart 2016-03-18 11:55:55 -07:00
Lars Brubaker
594065dc5f Merge remote-tracking branch 'origin/1.5.1' 2016-03-17 11:46:00 -07:00
Greg
564b1d38fb Added t -10 stand to sample parts folder. 2016-03-17 10:10:46 -07:00
rytz
13b51efe53 Changing copyright to 2016 2016-03-07 17:27:51 -08:00
John Lewin
ec1399df32 Remove Thumbs.db 2016-01-29 13:11:25 -08:00
Gregory Diaz
f4d5b7a7de Added Calibration part mappings to Settings.json 2016-01-29 11:57:32 -08:00
John Lewin
2be87c82ae Add Ultimaker printer and MC Coin/Stand parts 2016-01-29 11:24:34 -08:00
Gregory Diaz
13d4e733b5 Added JumpStart to printer profiles and printer whitelist 2016-01-14 11:46:25 -08:00
Gregory Diaz
ce6f60efe3 Printer profile changes and Wanhao manufacturer name change 2015-11-24 14:40:05 -08:00
Gregory Diaz
8f6ecbc1fe Added logic to show manufacturer names with utf characters 2015-11-02 17:54:42 -08:00
Lars Brubaker
eb8fb01c0d Merge pull request #434 from gregory-diaz/1.4.1PrinterProfiles
Added new profiles for gCreate and Wanhao USA and also added them to …
2015-10-29 13:36:40 -07:00
Gregory Diaz
5aa6e9fd50 Added new profiles for gCreate and Wanhao USA and also added them to the printer whitelist 2015-10-29 13:22:13 -07:00
Gregory Diaz
606a6ab9c5 Added name changes to Esagono Manufacturer name in printer settings and on the printer whitelist. Also added workaround for sqlite queries containing unicode characters. 2015-10-29 12:02:51 -07:00
Gregory Diaz
30bf420b33 Added missing comma to after Maker Tool Work's 2015-08-05 11:54:47 -07:00
Gregory Diaz
bfc96f08e9 Addded Maker's Tool Works to printer white list 2015-08-04 15:02:03 -07:00
Lars Brubaker
c12e8ee1a3 Put in new icons for library
Moved classes to their own file
2015-07-24 14:00:27 -07:00
Matt Moening
013d752988 Added FlashForge Creator as a printer 2015-07-01 16:13:42 -07:00
larsbrubaker
219b14aaf4 Merge branch '1.2.3' into development 2015-06-06 07:44:47 -07:00
Lars Brubaker
6a28094c1b Working on support for MakerBot printers. 2015-06-05 17:20:30 -07:00
Gregory Diaz
43391c2142 Removed printers from build who's printer profiles are not completed 2015-06-05 15:19:36 -07:00
Gregory Diaz
834a3c435b temporary commit 2015-06-03 14:23:48 -07:00
Gregory Diaz
0d8be37515 Added MakeIt to Printer Whitelist 2015-05-28 12:17:25 -07:00
Gregory Diaz
8456c4b128 Added profile for Wanhao USA 2015-05-15 11:01:16 -07:00
Gregory Diaz
8e41d9d32b changed capitalization for ROBO 3D manufacturer name and printer 2015-05-08 12:46:35 -07:00
Gregory Diaz
1391faad19 added MakerGear to printer white list 2015-03-30 16:39:53 -07:00
Lars Brubaker
72df74d8e4 Put in profiles for Leapfrog 2015-02-27 11:09:37 -08:00
Lars Brubaker
3adcc65b9a Put back in the M115 on start up as that shows us the firmware settings. 2015-01-23 15:41:48 -08:00
Lars Brubaker
6c7acb6223 Put in the correct oem white list
Fixed a bug in the 3D Factory / MendelMax 1.5 settings
2015-01-22 10:22:09 -08:00
Kevin Pope
8b912669ba Fix the calibration box positioning. 2015-01-13 12:31:54 -08:00
Lars Brubaker
bc30ddca05 Added a profile for PrintSpace Altair
Better handling of bad setup.ini files
2015-01-07 11:21:25 -08:00
Lars Brubaker
ae98ebf478 Added open beam. 2014-12-20 13:59:17 -08:00
Lars Brubaker
3c41775a54 Making the Standard and Advanced ui control work and be available. 2014-12-11 17:35:57 -08:00
Lars Brubaker
a54a59e25f Putting a menu to switch view settings.
Made the trace data build faster.
Made ungroup understand mesh collections better
Made the slice settings layer index be an enum so it is clearer what is being accessed
Put menu items into separate files
2014-12-09 15:16:08 -08:00
Lars Brubaker
de0070eb35 Some working on streamlining the ui and creating a new 'simple' mode. 2014-12-08 18:18:38 -08:00
gregory-diaz
34f5edfee0 Cleaned up Static Data removed the extra Revolution3D Profile, and corrected the spelling of Velleman in printer white list 2014-10-09 11:16:42 -07:00
gregory-diaz
dd0a63dd77 Merge remote-tracking branch 'upstream/development' into development 2014-09-05 15:26:33 -07:00
gregory-diaz
905794eaa6 Added new material and quality presets for Revolution 3d 2014-09-05 15:25:59 -07:00
Kevin Pope
0b8e4fc092 Fix whitelisted makes. 2014-09-03 17:32:38 -07:00
gregory-diaz
c907b98560 Changing default watermark image back to the MatterControl logo(set the wrong one in previous commit). 2014-09-02 16:39:10 -07:00
gregory-diaz
ce67d6e004 Added Printer and Slice Setting information for Me3D and Revolution 3D 2014-09-02 16:33:17 -07:00
gregory-diaz
be348cedc2 Edited OEMSettings.json file to include Me3D and Revolution 3D 2014-09-02 16:30:11 -07:00
Kevin Pope
f480785e6e Reverse non-general change to vanilla settings. 2014-06-10 19:40:50 -07:00
larsbrubaker
bee3d2e716 RoBo needs to check for updates. 2014-06-10 14:34:58 -07:00
larsbrubaker
06acb1311b Don't remove the item being printed no matter what.
Hide the air gap on slic3r
Put in Vellerman printer
2014-05-22 15:23:40 -07:00
larsbrubaker
b6868b2a40 Addintg in 3D Stuffmaker 2014-05-16 11:31:04 -07:00