Commit graph

253 commits

Author SHA1 Message Date
Kevin Pope
2faec9d1c0 Work on print history widget. 2014-09-24 19:14:31 -07:00
Kevin Pope
bda5ac173e More work on configuration page. 2014-09-23 16:11:06 -07:00
Kevin Pope
bdef196434 Changed main application to MVC. UI rework (Configuration Page esp. in progress). 2014-09-19 19:17:12 -07:00
Kevin Pope
e02655f847 Make controls more consistent looking. 2014-09-18 17:06:45 -07:00
Kevin Pope
73b6c8298b Added custom themed slider, added double slider. 2014-09-17 19:18:46 -07:00
larsbrubaker
390bc4451b another translation. 2014-09-11 09:55:15 -07:00
larsbrubaker
54f406a031 Make sure we can handle blank lines in Slice settings files (they have been added manually)
Put in wipe tower and wipe shield (more work on dual extrusion)
2014-09-10 10:01:13 -07:00
gregory-diaz
01f69dacb6 Changed printer name from Infinity to INF3D-SPE in the correct static data folder 2014-09-09 10:18:00 -07:00
gregory-diaz
519f96ebdd Merge remote-tracking branch 'upstream/development' into development 2014-09-09 10:03:55 -07:00
gregory-diaz
b49a398214 Changed Revolution 3D model name in static data from 'Infinity' to INF3D-SPE 2014-09-09 10:02:19 -07:00
kevinepope
9f365c51f5 Changed folder name, added base settings for r3dp 2014-09-05 17:05:52 -07:00
larsbrubaker
2ac4bed04e Merge commit '905794eaa6' into 1.1.3 2014-09-05 16:14:04 -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
60512e7667 Merge remote-tracking branch 'upstream/1.1.3' into development 2014-09-02 16:35:09 -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
larsbrubaker
c9ffc3eb98 Made fixed width and height in button factory doubles. 2014-08-30 13:28:13 -07:00
larsbrubaker
5454316591 Set the z axis speed to be right 2014-08-28 15:40:47 -07:00
larsbrubaker
e93d38ec90 Made macros disabled during pining
Made it possible to set movement speed in setting.ini
Updated orion and rostockMax settings
Made orion and rostockMax have fast manual z moment
Made some printers have the calibration box at startup
2014-08-28 12:22:57 -07:00
gregory-diaz
c02e86441a Export X3g Stuff 2014-08-27 12:02:15 -07:00
Kevin Pope
237194ed0d Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-08-27 09:35:04 -07:00
Kevin Pope
cb28044712 Change r3d driver to Rumba 2014-08-27 09:34:28 -07:00
larsbrubaker
0db380572b Put in a allow less than zero in print leveling. 2014-08-26 18:44:36 -07:00
Kevin Pope
c2721f5ef5 Added close and clear button to terminal window. Terminal window ui cleanup. 2014-08-26 18:09:23 -07:00
larsbrubaker
9e623a2f4a Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
Conflicts:
	StaticData/PrinterSettings/RoBo 3D/R1/setup.ini
	StaticData/Translations/Master.txt
2014-08-26 12:09:17 -07:00
larsbrubaker
841ea5e071 Made RoBo default to MatterSlice
Made consol draw faster
took out dead code
white space
2014-08-26 12:06:16 -07:00
Kevin Pope
9e2eb6e267 Added turkish translation. Changes to default settings. 2014-08-26 11:45:47 -07:00
Kevin Pope
1a0a03542b Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-08-20 12:57:35 -07:00
Kevin Pope
08f3b4050c Update R1 material settings. 2014-08-20 12:57:00 -07:00
larsbrubaker
765c68e02f Put in an HDL printer config 2014-08-20 12:24:55 -07:00
larsbrubaker
7d1f698141 Turning off the rooted weak event stuff 2014-08-19 11:41:13 -07:00
larsbrubaker
3771ec374f Getting the sync to print working better. 2014-08-18 16:42:04 -07:00
larsbrubaker
15de2574bf Let extra length on restart be negative. 2014-08-11 15:51:19 -07:00
larsbrubaker
430f803f38 Made the infill understand a %.
Upgraded to the latest slic3r release.
2014-08-11 15:41:38 -07:00
larsbrubaker
3911d8d14a Default to lines 2014-08-11 09:25:38 -07:00
larsbrubaker
b707c9c7ff Put in some new slice settings for matter slice.
Fixed some buttons to go onuithread
2014-08-08 17:03:00 -07:00
larsbrubaker
2af2997818 Made UpdateStatusChanged a week event.
Fixed a typo in help.
2014-08-08 10:40:01 -07:00
larsbrubaker
1a09d13a65 Fixed a beg with prntrbot simple first_layer_speed
Working to get more code compiling cross platform
2014-07-28 11:23:46 -07:00
larsbrubaker
9eddf6822b Moved SliceSettingsWidgetUiState into its own file
Fixed the edit locking during loading in 3d view.
Got the 3d views to update the bed size and shape when changed.
2014-07-26 13:43:55 -07:00
larsbrubaker
8db44f30a8 Actual final settings in consideration of the working bed size. 2014-07-24 17:59:12 -07:00
larsbrubaker
0c4c516123 Fixed the file for bed position. 2014-07-24 17:28:11 -07:00
larsbrubaker
9215d0806a Merge remote-tracking branch 'Greg/development' into development 2014-07-24 17:17:06 -07:00
larsbrubaker
349c5ab0d0 Put in the actual settings for the bed image. 2014-07-24 16:27:30 -07:00
larsbrubaker
3ffe282661 Adding in a bed image for RoBo 2014-07-24 15:47:18 -07:00
gregory-diaz
fde28c99b0 Finished reload when settings under slice settings -> printer -> general are changed and updated material presets for R1. 2014-07-24 14:11:10 -07:00
james jones
254f63e895 Made MatterSlice default to triangle infill. 2014-07-14 17:50:58 -07:00
larsbrubaker
4c846f08cb Made sure the launcher gets installed (made it a reference) 2014-07-08 18:05:20 -07:00