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

4898 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Lewin
72deb94de3 Better convey that ChangeID expects a deviceToken param 
- Avoid recovery - use PrinterSettings.LoadFile rather than ProfileManager.LoadProfile
 2016-08-12 13:29:22 -07:00
Lars Brubaker
893b9db70e Merge pull request #1283 from tellingmachine/master 
Don't call uninitialized action.
 2016-08-12 11:47:44 -07:00
tellingmachine
b96ff64a4e Don't call uninitialized action. 
This action gets set by code that is part of CloudServices and not part of the common code.
 2016-08-12 11:27:40 -07:00
Lars Brubaker
9a8a4b0718 Merge pull request #1281 from larsbrubaker/master 
Fixing the drop menu to hold the pencil on the left
 2016-08-11 17:32:20 -07:00
Lars Brubaker
db86e2fe0f Fixing the drop menu to hold the pencil on the left 
issue #1279
 2016-08-11 17:18:32 -07:00
Lars Brubaker
dd09f3dd25 Merge pull request #1277 from larsbrubaker/master 
Defaulted resume failed print to off
 2016-08-11 16:38:45 -07:00
Lars Brubaker
35d9c1496f Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-08-11 16:15:30 -07:00
Lars Brubaker
592a3c4959 Merge pull request #1276 from mmoening/master 
Fixed import to not rely on layer_height validation
 2016-08-11 16:15:30 -07:00
Lars Brubaker
0511859f83 merge 2016-08-11 16:12:39 -07:00
Lars Brubaker
261b613689 Made resume failed print able to be turned on and off 
Made show if set have an & operator
Made a new test for parsing the show if set parameter
 2016-08-11 16:09:45 -07:00
Matt Moening
5b42eac301 Fixed import to not rely on layer_height validation 
- Import preset no longer checks for slicer and will validate import on weather or not any settigns were valid
 - calling Import from MenuOptionFIle will cause the same error message as importing a printer form the settings import page
 - Import to new printer now attempts to load values and validates success on importing a valid setting
 2016-08-11 14:59:33 -07:00
johnlewin
89f12946a4 Merge pull request #1273 from mmoening/master 
Importing a printer/settings from a file will now  notify the user if the file contains no valid user settings
 2016-08-11 13:21:53 -07:00
Matt Moening
5b8ff5cd29 Changed TryGetValue to ContainsKey for clarity 2016-08-11 13:01:34 -07:00
Matt Moening
bdf3e8f2a5 Importing a printer/settings from a file will now notify the user if the file contains no valid user settings 
- ImportFomEisting now returns a bool of whether or not it succeeded
 - PrinterSettings now has a Contains method
 - merging or importing quality/material settings check to make sure at least one setting was importable and notifies user if not
 2016-08-10 16:39:08 -07:00
Lars Brubaker
c78be029c6 Merge pull request #1271 from larsbrubaker/master 
Made a common static load of the mono spaced font
 2016-08-10 15:45:26 -07:00
Lars Brubaker
ef0f2be119 Made a common static load of the mono spaced font 2016-08-10 15:40:09 -07:00
Lars Brubaker
0d2e60a1dc Merge pull request #1270 from unlimitedbacon/master 
Switched custom GCode boxes to monospace font
 2016-08-10 15:35:28 -07:00
Tyler Anderson
0b4bc4cbbc Switched custom GCode boxes to monospace font 2016-08-10 15:18:03 -07:00
johnlewin
1542ee12a1 Merge pull request #1269 from larsbrubaker/master 
Made settings names save when empty
 2016-08-10 14:47:37 -07:00
Lars Brubaker
e4a10442c2 Made the drop list name update interactively. 2016-08-10 14:20:52 -07:00
Lars Brubaker
b18f8fc889 Made the name save in settings editor 
changed layername to a settings key
 2016-08-10 14:04:33 -07:00
Lars Brubaker
10b1835775 Merge pull request #1266 from larsbrubaker/master 
Making less calls to reload all
 2016-08-08 17:28:12 -07:00
Lars Brubaker
0f2b715935 Making less calls to reload all 
New function ReloadLibraryUI
Called when updating purchased and shared folder
 2016-08-08 17:17:59 -07:00
Lars Brubaker
f6ac22c308 Merge pull request #1265 from mmoening/master 
Fixed OemProfile Tests
 2016-08-08 17:09:49 -07:00
Matt Moening
a8e72662df Fixed OemProfile Tests 
- Broke up Altair and Poetry Infinity printers into separate printers based on nozzle diameter
 - fixed simple, simple metal, and MendalMax to have Layer heights less than their Nozzle Diameter on coarse settings
 - fixed printer config's oem property to be the name of its directory rather than its parents (was always profiles)
 - changed minimumLayerHight to maximumLayeHeight to reflect what the value actually represented
 - removed fix needed categories
 2016-08-08 15:59:09 -07:00
Lars Brubaker
41becdb0f1 Merge pull request #1264 from larsbrubaker/master 
Moved other to the bottom of the list.
 2016-08-08 15:52:58 -07:00
Lars Brubaker
5325d7d190 Moved other to the bottom of the list. 2016-08-08 15:46:20 -07:00
Lars Brubaker
0087a54006 Merge pull request #1263 from larsbrubaker/master 
improving undo and making the buttons show
 2016-08-08 15:28:18 -07:00
Lars Brubaker
73f4fd0d95 latest agg 2016-08-08 15:24:00 -07:00
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