Lars Brubaker
|
1cf73ae7c7
|
Merge pull request #1807 from unlimitedbacon/master
Help text changes
|
2017-01-10 18:46:10 -08:00 |
|
Lars Brubaker
|
8ae25cfba2
|
Merge pull request #1812 from larsbrubaker/1.6
Give test more time
|
2017-01-10 18:16:16 -08:00 |
|
Lars Brubaker
|
9a24522c01
|
Merge branch 'master' into master
|
2017-01-10 18:10:45 -08:00 |
|
Lars Brubaker
|
e95b947862
|
Merge branch '1.6' into 1.6
|
2017-01-10 18:09:24 -08:00 |
|
Lars Brubaker
|
a0cbd00017
|
Give test more time
|
2017-01-10 18:08:46 -08:00 |
|
Lars Brubaker
|
a436035ad8
|
Merge pull request #1811 from larsbrubaker/1.6
1.6
|
2017-01-10 17:44:17 -08:00 |
|
Lars Brubaker
|
89cd8ebb3e
|
Fixed the print leveling bug
|
2017-01-10 17:30:27 -08:00 |
|
Lars Brubaker
|
83832c77e1
|
Made the emulator track and report position
Made a failing test for print leveling working
|
2017-01-10 17:20:24 -08:00 |
|
johnlewin
|
ba8903132d
|
Merge pull request #1809 from jlewin/master
Revise failing tests, bring passing tests online
|
2017-01-10 14:44:10 -08:00 |
|
johnlewin
|
c023198c1b
|
Merge pull request #1808 from larsbrubaker/1.6
1.6
|
2017-01-10 14:40:38 -08:00 |
|
Lars Brubaker
|
1923c66b43
|
Add PrinterEmulator project
|
2017-01-10 14:21:02 -08:00 |
|
Lars Brubaker
|
df4cf416d8
|
Put back in the dispose
|
2017-01-10 13:43:12 -08:00 |
|
John Lewin
|
fb4dab3f17
|
Revise failing tests, bring passing tests online
|
2017-01-10 13:43:10 -08:00 |
|
Lars Brubaker
|
21376eed4e
|
set correct target
|
2017-01-10 12:38:41 -08:00 |
|
Lars Brubaker
|
fe80c09668
|
Took out old emulator and put in a new c# one
|
2017-01-10 12:24:01 -08:00 |
|
larsbrubaker
|
f9f2d2c836
|
Porting the python emulator to c#
|
2017-01-10 08:21:11 -08:00 |
|
Tyler Anderson
|
636266c7ec
|
Help text changes
|
2017-01-09 17:58:49 -08:00 |
|
Lars Brubaker
|
447f78eeb8
|
Added translation line.
|
2017-01-09 17:37:43 -08:00 |
|
johnlewin
|
49a140eee2
|
Merge pull request #1802 from jlewin/master
Android sign in revisions
|
2017-01-06 17:29:05 -08:00 |
|
John Lewin
|
9b7f1b15de
|
Redirect to Wifi configuration page if offline
|
2017-01-06 17:18:19 -08:00 |
|
John Lewin
|
79415949c2
|
Keep Sign in/out visible after click
|
2017-01-06 16:55:24 -08:00 |
|
Lars Brubaker
|
e2090115f8
|
Merge pull request #1789 from jlewin/master
Convert only caller of LoadImageData(string, ImageBuffer) to other sig
|
2017-01-05 15:17:48 -08:00 |
|
John Lewin
|
486000023a
|
Convert only caller of LoadImageData(string, ImageBuffer) to other sig
|
2017-01-04 19:21:39 -08:00 |
|
johnlewin
|
f2ab3f7d99
|
Merge pull request #1785 from jlewin/master
Expose and use Timeout property for underlying http request, misc updates
|
2017-01-04 16:21:29 -08:00 |
|
John Lewin
|
288bc72121
|
Add intended OridinalIgnoreCase param to IndexOf call
- Ensure case insensitive string match
|
2017-01-04 16:00:22 -08:00 |
|
John Lewin
|
e3926da2ec
|
Expose and use Timeout property for underlying http request
|
2017-01-04 16:00:22 -08:00 |
|
John Lewin
|
dffcf48532
|
Collapse single use functions into callers, remove unused variable
|
2017-01-04 16:00:22 -08:00 |
|
John Lewin
|
a92e1ad724
|
Delete unused function, use TryGetValue
|
2017-01-04 16:00:22 -08:00 |
|
johnlewin
|
8b519db6c9
|
Merge pull request #1786 from larsbrubaker/master
Saving and restoring baby stepping
|
2017-01-04 15:59:55 -08:00 |
|
Lars Brubaker
|
1f6d210a9c
|
Don't present in interface.
|
2017-01-04 15:55:21 -08:00 |
|
Lars Brubaker
|
f0933631e1
|
Saving and restoring baby stepping
|
2017-01-04 15:35:38 -08:00 |
|
Lars Brubaker
|
044bd31329
|
Merge pull request #1784 from larsbrubaker/master
Added support for M83 and M82 extruder relative / absolute positioning
|
2017-01-04 15:04:56 -08:00 |
|
Lars Brubaker
|
a2cdad80f0
|
make sure the tests pass
|
2017-01-04 14:20:18 -08:00 |
|
Lars Brubaker
|
522a049cc6
|
Added support for M83 and M82 extruder relative / absolute positioning
|
2017-01-04 14:13:05 -08:00 |
|
Lars Brubaker
|
77511a3154
|
Merge pull request #1783 from larsbrubaker/master
latest agg and ms
|
2017-01-04 13:42:45 -08:00 |
|
Lars Brubaker
|
cf86446c02
|
latest agg and ms
|
2017-01-04 13:38:30 -08:00 |
|
Lars Brubaker
|
ad2dc54c1d
|
Merge pull request #1781 from jlewin/master
Use .Localize extension function
|
2017-01-04 13:36:08 -08:00 |
|
John Lewin
|
ace89e1e5a
|
Use .Localize extension function
|
2017-01-04 10:52:06 -08:00 |
|
Lars Brubaker
|
06af3e220e
|
Merge pull request #1782 from larsbrubaker/master
Expanded translation set
|
2017-01-04 10:38:43 -08:00 |
|
Lars Brubaker
|
68bab80fb2
|
Merge branch 'master' into master
|
2017-01-04 10:26:36 -08:00 |
|
Lars Brubaker
|
43d95e8486
|
Expanded translation set
Made more settings be count or mm
made more buttons translated
|
2017-01-04 10:25:19 -08:00 |
|
Lars Brubaker
|
3d17eea05b
|
Merge pull request #1779 from larsbrubaker/master
merge 1.6
|
2017-01-03 16:01:04 -08:00 |
|
Lars Brubaker
|
4fb4d3a15f
|
Merge remote-tracking branch 'origin/1.6'
# Conflicts:
# Submodules/agg-sharp
|
2017-01-03 15:22:52 -08:00 |
|
johnlewin
|
f079a17ba5
|
Merge pull request #1778 from larsbrubaker/1.6
refactoring
|
2017-01-03 13:19:24 -08:00 |
|
Lars Brubaker
|
949ee7a086
|
Merge branch '1.6' of https://github.com/larsbrubaker/MatterControl into 1.6
|
2017-01-03 13:15:12 -08:00 |
|
Lars Brubaker
|
35f4882608
|
Make sure we check for null
|
2017-01-03 13:14:21 -08:00 |
|
Lars Brubaker
|
981cb2505c
|
Merge branch '1.6' of https://github.com/MatterHackers/MatterControl into 1.6
|
2017-01-03 13:13:55 -08:00 |
|
Lars Brubaker
|
2f4a471220
|
Merge branch '1.6' into 1.6
|
2017-01-03 13:07:40 -08:00 |
|
Lars Brubaker
|
135f5b4fc1
|
refactoring
|
2017-01-03 13:05:57 -08:00 |
|
Lars Brubaker
|
c67e251b72
|
Merge pull request #1777 from larsbrubaker/1.6
put try catch around download update
|
2017-01-03 12:41:38 -08:00 |
|