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

5808 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lars Brubaker
aa0127cc71 Merge pull request #1743 from larsbrubaker/1.6 
Make sure we turn off print leveling as we are recovering.
 2016-12-20 17:43:04 -08:00
Lars Brubaker
91b6d98e82 Make sure we turn off print leveling as we are recovering. 2016-12-20 17:23:52 -08:00
Lars Brubaker
98668a9b22 Merge pull request #1742 from larsbrubaker/1.6 
1.6
 2016-12-20 17:12:27 -08:00
Lars Brubaker
4266851eef Made this test faster 2016-12-20 17:08:59 -08:00
Lars Brubaker
ddc06594c9 Merge remote-tracking branch 'origin/master' into 1.6 2016-12-20 16:18:45 -08:00
Lars Brubaker
7bf5731241 Merge pull request #1736 from unlimitedbacon/fileerrors 
Show error messages when exporting files fails
 2016-12-20 15:48:04 -08:00
Lars Brubaker
5096bc67b0 Merge branch 'master' into fileerrors 2016-12-20 15:40:54 -08:00
Lars Brubaker
15461b25ee Merge pull request #1722 from unlimitedbacon/master 
Added detection for Rostock hardware leveling errors
 2016-12-20 15:40:41 -08:00
Lars Brubaker
5305fc01b5 Merge pull request #1741 from larsbrubaker/1.6 
1.6
 2016-12-20 15:11:54 -08:00
Lars Brubaker
8ea6eb099d latest agg 2016-12-20 15:07:28 -08:00
Lars Brubaker
c9ad1fe0f1 Merge branch '1.6' of https://github.com/MatterHackers/MatterControl into 1.6 2016-12-20 15:04:57 -08:00
johnlewin
38605a4d56 Merge pull request #1740 from jlewin/1.6 
Revise failing queue tests on slow VMs
 2016-12-20 15:04:55 -08:00
Lars Brubaker
6cf685a1b4 Adding new translations 
Added G92 to commands that get passed through to the printer
 2016-12-20 14:43:55 -08:00
John Lewin
56f1ab247e Revise failing queue tests on slow VMs 
- Use Assert.AreEqual
- Add failure messages
- Extend ClickByName and WaitForName durations
- Restore 500ms waits in NavigateToFolder
 2016-12-20 13:58:36 -08:00
johnlewin
e43a72cec6 Merge pull request #1739 from jlewin/1.6 
Add LayerGCodeHasExpectedValue test
 2016-12-20 11:51:24 -08:00
John Lewin
b457876e5e Fix invalid 'layer_gcode' values 2016-12-20 10:45:32 -08:00
John Lewin
e83c5e7388 Add LayerGCodeHasExpectedValue test 
- Immutable PrinterSettings.BaseLayer
- Add PrinterSettings.AutoSave flag to support disabling autosave
  - Save to default path fails under test
- Add PrinterSettings.Save(path) to support manual save
- Migrate 'active_quality_key' to SettingsKey class
 2016-12-20 10:45:32 -08:00
Lars Brubaker
353df4331b Merge pull request #1738 from larsbrubaker/1.6 
1.6
 2016-12-20 10:12:47 -08:00
Lars Brubaker
648f066582 Get the under menu not to open hover effect. 2016-12-20 09:46:43 -08:00
Lars Brubaker
9732594728 Merge branch '1.6' of https://github.com/MatterHackers/MatterControl into 1.6 2016-12-20 09:24:31 -08:00
johnlewin
491c2afba1 Merge pull request #1737 from jlewin/1.6 
Latest Profiles
 2016-12-20 09:22:51 -08:00
