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

2243 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lars Brubaker
df4ef47f4f Merge pull request #271 from gregory-diaz/development 
Added setup.ini and calibtration.ini to MakeIt Pro profile
 2015-05-28 11:42:45 -07:00
Gregory Diaz
c8c7234a2b Added setup.ini and calibtration.ini to MakeIt Pro profile 2015-05-28 11:28:32 -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
8b3252ff24 Merge pull request #270 from gregory-diaz/development 
Added printer profile for MakeIt Pro
 2015-05-27 20:46:57 -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
Lars Brubaker
433957c3d1 Made the menu better. 2015-05-27 12:11:15 -07:00
Lars Brubaker
fb37046e8c Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2015-05-26 18:47:49 -07:00
Lars Brubaker
39f7a4d4e7 Merge pull request #269 from gregory-diaz/development 
Fixed bad default settings that were preventing prints from being sta…
 2015-05-26 18:47: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
Lars Brubaker
76c8e64c77 Made the action menus have a bit more clarity. 2015-05-26 18:28:57 -07:00
Lars Brubaker
4428a4c431 If there is an error loading an AMF for slicing don't try and use it. 2015-05-26 17:07:55 -07:00
Lars Brubaker
460d651b1d Fixed a bug where we were making too many copies of the trace data. 2015-05-26 16:25:23 -07:00
Lars Brubaker
770c783a13 Set the toggle switch text color. 2015-05-26 11:59:56 -07:00
Lars Brubaker
262d7f0cd2 Move the remove all to the right place. 2015-05-26 11:05:51 -07:00
Lars Brubaker
4b7f374ea4 Made the add button consistent. 
Put in a remove all on android.
 2015-05-26 11:03:58 -07:00
Lars Brubaker
a600fb7d57 Made the speed legend format better 
Changed printing to settings
Re-arranged the edit menus for clarity.
 2015-05-26 10:51:43 -07:00
larsbrubaker
859c51d3e5 Some more work on perspective rendering. 2015-05-25 18:27:16 -07:00
larsbrubaker
238a3da5c2 Made the library list have a top edit menu. 2015-05-25 07:33:36 -07:00
larsbrubaker
3af8d24733 Make sure we start out with no selection. 2015-05-24 16:13:47 -07:00
larsbrubaker
c690c5cc42 Finished the 'Item' menu. 
Made localized version resize the Edit element correctly.
 2015-05-24 09:09:42 -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
2dde40817a Creating a quick menu for the queue items. 2015-05-22 18:15:35 -07:00
Lars Brubaker
52a9df7237 Better text color 2015-05-22 16:11:52 -07:00
Lars Brubaker
dd0cc0e4ea Merge pull request #267 from jlewin/development 
Swap reporting from Insights to Raygun
 2015-05-22 15:37:58 -07:00
John Lewin
155500710a Add Raygun reporting 2015-05-22 15:21:38 -07:00
John Lewin
caec1c16ee Remove Insights 2015-05-22 15:20:58 -07:00
John Lewin
09b00041ec Correct invalid key 2015-05-22 15:20:57 -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
31046b87f9 Make sure we have a selection when leaving edit mode. 2015-05-22 13:53:36 -07:00
Lars Brubaker
8ae461c914 Don't localize dashes. 2015-05-22 12:36:07 -07:00
Lars Brubaker
108dbee140 Put in a check for updates menu 2015-05-22 12:33:59 -07:00
Lars Brubaker
1f1ec9f701 Made the behavior of the 3d view match more closely the results of the gcode view in regards to the center_on_bed option. 2015-05-22 11:11:32 -07:00
Lars Brubaker
570fe3a3ee Make the 'install update' from the windowed about page still close MC> 2015-05-22 10:45:32 -07:00
Lars Brubaker
0bff2e3736 Merge pull request #266 from gregory-diaz/color_gradient_work 
Color gradient work
 2015-05-21 17:56:21 -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
Gregory Diaz
aaebec291c Added completed Color Gradient Widget. 2015-05-21 17:44:09 -07:00
Lars Brubaker
1395676fe4 Merge pull request #265 from gregory-diaz/development 
Fixed Add to Library bug where print item was getting added to UI but…
 2015-05-21 16:53:50 -07:00
Gregory Diaz
851f42e8a5 Fixed Add to Library bug where print item was getting added to UI but not being committed to the database. 2015-05-21 16:36:25 -07:00
Lars Brubaker
707c983e0a Made sure that canceling while pause actually finishes the printing of the cancel code (that it works as expected). 2015-05-21 16:34:30 -07:00
Lars Brubaker
6be1916c89 Improved the message for gcode loading error. 2015-05-21 15:09:59 -07:00
Gregory Diaz
3fd4bc010b Merge branch 'development' of https://github.com/MatterHackers/MatterControl into color_gradient_work 2015-05-21 13:12:31 -07:00
Gregory Diaz
7da75a81d0 Took out regular expression logic 2015-05-21 13:12:19 -07:00
Lars Brubaker
0f2cb51756 latest agg 2015-05-20 17:35:24 -07:00
Lars Brubaker
51610abeff Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2015-05-20 17:35:00 -07:00
Lars Brubaker
703021620d Made a base class for the menus 
Made more shared code for them
 2015-05-20 17:34:55 -07:00
johnlewin
ef1be8cf4a Merge pull request #263 from jlewin/development 
Insights integration
 2015-05-20 17:10:29 -07:00
John Lewin
07ff0fc5cc Insights integration 2015-05-20 17:08:02 -07:00