Lars Brubaker
|
dff01bdfd8
|
Merge branch 'master' of https://github.com/MatterHackers/MatterControl
|
2016-08-08 15:20:54 -07:00 |
|
Lars Brubaker
|
a78c017450
|
Merge pull request #1262 from larsbrubaker/master
Took out non-working slic3r setting
|
2016-08-08 14:58:03 -07:00 |
|
Lars Brubaker
|
f13432ca9a
|
improving undo and making the buttons show
|
2016-08-08 14:54:55 -07:00 |
|
Lars Brubaker
|
9f9fe17843
|
This save was already happening.
|
2016-08-08 14:53:10 -07:00 |
|
Lars Brubaker
|
870dffa6ca
|
Merge pull request #1261 from jlewin/master
Ensure preset name/ID set during import
|
2016-08-08 14:36:40 -07:00 |
|
John Lewin
|
7318810503
|
Ensure preset name/ID set during import
- MatterHackers/MatterControl#1259
|
2016-08-08 13:41:03 -07:00 |
|
Lars Brubaker
|
f01935a621
|
Merge remote-tracking branch 'lars/master'
|
2016-08-08 12:18:58 -07:00 |
|
Lars Brubaker
|
03c61aef19
|
Make sure we save leveling data when changed.
|
2016-08-08 12:14:33 -07:00 |
|
larsbrubaker
|
7a91b7b1aa
|
Spelling fix
|
2016-08-08 08:55:30 -07:00 |
|
larsbrubaker
|
eef538b7aa
|
Refactoring
|
2016-08-06 12:17:24 -07:00 |
|
larsbrubaker
|
b409f6293f
|
Fixed some alignment issues.
|
2016-08-06 12:16:54 -07:00 |
|
larsbrubaker
|
f96864e230
|
Merge remote-tracking branch 'lars/master'
|
2016-08-06 07:09:09 -07:00 |
|
Lars Brubaker
|
4025e36695
|
Merge branch 'master' of https://github.com/MatterHackers/MatterControl
|
2016-08-05 18:01:34 -07:00 |
|
Lars Brubaker
|
cc240b1ecc
|
Took out non-working slic3r setting
always try to import ini files.
|
2016-08-05 18:01:12 -07:00 |
|
Lars Brubaker
|
5dcf753cf9
|
Merge pull request #1251 from larsbrubaker/master
Added an import printer menu
|
2016-08-05 13:27:41 -07:00 |
|
Lars Brubaker
|
7c63af1035
|
latest agg
|
2016-08-05 13:16:09 -07:00 |
|
Lars Brubaker
|
6807f9c240
|
Merge branch 'master' of https://github.com/MatterHackers/MatterControl
|
2016-08-05 11:45:49 -07:00 |
|
Lars Brubaker
|
003f05b894
|
Added an import printer menu
Fixed a alignment problem with the top menus
|
2016-08-05 11:44:22 -07:00 |
|
Lars Brubaker
|
bcca31fe8f
|
Merge pull request #1248 from larsbrubaker/master
Make sure the EULA page has correct consideration for scroll bar
|
2016-08-04 18:38:27 -07:00 |
|
Lars Brubaker
|
3fa6a8904a
|
latest agg
|
2016-08-04 17:19:18 -07:00 |
|
Lars Brubaker
|
3e3b9ce68f
|
New comments
|
2016-08-04 14:46:29 -07:00 |
|
Lars Brubaker
|
100a5bb882
|
Make sure the EULA page has correct consideration for scroll bar
|
2016-08-04 14:45:50 -07:00 |
|
johnlewin
|
79d3686bca
|
Merge pull request #1246 from jlewin/master
Skip migrations if DocumentVersion missing
|
2016-08-04 09:06:06 -07:00 |
|
John Lewin
|
e29bf11631
|
Skip migrations if DocumentVersion missing
- Disable old migrations
- Issue MatterHackers/MCCentral#252
|
2016-08-04 08:57:14 -07:00 |
|
Lars Brubaker
|
c4095efb68
|
Merge pull request #1245 from larsbrubaker/master
Make sure we issue a M114 after a switch extruder
|
2016-08-03 18:03:41 -07:00 |
|
Lars Brubaker
|
0daf667be4
|
Make print resuming deposit the first extrusion just outside the part bounds.
|
2016-08-03 17:57:13 -07:00 |
|
Lars Brubaker
|
665da4b3b9
|
Merge branch 'master' of https://github.com/MatterHackers/MatterControl
|
2016-08-03 16:50:27 -07:00 |
|
Lars Brubaker
|
fe36bc3ce9
|
Make sure we pass printer name to web service
|
2016-08-03 16:49:48 -07:00 |
|
Lars Brubaker
|
3d17778cb1
|
Make sure we issue a M114 after a switch extruder
Fix issue on BCN with moving to last extruder position rather than new extruder position.
|
2016-08-03 16:49:38 -07:00 |
|
Lars Brubaker
|
1ff4b61298
|
Merge pull request #1243 from larsbrubaker/master
Making it possible to debug if an update is required
|
2016-08-03 15:37:10 -07:00 |
|
Lars Brubaker
|
d5d42d475f
|
Made the app report that an update is required if the server says it is.
|
2016-08-03 14:45:33 -07:00 |
|
Lars Brubaker
|
64b6eb0f18
|
Making it possible to debug if an update is required
|
2016-08-03 11:12:53 -07:00 |
|
Lars Brubaker
|
3edecc336d
|
Merge pull request #1241 from larsbrubaker/master
More tests passing
|
2016-08-02 10:58:34 -07:00 |
|
Lars Brubaker
|
ccdb90cb7f
|
A few more tests passing.
|
2016-08-02 09:47:26 -07:00 |
|
Lars Brubaker
|
0208c7b017
|
Merge branch 'master' of https://github.com/MatterHackers/MatterControl
|
2016-08-02 09:23:15 -07:00 |
|
Lars Brubaker
|
94db975c35
|
Merge pull request #1240 from larsbrubaker/master
Making the automation tests pass with new ui
|
2016-08-02 09:01:36 -07:00 |
|
Lars Brubaker
|
b289db007a
|
Merge branch 'master' of https://github.com/MatterHackers/MatterControl
|
2016-08-02 08:52:41 -07:00 |
|
Lars Brubaker
|
fe34077548
|
Merge pull request #1237 from unlimitedbacon/patch-1
Help text improvement
|
2016-08-01 18:57:06 -07:00 |
|
Tyler Anderson
|
cdb930b922
|
Revised improvement
|
2016-08-01 18:38:44 -07:00 |
|
Lars Brubaker
|
4fdf8ff278
|
Made another test pass
|
2016-08-01 17:48:08 -07:00 |
|
Lars Brubaker
|
dc22e6b788
|
Getting more tests to pass
Down to 7 failing tests.
|
2016-08-01 17:21:31 -07:00 |
|
Tyler Anderson
|
b9fe8485f9
|
Help text improvement
|
2016-08-01 16:27:49 -07:00 |
|
Lars Brubaker
|
472b26ac34
|
Added a edit selected utility function.
|
2016-08-01 14:22:16 -07:00 |
|
Lars Brubaker
|
1340e875d3
|
Making the add to queue automation tests work again
|
2016-08-01 13:53:28 -07:00 |
|
Lars Brubaker
|
915b31a8f4
|
Merge pull request #1234 from larsbrubaker/master
Making a function to prep MatterControl prior to runing tests.
|
2016-07-29 16:55:38 -07:00 |
|
Lars Brubaker
|
d8138ac51e
|
Making a function to prep MatterControl prior to runing tests.
Made automation tests call it.
|
2016-07-29 16:44:00 -07:00 |
|
johnlewin
|
c427edbcb1
|
Merge pull request #841 from unlimitedbacon/master
added some more infill patterns for slic3r
|
2016-07-29 15:27:24 -07:00 |
|
johnlewin
|
9511d5d6dc
|
Merge pull request #1233 from jlewin/master
Revise assembly paths
|
2016-07-29 15:22:29 -07:00 |
|
John Lewin
|
7f9605dc5c
|
Revise assembly paths
|
2016-07-29 15:21:30 -07:00 |
|
Lars Brubaker
|
fd1967a9ba
|
Merge pull request #1232 from larsbrubaker/master
Set the expected nozzle size when constructing the gcode viewer
|
2016-07-29 15:20:22 -07:00 |
|