Lars Brubaker
3ffdf9726f latest agg and ms 2016-12-19 18:04:43 -08:00
John Lewin
27f6db7823 Add PLA density to Lepton 2, remove stringent OemProfile tests 2016-12-19 17:21:11 -08:00
Matt Moening
9f2615c5e4 Latest Profiles 2016-12-19 14:20:11 -08:00
Lars Brubaker
d34f916400 Merge branch '1.6' of https://github.com/MatterHackers/MatterControl into 1.6 2016-12-19 10:07:47 -08:00
Lars Brubaker
ada8c2af6a more translations 2016-12-16 16:33:22 -08:00
Lars Brubaker
b4deffa944 More localizations 2016-12-16 15:25:00 -08:00
Lars Brubaker
3ae1327741 Merge pull request #1734 from larsbrubaker/1.6 
Wrote a test to validate that we remove the last queue item correctly
 2016-12-15 17:58:43 -08:00
Lars Brubaker
56bd301624 Wrote a test to validate that we remove the last queue item correctly 
This is to test a regression that was fixed today.
 2016-12-15 17:54:42 -08:00
Lars Brubaker
79723a7522 Merge pull request #1733 from larsbrubaker/1.6 
1.6
 2016-12-15 16:39:46 -08:00
Lars Brubaker
11e92e20fc Edit and compile missed saving. 2016-12-15 16:26:20 -08:00
Lars Brubaker
ab34d92077 Merge remote-tracking branch 'origin/1.6' into 1.6 2016-12-15 16:17:19 -08:00
Lars Brubaker
8c827d6160 Merge pull request #1732 from larsbrubaker/1.6 
latest agg
 2016-12-15 16:05:52 -08:00
Lars Brubaker
c6156504f6 Merge branch 'master' into 1.6 2016-12-15 16:00:05 -08:00
Lars Brubaker
73eaeda6f3 latest agg 2016-12-15 15:57:45 -08:00
Lars Brubaker
16b6b80922 Make sure we always have valid selection. 2016-12-15 15:55:26 -08:00
Lars Brubaker
765350403a Latest agg 2016-12-15 15:34:13 -08:00
Lars Brubaker
3e5a92d0bb Merge branch '1.6' 2016-12-15 15:32:34 -08:00
Lars Brubaker
de1b14e652 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-12-15 15:30:30 -08:00
Lars Brubaker
575369ba2f Merge branch 'master' into master 2016-12-15 15:11:24 -08:00
Lars Brubaker
ed4f94831f Merge pull request #1731 from unlimitedbacon/guidelines 
Added contribution guidelines
 2016-12-15 14:34:41 -08:00
Tyler Anderson
551a14c57a Added contribution guidelines 2016-12-14 18:09:58 -08:00
johnlewin
923311192b Merge pull request #1730 from jlewin/1.6 
Improve startup state initialization
 2016-12-14 17:23:27 -08:00
John Lewin
a566e745f2 Fix build breaks 
- Default ActivePrinterSettings.Instance to EmptyProfile
- Clean up assignment code
- Move EmptyProfile to PrinterSettings
 2016-12-14 17:19:19 -08:00
Tyler Anderson
f6037afa78 Switched to ReadLineStartCallBacks 2016-12-14 16:26:46 -08:00
John Lewin
836dcee8b8 Improve startup state initialization 
- Use single instance for .EmptyProfile
- Remove ActiveSliceSettings static constructor, rely on ProfileManager
- Remove SettingsKey.active_theme_name and db usage
- Revise LoadUITheme to only load oem or default color theme
- Only assign ActiveSliceSettings.Instance during ProfileManager assign
 2016-12-14 16:18:54 -08:00
Lars Brubaker
603b6c5949 Merge pull request #1729 from larsbrubaker/1.6 
1.6
 2016-12-14 16:02:02 -08:00
Lars Brubaker
bf62f92420 Fixed resend to work on smoothie 
MatterHackers/MatterControl#1700
Not sending resends to Smoothieware
 2016-12-14 15:03:37 -08:00
Tyler Anderson
dae087f87f Show error messages when exporting files fails 2016-12-14 12:45:56 -08:00
Lars Brubaker
c4c864a409 Rebuild ui if leveling solution changes 
MatterHackers/MCCentral#589
Changing leveling solution needs to call reload all or similar to refresh for "Finish Setup"
 2016-12-14 11:53:32 -08:00