Commit graph

1719 commits

Author SHA1 Message Date
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
Lars Brubaker
4b99dcf0e0 Merge pull request #281 from gregory-diaz/1.2.3
Removed printers from build who's printer profiles are not completed
2015-06-05 15:24:52 -07:00
Gregory Diaz
43391c2142 Removed printers from build who's printer profiles are not completed 2015-06-05 15:19:36 -07:00
Lars Brubaker
d16eb78b15 Good feedback about redundant naming. Eliminated a bunch of 'Settings' names. 2015-06-05 11:17:28 -07:00
Lars Brubaker
5f7c31ce57 Merge branch '1.2.3' into development 2015-06-04 12:36:36 -07:00
Gregory Diaz
3a291513be Added updated "Maker's Tool Works" printer profile 2015-06-04 10:40:44 -07:00
Gregory Diaz
ed929db757 Added a Maker's Tool Works printer profile 2015-06-04 10:36:55 -07:00
Gregory Diaz
b9cf1f6795 Changed name from MakeIt to MAKEiT 2015-06-03 14:26:23 -07:00
Gregory Diaz
834a3c435b temporary commit 2015-06-03 14:23:48 -07:00
Gregory Diaz
a6202b65ac Added the new default printer settings that MakeIt requested us to include. 2015-06-02 10:01:35 -07:00
Lars Brubaker
4fdfe1efe2 Code maid 2015-05-30 12:48:16 -07:00
Gregory Diaz
aa62be2193 committing Make it setup.ini 2015-05-29 18:16:31 -07:00
Lars Brubaker
3d43b1e9c3 Merge branch '1.2.3' into development
Conflicts:
	Submodules/agg-sharp
2015-05-29 18:15:04 -07:00
Gregory Diaz
0d8be37515 Added MakeIt to Printer Whitelist 2015-05-28 12:17:25 -07:00
Gregory Diaz
c8c7234a2b Added setup.ini and calibtration.ini to MakeIt Pro profile 2015-05-28 11:28:32 -07:00
Lars Brubaker
7d8dff4040 handle bad requests better (don't fail when connection not available)
Don't crash when writing log to protected directory.
2015-05-28 11:03:45 -07:00
larsbrubaker
ab0f591773 Changed send to share 2015-05-28 07:49:33 -07:00
larsbrubaker
d59813a407 Merge branch '1.2.3' of https://github.com/MatterHackers/MatterControl into development 2015-05-28 07:37:20 -07:00
Lars Brubaker
bfbcf227fd Making settings more consistent 2015-05-27 18:22:01 -07:00
Gregory Diaz
519fadc377 Added printer profile for MakeIt Pro 2015-05-27 18:05:22 -07:00
Gregory Diaz
9845ee82e5 Fixed bad default settings that were preventing prints from being started. 2015-05-26 18:46:15 -07:00
larsbrubaker
b7b79ba918 Deleting dead code.
Moved the queue item menu to the top
2015-05-23 18:48:00 -07:00
Lars Brubaker
61dab45d0b Put in the speeds legend
Removed unused icons
2015-05-22 15:07:48 -07:00
Lars Brubaker
4d4841adf3 Merge branch 'master' into development 2015-05-22 14:44:05 -07:00
Lars Brubaker
108dbee140 Put in a check for updates menu 2015-05-22 12:33:59 -07:00
Gregory Diaz
5f9d67422c Merge branch 'development' of https://github.com/MatterHackers/MatterControl into color_gradient_work 2015-05-21 17:44:27 -07:00
Lars Brubaker
6be1916c89 Improved the message for gcode loading error. 2015-05-21 15:09:59 -07:00
Gregory Diaz
b98120bcc1 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into color_gradient_work 2015-05-20 13:52:34 -07:00
Lars Brubaker
2a6b48b02d Make sure we pre-process our settings for all slicing engines. 2015-05-20 13:36:29 -07:00
Lars Brubaker
b1a5f4200c Made the about window always on top
made an update notification in the menu bar area
took the "about' tab off the main page
Cleaned up the checking of touchscreen
Made a new Features section for the printer settings
2015-05-20 10:55:14 -07:00
Gregory Diaz
1715dd953b Merge branch 'development' of https://github.com/MatterHackers/MatterControl into color_gradient_work 2015-05-20 09:50:55 -07:00
Gregory Diaz
b9c9db3e1c New settings for Lulzbot TAZ 5 2015-05-19 15:30:32 -07:00
Gregory Diaz
fccf908c98 Added new slice settings for the Lulzbot Mini (extruder_wipe_temp, bed_remove_part_temp start/end gcode). Settings taken from Lulzbot Cura profiles. 2015-05-19 12:46:32 -07:00
Lars Brubaker
edb7b7123d Added a connect_gcode. Gcode that is sent just after connecting to the printer. 2015-05-18 16:58:09 -07:00
Lars Brubaker
445b5728a2 Made the 'Advanced Controls' be 'Settings'
Change other tab names to support this.
Made SetTargetTemperature always run on the ui thread so it can ask for a dialog without error.
2015-05-18 14:42:01 -07:00
Gregory Diaz
885281df88 changed baud rate for Wanhao USA 2015-05-15 13:48:39 -07:00
Gregory Diaz
8456c4b128 Added profile for Wanhao USA 2015-05-15 11:01:16 -07:00
Gregory Diaz
486c0b90bf Merge branch 'development' of https://github.com/MatterHackers/MatterControl into color_gradient_work 2015-05-13 13:25:39 -07:00
johnlewin
1aa1480c65 Merge pull request #256 from creyc/patch-1
Update Printrbot Simple Metal config.ini
2015-05-13 12:14:10 -07:00
Gregory Diaz
decf4e16ff Merge branch 'development' of https://github.com/MatterHackers/MatterControl into color_gradient_work 2015-05-12 13:56:55 -07:00
creyc
32aa1033ff Update config.ini
The lower case 'y' is not properly recognized by the Marlin print controller firmware, causing a full XYZ homing to occur during the end script.  This results in the nozzle crashing into the newly printed part on the bed, as well as a collection of really nasty sounds from the printer.
2015-05-11 14:40:30 -04:00
Gregory Diaz
7bdd737ab0 top_solid_layers and bottom_solid_layers set to 1mm for all printers (requested by lars) 2015-05-08 18:04:30 -07:00
Gregory Diaz
0c276eb66b changed Printer profile casing for ROBO 3D 2015-05-08 15:47:11 -07:00
Gregory Diaz
8e41d9d32b changed capitalization for ROBO 3D manufacturer name and printer 2015-05-08 12:46:35 -07:00
Gregory Diaz
72b6bf9a21 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into color_gradient_work 2015-05-07 13:38:58 -07:00
Gregory Diaz
337e39c4c8 Added new profile for Robo3D R1 Plus 2015-05-07 11:05:08 -07:00
Lars Brubaker
f96bafd45d Latest agg 2015-05-06 17:02:11 -07:00
Lars Brubaker
43df990b60 Added many more replacement variables 2015-05-06 15:01:53 -07:00
Gregory Diaz
7e53249ff4 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into color_gradient_work 2015-05-05 09:55:53 -07:00