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
Lars Brubaker
0d7501506c updated ms and agg 2016-07-05 12:25:18 -07:00
Lars Brubaker
7951b22044 Bringing in the work from unlimitedbacon #1026 
Adding density setting to filament
Adding cost option to filament
 2016-07-05 12:24:00 -07:00
Lars Brubaker
c9b6e4762e Merge remote-tracking branch 'unlimitedbacon/density' 2016-07-05 12:13:54 -07:00
Lars Brubaker
7e94b9fb8b Merge pull request #1033 from unlimitedbacon/profiles 
Updated profile for Airwolf Axiom
 2016-07-01 09:44:18 -07:00
Tyler Anderson
37cda8002e Updated profile for Airwolf Axiom 2016-06-29 17:20:05 -07:00
johnlewin
d4dd5d491e Merge pull request #1032 from gregory-diaz/master 
Display "Last Time Updated" to Settings Panel. We can add it to the P…
 2016-06-29 17:06:14 -07:00
Greg
c41b6efd9c Display "Last Time Updated" to Settings Panel. We can add it to the Printer Setup Wizard later if needed. 2016-06-29 14:47:57 -07:00
johnlewin
ea7683dea2 Merge pull request #1031 from jlewin/master 
Remove ProfileData property, show wizard if visible printers < 1
 2016-06-29 14:23:12 -07:00
John Lewin
99ee64c5ea Remove ProfileData property, show wizard if visible printers < 1 2016-06-29 13:02:04 -07:00
johnlewin
aa7ba5e806 Merge pull request #1030 from jlewin/master 
Prevent invalid profile creation for default state
 2016-06-28 17:05:43 -07:00
John Lewin
7db1276d26 Prevent invalid profile creation for default state 
- Guard for nulls in OemLayer
 - Issue #1029
 2016-06-28 16:55:50 -07:00
johnlewin
8e94c64bb5 Merge pull request #1027 from jlewin/master 
Remove OemProfile property, promote OemLayer property to parent
 2016-06-27 15:54:42 -07:00
johnlewin
8b3c4d4746 Merge pull request #1025 from mmoening/master 
Loading printer profile now follows local cache fallback when offline
 2016-06-27 15:46:32 -07:00
John Lewin
0c752a4d27 Remove OemProfile property, promote OemLayer property to parent 
- Extract PrinterSettingLayer to separate file
 - Create profile migration for OemProfile -> OemLayer
 - Rename confusing LayerCascade property in tests to PrinterSettings
 - Issue #1023
 2016-06-27 15:42:56 -07:00
Tyler Anderson
1030b06d62 Added print cost estimate to Layer View 2016-06-27 13:02:37 -07:00
Matt Moening
4bf95f8605 Loading printer profile now follows local cache fallback when offline 2016-06-27 12:41:08 -07:00
Tyler Anderson
f9c446d52b added filament density and cost settings to UI 2016-06-27 12:32:50 -07:00
Tyler Anderson
44ccbcbe9c estimate mass based on correct density specified in material profile 2016-06-27 12:05:14 -07:00
johnlewin
2ea5c3dd1f Merge pull request #1021 from jlewin/master 
Revise MCWS parameter names
 2016-06-24 18:29:18 -07:00
John Lewin
91b80b716d Revise MCWS parameter names 2016-06-24 18:23:17 -07:00
Lars Brubaker
3a50198cfc Merge pull request #1017 from jlewin/master 
Initial delete profile implementation
 2016-06-24 12:17:03 -07:00
Lars Brubaker
7f6be93f3d latest ms and mc 2016-06-24 12:16:23 -07:00
John Lewin
079afa7cd7 Initial delete profile implementation 2016-06-24 12:05:27 -07:00
Lars Brubaker
e4900a4c10 FIxed #1014 Retractions are not shifted by extruder offset in GCode view 2016-06-24 09:27:35 -07:00
johnlewin
a4ec15ad89 Merge pull request #1015 from gregory-diaz/master 
Added function for permanent printer profile deletes.
 2016-06-23 18:58:35 -07:00
johnlewin
e843aed70c Merge pull request #1016 from jlewin/master 
Revise PublicProfileRequests, make functional offline
 2016-06-23 18:54:19 -07:00
John Lewin
ca55930bf4 Revise PublicProfileRequests, make functional offline 
- Add prototype for loading cacheable content
 - Make RetrievePrinterProfile test use public server
 - Expose JsonResponseDictionary on PublicProfilesRequest
 2016-06-23 18:35:43 -07:00
John Lewin
cdc953f7c3 Include computed SHA1 fingerprint during upload 2016-06-23 18:35:43 -07:00
Lars Brubaker
a8fc6ef1a1 Fixed a null reference in libraryDataView 
Working on more consistent wizard theming
 2016-06-23 16:01:04 -07:00
Greg
e7b686d46b Added function for permanent printer profile deletes. 2016-06-23 15:15:11 -07:00
Lars Brubaker
a810c7a562 Make sure we don't create a macro name that is wrapped or too big. 
Fixes #1010
 2016-06-23 12:12:55 -07:00
Lars Brubaker
0fdc6a03e0 Make sure we don't create a macro name that is wrapped or too big. 2016-06-23 12:12:01 -07:00
Lars Brubaker
dc1186d4bf Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-06-23 11:30:38 -07:00
johnlewin
4fafd36f2a Merge pull request #1009 from jlewin/master 
Add initial MCWS profile updates
 2016-06-23 10:29:06 -07:00
Lars Brubaker
a4ea7ca4cf latest matterslice 2016-06-23 09:39:30 -07:00
Lars Brubaker
bb43a38623 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-06-23 09:30:33 -07:00
John Lewin
2188f76a91 Remove unused System.Net.Http reference 2016-06-22 19:39:36 -07:00
John Lewin
d97e1b72fb Add initial MCWS profile updates 2016-06-22 19:29:13 -07:00
John Lewin
ff42287f02 Replace hardcoded paths with common reference 2016-06-22 19:29:13 -07:00
johnlewin
9d6084778e Merge pull request #1008 from mmoening/master 
Implemented MC side receive of Public Profile list and public profiles
 2016-06-22 18:23:21 -07:00
Matt Moening
bc5ef8a5b3 Implemented MC side receive of Public Profile list and public profiles 2016-06-22 18:05:52 -07:00
Lars Brubaker
e926186f6b Merge pull request #1007 from larsbrubaker/master 
Fixed #1002 bed temp not being set on pre-heat.
 2016-06-22 17:20:14 -07:00
Lars Brubaker
531152fd92 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-06-22 17:13:25 -07:00
Lars Brubaker
6f1760e33b Fixed #1002 bed temp not being set on pre-heat. 2016-06-22 17:13:05 -07:00
Lars Brubaker
d19acdc802 Merge pull request #1006 from larsbrubaker/master 
Made the scale control work with single transforms
 2016-06-22 16:35:09 -07:00
Lars Brubaker
591dcb17da Made the scale control work with single transforms 
scale control was in transition and this makes it usable. fixes #1005
made clearing an override send an update message.
 2016-06-22 16:29:14 -07:00
johnlewin
476f39001a Merge pull request #1004 from larsbrubaker/master 
Removing settings base layer from being strode in users data
 2016-06-22 16:05:17 -07:00
Lars Brubaker
3e44555497 Ability to set base layer for testing. 2016-06-22 15:47:22 -07:00
Lars Brubaker
328204b14b Create the baseLayerCache on first request rather than static init. 2016-06-22 15:38:20 -07:00
Lars Brubaker
768d555f2a Removing settings base layer from being strode in users data 2016-06-22 15:29:20 -07:00