Updated for available parts#6

codeandsolder wants to merge 2 commits intoweteor:mainweteor/3W6:mainfrom

codeandsolder:maincodeandsolder/3W6:mainCopy head branch name to clipboard