Commit graph

15456 commits

Author SHA1 Message Date
LarsBrubaker
ab7f2dc492 adding user dialog showing prefs to settings 2020-05-17 13:28:57 -07:00
Lars Brubaker
e9db1b52cc
Merge pull request #4750 from larsbrubaker/master
master
2020-05-16 22:57:03 -07:00
LarsBrubaker
0e3a409595 latest ms and agg 2020-05-16 22:35:42 -07:00
LarsBrubaker
c7d4d27327 tree view keyboard navigation
Making images work on printer add ons
2020-05-16 22:35:42 -07:00
Lars Brubaker
fdcb7c81ac
Merge pull request #4749 from larsbrubaker/master
master
2020-05-16 12:40:26 -07:00
LarsBrubaker
b6a10fd0fc Added messaging to leveling when not required 2020-05-16 11:47:42 -07:00
LarsBrubaker
1cd758c2c1 re-slice test can run and is passing 2020-05-16 09:31:54 -07:00
LarsBrubaker
c66d6d44db fixing tests 2020-05-16 08:34:06 -07:00
LarsBrubaker
6a8a438718 Make sure we call the action when clicked in the menu 2020-05-15 22:28:15 -07:00
LarsBrubaker
85f625a6ef better caching 2020-05-15 16:59:30 -07:00
LarsBrubaker
ab4a809885 removing warnings 2020-05-15 16:58:12 -07:00
LarsBrubaker
5f330ddb82 adding support for high res monitors (dpi awareness) 2020-05-15 16:57:45 -07:00
LarsBrubaker
9d78b15695 Better alignment of Markdown content 2020-05-14 21:58:34 -07:00
LarsBrubaker
47771e6c19 Making base more consistent with web version 2020-05-14 20:23:51 -07:00
LarsBrubaker
63d6a630a9 improving read only display 2020-05-14 20:23:51 -07:00
LarsBrubaker
b0ce706526 Better enum menu display 2020-05-14 20:23:51 -07:00
LarsBrubaker
3e99e087cf Make sure we call changed event 2020-05-14 20:23:51 -07:00
LarsBrubaker
79ba96c18b Working on Pro upgrade page
Improving mark down renderer
2020-05-14 17:19:30 -07:00
LarsBrubaker
18581597c7 Working on more enum display options
Improving image converter display
2020-05-10 19:17:48 -07:00
LarsBrubaker
ae6caba71b Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2020-05-08 11:13:37 -07:00
Lars Brubaker
1c2bc0c778
Merge pull request #4742 from larsbrubaker/master
fixing move to origin
2020-05-08 10:52:24 -07:00
Lars Brubaker
c50c57def4 fixing move to origin 2020-05-08 10:23:40 -07:00
LarsBrubaker
053d9bdb53 Making calibration wipe tower round 2020-05-07 19:01:16 -07:00
Lars Brubaker
a22c837041
Merge pull request #4741 from larsbrubaker/master
multi extruder skirt fix
2020-05-07 14:43:32 -07:00
LarsBrubaker
736a31ccd2 multi extruder skirt fix 2020-05-07 14:34:44 -07:00
Lars Brubaker
476ef0a912
Merge pull request #4740 from larsbrubaker/master
latest MS
2020-05-07 13:36:49 -07:00
LarsBrubaker
563c08520f adding in tool change for T2 & T3 2020-05-07 13:26:21 -07:00
LarsBrubaker
1cc5c19e80 latest MS 2020-05-07 12:46:55 -07:00
Lars Brubaker
296b22dc7f
Merge pull request #4739 from larsbrubaker/master
android fix
2020-05-07 12:15:12 -07:00
Lars Brubaker
a5a7c8ee83 fix android build 2020-05-07 11:24:06 -07:00
Lars Brubaker
3fb985bb31 Merge branch 'master' of https://github.com/larsbrubaker/MatterControl 2020-05-06 21:15:59 -07:00
LarsBrubaker
192afe51a7 android fix 2020-05-06 12:42:40 -07:00
Lars Brubaker
cf3eb6c1a1
Merge pull request #4738 from larsbrubaker/master
Put in per extruder fan controls
2020-05-06 10:29:12 -07:00
LarsBrubaker
2da1193185 latest MS 2020-05-06 09:56:00 -07:00
LarsBrubaker
37e6f3bd44 Put in per extruder fan controls 2020-05-05 09:28:11 -07:00
Lars Brubaker
1752aa8473
Merge pull request #4736 from larsbrubaker/master
adding in C axis
2020-05-01 08:29:03 -07:00
LarsBrubaker
7b2d95bbd9 adding in C axis 2020-05-01 08:02:58 -07:00
Lars Brubaker
d2a5f746a5
Merge pull request #4730 from larsbrubaker/master
master
2020-04-21 23:30:24 -07:00
LarsBrubaker
da450d3c5d Fixing align and align test 2020-04-21 23:19:48 -07:00
LarsBrubaker
74f1156411 fixed issue with wrong id 2020-04-21 21:57:47 -07:00
LarsBrubaker
c721a66405 Fixed the align to do the right anchor 2020-04-21 21:13:32 -07:00
Lars Brubaker
0ddd691291
Merge pull request #4728 from larsbrubaker/master
master
2020-04-12 16:47:55 -07:00
LarsBrubaker
f179b68be6 Fixing bug with exporting tool changes on Marlin
It is emitting to many T1s but we should not switch back to T0
2020-04-12 16:38:45 -07:00
LarsBrubaker
02fcf0b648 fixing warnings 2020-04-12 11:13:18 -07:00
Lars Brubaker
e7514b462d
Merge pull request #4725 from larsbrubaker/master
Add support for specifying the firmware type in the profile
2020-04-11 11:32:25 -07:00
LarsBrubaker
b19e0a7629 Add support for specifying the firmware type in the profile 2020-04-11 09:46:02 -07:00
Lars Brubaker
04583d7bf0 Maker sure we actually have a large enough array 2020-04-08 15:34:57 -07:00
Lars Brubaker
87f03798a3
Merge pull request #4722 from larsbrubaker/master
Downgrading to 4.7.1 to build on Mac
2020-04-08 12:10:48 -07:00
Lars Brubaker
bf3a8db374 Downgrading to 4.7.1 to build on Mac 2020-04-08 10:36:51 -07:00
Lars Brubaker
fa574332a1
Merge pull request #4721 from larsbrubaker/master
latest ms (version 4.7.1)
2020-04-08 09:37:03 -07:00