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

4184 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lars Brubaker
8a15085d7e Merge pull request #839 from larsbrubaker/master 
Unified the android and desktop setup wizard classes
 2016-06-02 07:59:06 -07:00
Lars Brubaker
b54e6a14ad Unified the android and desktop setup wizard classes 2016-06-01 18:17:11 -07:00
Lars Brubaker
6acbe7f2d3 Merge pull request #837 from jlewin/master 
Decouple make/model droplists
 2016-06-01 15:11:19 -07:00
John Lewin
a04f0ac88b Decouple make/model droplists 
- Fixes #833
 2016-06-01 14:00:47 -07:00
Lars Brubaker
95fc57e555 Merge pull request #836 from larsbrubaker/master 
Made sure Attention getter is done done
 2016-06-01 07:16:40 -07:00
larsbrubaker
47a63bf966 Made sure Attention getter is done done 
Only one run navigation at a time
only allow one highlight per widget at a time.
 2016-06-01 07:07:36 -07:00
johnlewin
d991e65361 Merge pull request #835 from jlewin/master 
Remove invalid settings from slic3r config files
 2016-05-31 18:14:59 -07:00
John Lewin
2e59506d06 Remove invalid settings from slic3r config files 
- Second attempt to fix #784
 2016-05-31 18:02:00 -07:00
johnlewin
e3da9196a5 Merge pull request #834 from jlewin/master 
Resolve outstanding config.ini issues
 2016-05-31 15:26:08 -07:00
John Lewin
b1f87eb3a9 Adjust config.ini layer height values 
- Fixes #831
 2016-05-31 15:18:16 -07:00
John Lewin
0a9a5e2121 Adjust config.ini first layer height values 2016-05-31 15:11:29 -07:00
johnlewin
b165bc287f Merge pull request #830 from jlewin/master 
Latest Agg
 2016-05-31 14:33:24 -07:00
John Lewin
38a0beaf4f Latest Agg 2016-05-31 14:13:38 -07:00
Lars Brubaker
65aca87cf3 Merge pull request #820 from larsbrubaker/master 
Made some help when connecting to a printer without a com port set
 2016-05-29 09:30:52 -07:00
larsbrubaker
85c0b66840 Made some help when connecting to a printer without a com port set 
Common ui navigation functions
Improved highlight utility
Made Edit Fields have names that can be discovered
Refactoring
 2016-05-29 09:19:46 -07:00
Lars Brubaker
ea5a7b9ee4 Merge pull request #806 from rytz/master 
UI Label change
 2016-05-26 18:26:21 -07:00
rytz
5ad28cf793 UI Label change 2016-05-26 11:55:16 -07:00
johnlewin
2e8d94ca2d Merge pull request #801 from jlewin/master 
Revise config.ini tests
 2016-05-25 11:19:09 -07:00
John Lewin
df44afa5ee Revise config.ini tests 
- Layer height should be no more than 85% of nozzle diameter
 - First layer height should be no more than 85% of extrusion width
 - First layer extrusion width should be bigger than nozzle dia. if set
 2016-05-25 11:04:51 -07:00
johnlewin
68e5691eb5 Merge pull request #799 from jlewin/master 
Pass make/model as querystring parameters on printer lookup requests
 2016-05-24 08:09:44 -07:00
John Lewin
3dfa39ede7 Pass make/model as querystring parameters on printer lookup requests 
- Fixes #714
 2016-05-23 17:27:52 -07:00
johnlewin
c3107caf84 Merge pull request #798 from jlewin/master 
Fix Esagono related PrinterChooserHonorsWhitelist test failure
 2016-05-23 17:24:39 -07:00
John Lewin
cc72c66ae7 Disable Esagono droplist label tests 2016-05-23 15:54:12 -07:00
johnlewin
f398b13caa Merge pull request #797 from jlewin/master 
Update StaticData config.ini tests and enable for continuous integration
 2016-05-23 15:43:16 -07:00
John Lewin
7d4e06d1cb Test should pass if setting missing and using MH defaults 2016-05-23 15:31:14 -07:00
John Lewin
2da691dadc Revise config.ini tests, bring failing printers into compliance 
- BCN Sigma: use extruder one for support material
 - TAZ 6: replace curly braces with brackets
 - Me3D: use temperature instead of first_layer_temperature
 2016-05-23 15:30:26 -07:00
John Lewin
c87f14c3f4 Update StaticData config.ini tests and enable for continuous integration 2016-05-23 15:23:56 -07:00
johnlewin
d9dad19166 Merge pull request #796 from gregory-diaz/master 
Master
 2016-05-23 15:14:45 -07:00
Greg
84cd73b6f6 Removed Esagono printer profile from StaticData. Also made sure all profiles have bottom_solid_layers is set to 1mm for all profiles. 2016-05-23 14:57:45 -07:00
Greg
205a42a499 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-05-23 14:07:29 -07:00
johnlewin
5c4cb38698 Merge pull request #792 from jlewin/master 
Merge remote-tracking branch 'origin/1.5.3'
 2016-05-20 10:46:39 -07:00
John Lewin
4fd2eee3c7 Merge remote-tracking branch 'origin/1.5.3' 
# Conflicts:
#	PrinterCommunication/Io/WaitForTempStream.cs
 2016-05-19 18:03:57 -07:00
johnlewin
aacb863dd4 Merge pull request #791 from jlewin/master 
Filter MatterControl application settings from Slic3r output
 2016-05-18 17:11:36 -07:00
John Lewin
9da6f122f7 Filter MatterControl application settings from Slic3r output 
- Fixes #784
 2016-05-18 16:49:55 -07:00
John Lewin
8a73db2ba0 Prevent frequently occurring exception during parse 2016-05-18 16:18:12 -07:00
johnlewin
6a84736f1f Merge pull request #789 from rytz/master 
UI label updates
 2016-05-18 13:17:36 -07:00
rytz
b78dadd25c UI label updates 2016-05-18 12:52:36 -07:00
johnlewin
61f63b75cf Merge pull request #786 from jlewin/master 
Wire up Delete printer
 2016-05-18 10:22:25 -07:00
John Lewin
a6ba5767d3 Wire up Delete printer 2016-05-17 18:30:47 -07:00
johnlewin
83a8a84965 Merge pull request #785 from jlewin/master 
Improve Duplicate preset
 2016-05-17 18:29:58 -07:00
John Lewin
576b8dbf22 Improve Duplicate preset 
- Update Material preset array when preset changed from presets window
 - Update PresetsContext.PersistenceLayer when presets are duplicated
 - Rebuild SliceSettingsWidget on duplicate without leaving window
 - Refactor GetTopRow to eliminate excess widgets & create a single row
 - Update presets name after leaving input rather than on window close
 2016-05-17 17:15:49 -07:00
Lars Brubaker
9468eb1a96 Merge pull request #783 from larsbrubaker/master 
Put in a delete printer button.
 2016-05-17 16:31:51 -07:00
Lars Brubaker
33876af4cc Put in a delete printer button. 2016-05-17 15:50:43 -07:00
Lars Brubaker
70c58ca784 Merge pull request #782 from larsbrubaker/master 
Made the auto level indicator button navigate to the auto level prope…
 2016-05-17 15:49:55 -07:00
Lars Brubaker
3290a91947 Made the auto level indicator button navigate to the auto level properties panel. 2016-05-17 15:30:39 -07:00
Lars Brubaker
c8ed6d6283 Merge pull request #779 from larsbrubaker/master 
Made pop out tabs take automation correctly.
 2016-05-17 10:59:06 -07:00
Lars Brubaker
483ce16453 Made pop out tabs take automation correctly. 
Made print level icon go to leveling settings
 2016-05-17 10:33:18 -07:00
Lars Brubaker
f6fe431b5f Merge pull request #774 from larsbrubaker/master 
Fixed the colors on movement controls
 2016-05-17 09:54:55 -07:00
Lars Brubaker
a6e6817969 Merge pull request #777 from unlimitedbacon/master 
Flexible materials for TAZ 6
 2016-05-17 09:50:05 -07:00
Lars Brubaker
ba88cd15a9 correct function signature 2016-05-17 09:47:10 -07:00