0.4.2

* Enable offline download page

* avoid clashing with docs

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://ci2.dot.net/buildStatus/icon?job=Private/pxt_project_rainbow/master/pxt-ev3_Push)](https://ci2.dot.net/job/Private/job/pxt_project_rainbow/job/master/job/pxt-ev3_Push/)
 
-This repo contains the editor target hosted at https://makecode.legoeducation.com
+This repo contains the editor target hosted at https://makecode.mindstorms.com
 
 LEGO Auth: https://src.education.lego.com/groups/ev3-makecode (use Google Authenticator)
 LEGO Chat: https://chat.internal.education.lego.com/make-code/channels/town-square

docs/design-engineering/make-it-move.md

@@ -30,6 +30,8 @@ If you want some building help you can follow these instructions.
 
 [![Toddle Bot](/static/lessons/make-it-move/toddle-bot.jpg)](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/toddle%20bot-3dcad146d7f5deac4753f93e9dcc0739.pdf)
 
+Click [here](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/toddle%20bot-3dcad146d7f5deac4753f93e9dcc0739.pdf)
+
 ### Program
 
 Before you program, think about:

docs/index-ref.json

@@ -1,3 +1,3 @@
 {
-    "appref": "v0.2.3"
+    "appref": "v0.3.6"
 }

docs/offline-app.html

@@ -13,8 +13,13 @@
             color: rgba(0, 0, 0, 0.4);
         }
 
+        .ui.grid {
+            background: rgb(170, 39, 143)!important;
+        }
+
         .ui.inverted.content {
-            background: #00a5c8;
+            /* background: #00a5c8; */
+            background: #2a7af3;
         }
 
         .content.segment {
@@ -73,10 +78,10 @@
             padding: 0
         }
 
-        .c1 {
+        .c2 {
-            margin-left: 63pt;
+            margin-left: 22.5pt;
             padding-top: 6pt;
-            text-indent: -22.5pt;
+            text-indent: -18pt;
             padding-bottom: 6pt;
             line-height: 1.15;
             orphans: 2;
@@ -85,25 +90,38 @@
         }
 
         .c8 {
-            margin-left: 58.5pt;
+            margin-left: 40.5pt;
-            padding-top: 0pt;
+            padding-top: 6pt;
-            padding-bottom: 0pt;
+            text-indent: -18pt;
+            padding-bottom: 6pt;
             line-height: 1.15;
             orphans: 2;
             widows: 2;
             text-align: left
         }
 
-        .c2 {
+        .c15 {
-            color: #000000;
+            padding-top: 0pt;
-            font-weight: 400;
+            padding-bottom: 12pt;
-            text-decoration: none;
+            line-height: 1.15;
-            vertical-align: baseline;
+            orphans: 2;
-            font-family: "Arial";
+            widows: 2;
-            font-style: normal
+            text-align: left;
+            height: 11pt
         }
 
-        .c3 {
+        .c7 {
+            padding-top: 0pt;
+            padding-bottom: 0pt;
+            line-height: 1.15;
+            orphans: 2;
+            widows: 2;
+            text-align: left;
+            height: 11pt
+        }
+
+        .c0 {
+            margin-left: 23pt;
             padding-top: 6pt;
             padding-bottom: 6pt;
             line-height: 1.15;
@@ -112,16 +130,18 @@
             text-align: left
         }
 
-        .c17 {
+        .c10 {
-            padding-top: 0pt;
+            margin-left: 40.5pt;
-            padding-bottom: 12pt;
+            padding-top: 6pt;
+            padding-bottom: 6pt;
             line-height: 1.15;
             orphans: 2;
             widows: 2;
             text-align: left
         }
 
-        .c12 {
+        .c6 {
+            margin-left: 40.5pt;
             padding-top: 0pt;
             padding-bottom: 0pt;
             line-height: 1.15;
@@ -130,74 +150,102 @@
             text-align: left
         }
 
-        .c6 {
+        .c20 {
+            padding-top: 0pt;
+            padding-bottom: 0pt;
+            line-height: 1.15;
+            orphans: 2;
+            widows: 2;
+            text-align: center
+        }
+
+        .c4 {
             color: #000000;
+            font-weight: 700;
             text-decoration: none;
             vertical-align: baseline;
             font-family: "Arial";
             font-style: normal
         }
 
+        .c11 {
+            padding-top: 0pt;
+            padding-bottom: 0pt;
+            line-height: 1.15;
+            orphans: 2;
+            widows: 2;
+            text-align: left
+        }
+
+        .c12 {
+            padding-top: 6pt;
+            padding-bottom: 6pt;
+            line-height: 1.15;
+            orphans: 2;
+            widows: 2;
+            text-align: left
+        }
+
+        .c3 {
+            color: #000000;
+            font-weight: 400;
+            text-decoration: none;
+            vertical-align: baseline;
+            font-family: "Arial";
+            font-style: normal
+        }
+
+        .c16 {
+            padding-top: 0pt;
+            padding-bottom: 12pt;
+            line-height: 1.15;
+            orphans: 2;
+            widows: 2;
+            text-align: left
+        }
+
+        .c13 {
+            color: #000000;
+            text-decoration: none;
+            vertical-align: baseline;
+            font-family: "Arial";
+            font-style: italic
+        }
+
         .c14 {
             text-decoration-skip-ink: none;
             -webkit-text-decoration-skip: none;
-            color: #0000ff;
+            color: #1155cc;
             text-decoration: underline
         }
 
+        .c17 {
+            background-color: #ffffff;
+            max-width: 540pt;
+            padding: 36pt 36pt 36pt 36pt
+        }
+
         .c18 {
             text-decoration-skip-ink: none;
             -webkit-text-decoration-skip: none;
             text-decoration: underline
         }
 
-        .c19 {
-            background-color: #ffffff;
-            max-width: 468pt;
-            padding: 72pt 72pt 72pt 72pt
-        }
-
         .c9 {
-            margin-left: 40pt;
-            text-indent: -18pt
-        }
-
-        .c4 {
             color: inherit;
             text-decoration: inherit
         }
 
-        .c7 {
-            margin-left: 59pt;
-            text-indent: -18pt
-        }
-
-        .c10 {
-            font-size: 11pt
-        }
-
-        .c0 {
-            font-size: 10pt
-        }
-
-        .c15 {
-            margin-left: 36pt
-        }
-
         .c5 {
             font-weight: 700
         }
 
-        .c13 {
+        .c1 {
-            margin-left: 23pt
+            font-size: 10pt
         }
 
-        .c16 {
+        .c19 {
-            height: 11pt
+            font-size: 11pt
-        }
-
-        .c11 {
-            font-size: 12pt
         }
 
         .terms .title {
@@ -320,19 +368,34 @@
     </style>
 
     <script>
+        $(document).ready(function () {
+            tickEvent = function (id, data) {
+                if (!pxt.aiTrackEvent) return;
+                if (!data) pxt.aiTrackEvent(id);
+                else {
+                    var props = {};
+                    var measures = {};
+                    for (var k in data)
+                        if (typeof data[k] == "string") props[k] = data[k];
+                        else measures[k] = data[k];
+                    pxt.aiTrackEvent(id, props, measures);
+                }
+            }
+        });
         function agreeCheckboxChanged() {
             var downloadSegment = document.getElementById("download-segment");
             downloadSegment.classList.toggle("hidden");
         }
-        function downloadWin32() {
+        function downloadWin64() {
             // TODO: Keep this link up-to-date with the desired release version
-            window.open("http://makecode.com/api/release/ev3/v0.3.2/win32");
+            window.open("https://makecode.com/api/release/ev3/v0.3.6/win64");
+            tickEvent("offlineapp.download", { "target": "ev3", "platform": "win64" });
         }
     </script>
 
 </head>
 
-<body id='root' class='root'>
+<body id="root" class="root">
 
     <div class="ui inverted vertical center aligned segment content">
 
@@ -353,282 +416,286 @@
                 Please read and accept the following terms to download the app.
             </div>
             <div class="ui left aligned segment terms">
-                <div class="c19">
+                <div class="c17">
-                    <p class="c12">
+                    <p class="c11">
-                        <span class="c6 c5 c11">MICROSOFT PRE-RELEASE SOFTWARE LICENSE TERMS</span>
+                        <span class="c4 c1">MICROSOFT PRE-RELEASE SOFTWARE LICENSE TERMS</span>
                     </p>
-                    <p class="c12">
+                    <p class="c11">
-                        <span class="c6 c5 c11">MICROSOFT MAKECODE SOFTWARE FOR LEGO MINDSTORMS EDUCATION EV3</span>
+                        <span class="c4 c1">MICROSOFT MAKECODE SOFTWARE FOR LEGO MINDSTORMS EDUCATION EV3</span>
                     </p>
-                    <p class="c12 c16">
+                    <p class="c7">
-                        <span class="c6 c0 c5"></span>
+                        <span class="c4 c1"></span>
                     </p>
-                    <p class="c12">
+                    <p class="c11">
-                        <span class="c2 c0">These license terms are an agreement between Microsoft Corporation (or based on where you live, one
+                        <span class="c3 c1">These license terms are an agreement between Microsoft Corporation (or based on where you live, one
                             of its affiliates) and you. They apply to the software named above. The terms also apply to any
                             Microsoft services or updates for the software, except to the extent those have additional terms.</span>
                     </p>
-                    <p class="c12 c16">
+                    <p class="c7">
-                        <span class="c2 c0"></span>
+                        <span class="c3 c1"></span>
                     </p>
-                    <p class="c12">
+                    <p class="c11">
-                        <span class="c6 c5 c11">If you comply with these license terms, you have the rights below.</span>
+                        <span class="c4 c1">IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE RIGHTS BELOW.</span>
                     </p>
-                    <p class="c3 c9">
+                    <p class="c2">
-                        <span class="c0 c5">1.</span>
+                        <span class="c5 c1">1.</span>
-                        <span class="c0">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                        <span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-                        <span class="c0 c5">INSTALLATION AND USE RIGHTS. </span>
+                        <span class="c5 c1">INSTALLATION AND USE RIGHTS. </span>
-                        <span class="c2 c0">You may install and use any number of copies of the software to evaluate it as you develop and test
+                        <span class="c3 c1">You may install and use any number of copies of the software to evaluate it as you develop and test
                             your software applications for use with Lego Mindstorms Education EV3 hardware.</span>
                     </p>
-                    <p class="c3 c9">
+                    <p class="c2">
-                        <span class="c0 c5">2.</span>
+                        <span class="c5 c1">2.</span>
-                        <span class="c0">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                        <span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-                        <span class="c0 c5">PRE-RELEASE SOFTWARE. </span>
+                        <span class="c5 c1">PRE-RELEASE SOFTWARE. </span>
-                        <span class="c2 c0">The software is a pre-release version. It may not work the way a final version of the software will.
+                        <span class="c3 c1">The software is a pre-release version. It may not work the way a final version of the software will.
                             Microsoft may change it for the final, commercial version. We also may not release a commercial
                             version. Microsoft is not obligated to provide maintenance, technical support or updates to you
                             for the software.</span>
                     </p>
-                    <p class="c3 c9">
+                    <p class="c2">
-                        <span class="c0 c5">3.</span>
+                        <span class="c5 c1">3.</span>
-                        <span class="c0">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                        <span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-                        <span class="c0 c5">Associated Online Services.</span>
+                        <span class="c5 c1">Associated Online Services.</span>
-                        <span class="c0">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Some features of the software may provide access
+                        <span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Some features of the software may provide access
                             to, or rely on, Azure online services, including an associated Azure online service to the software
                             currently in development (the &ldquo;corresponding service&rdquo;). The use of those services
                             (but not the software) is governed by the separate terms and privacy policies in the agreement
                             under which you obtained the Azure services at</span>
-                        <span class="c0">
+                        <span class="c1">
-                            <a class="c4" href="https://www.google.com/url?q=https://go.microsoft.com/fwLink/p/?LinkID%3D233178&amp;sa=D&amp;ust=1529526883494000">&nbsp;</a>
+                            <a class="c9" href="https://www.google.com/url?q=https://go.microsoft.com/fwLink/p/?LinkID%3D233178&amp;sa=D&amp;ust=1529596153826000">&nbsp;</a>
                         </span>
-                        <span class="c0 c18">
+                        <span class="c1 c18">
-                            <a class="c4" href="https://www.google.com/url?q=https://go.microsoft.com/fwLink/p/?LinkID%3D233178&amp;sa=D&amp;ust=1529526883494000">https://go.microsoft.com/fwLink/p/?LinkID=233178</a>
+                            <a class="c9" href="https://www.google.com/url?q=https://go.microsoft.com/fwLink/p/?LinkID%3D233178&amp;sa=D&amp;ust=1529596153826000">https://go.microsoft.com/fwLink/p/?LinkID=233178</a>
                         </span>
-                        <span class="c2 c0">&nbsp;(and, with respect to the corresponding service, the additional terms below). Please read them.
+                        <span class="c3 c1">&nbsp;(and, with respect to the corresponding service, the additional terms below). Please read them.
                             The services may not be available in all regions.</span>
                     </p>
-                    <p class="c3 c9">
+                    <p class="c2">
-                        <span class="c0 c5">4.</span>
+                        <span class="c5 c1">4.</span>
-                        <span class="c0">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                        <span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-                        <span class="c0 c5">Licenses for other components.</span>
+                        <span class="c5 c1">Licenses for other components.</span>
-                        <span class="c2 c0">&nbsp;The software may include third party components with separate legal notices or governed by
+                        <span class="c3 c1">&nbsp;The software may include third party components with separate legal notices or governed by
                             other agreements, as described in the ThirdPartyNotices file accompanying the software. Even
                             if such components are governed by other agreements, the disclaimers and the limitations on and
                             exclusions of damages below also apply.</span>
                     </p>
-                    <p class="c3 c9">
+                    <p class="c2">
-                        <span class="c0 c5">5.</span>
+                        <span class="c5 c1">5.</span>
-                        <span class="c0">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                        <span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-                        <span class="c6 c0 c5">DATA.</span>
+                        <span class="c1 c4">DATA.</span>
                     </p>
-                    <p class="c3 c7">
+                    <p class="c8">
-                        <span class="c0 c5">a.</span>
+                        <span class="c5 c1">a.</span>
-                        <span class="c0">&nbsp; &nbsp;</span>
+                        <span class="c1">&nbsp; &nbsp;</span>
-                        <span class="c0 c5">Data Collection. </span>
+                        <span class="c1 c5">Data Collection. </span>
-                        <span class="c0">The software may collect information about you and your use of the software, and send that to Microsoft.
+                        <span class="c1">The software may collect information about you and your use of the software, and send that to Microsoft.
                             Microsoft may use this information to provide services and improve our products and services.
                             You may opt out of many of these scenarios, but not all, as described in the product documentation.
                             In using the software, you must comply with applicable law. You can learn more about data collection
-                            and use in the help documentation and the privacy statement at</span>
+                            and use in the help documentation and the privacy statement at </span>
-                        <span class="c0">
+                        <span class="c14 c1">
-                            <a class="c4" href="https://www.google.com/url?q=http://go.microsoft.com/fwlink/?LinkId%3D398505&amp;sa=D&amp;ust=1529526883495000">&nbsp;</a>
+                            <a class="c9" href="https://www.google.com/url?q=http://go.microsoft.com/fwlink/?LinkId%3D398505&amp;sa=D&amp;ust=1529596153827000">http://go.microsoft.com/fwlink/?LinkId=398505</a>
                         </span>
-                        <span class="c0 c14">
+                        <span class="c1">.</span>
-                            <a class="c4" href="https://www.google.com/url?q=http://go.microsoft.com/fwlink/?LinkId%3D398505&amp;sa=D&amp;ust=1529526883495000">http://go.microsoft.com/fwlink/?LinkId=398505</a>
+                        <span class="c3 c1">&nbsp;Your use of the software operates as your consent to these practices.</span>
-                        </span>
-                        <span class="c2 c0">. Your use of the software operates as your consent to these practices.</span>
                     </p>
-                    <p class="c3 c7">
+                    <p class="c8">
-                        <span class="c0 c5">b.</span>
+                        <span class="c5 c1">b.</span>
-                        <span class="c0">&nbsp; &nbsp;</span>
+                        <span class="c1">&nbsp; &nbsp;</span>
-                        <span class="c0 c5">Processing of Personal Data. </span>
+                        <span class="c5 c1">Processing of Personal Data. </span>
-                        <span class="c2 c0">To the extent Microsoft is a processor or subprocessor of personal data in connection with the software,
+                        <span class="c1">To the extent Microsoft is a processor or subprocessor of personal data in connection with the software,
                             Microsoft makes the commitments in the European Union General Data Protection Regulation Terms
-                            of the Online Services Terms to all customers effective May 25, 2018, at http://go.microsoft.com/?linkid=9840733.</span>
+                            of the Online Services Terms to all customers effective May 25, 2018, at </span>
+                        <span class="c1 c14">
+                            <a class="c9" href="https://www.google.com/url?q=http://go.microsoft.com/?linkid%3D9840733&amp;sa=D&amp;ust=1529596153828000">http://go.microsoft.com/?linkid=9840733</a>
+                        </span>
+                        <span class="c3 c1">.</span>
                     </p>
-                    <p class="c3 c9">
+                    <p class="c2">
-                        <span class="c0 c5">6.</span>
+                        <span class="c5 c1">6.</span>
-                        <span class="c0">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                        <span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-                        <span class="c0 c5">FEEDBACK. </span>
+                        <span class="c5 c1">FEEDBACK. </span>
-                        <span class="c2 c0">If you give feedback about the software to Microsoft, you give to Microsoft, without charge, the
+                        <span class="c3 c1">If you give feedback about the software to Microsoft, you give to Microsoft, without charge, the
                             right to use, share and commercialize your feedback in any way and for any purpose. You will
                             not give feedback that is subject to a license that requires Microsoft to license its software
                             or documentation to third parties because we include your feedback in them. These rights survive
                             this agreement.</span>
                     </p>
-                    <p class="c3 c9">
+                    <p class="c2">
-                        <span class="c0 c5">7.</span>
+                        <span class="c5 c1">7.</span>
-                        <span class="c0">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                        <span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-                        <span class="c0 c5">SCOPE OF LICENSE.</span>
+                        <span class="c5 c1">SCOPE OF LICENSE.</span>
-                        <span class="c2 c0">&nbsp;The software is licensed, not sold. This agreement only gives you some rights to use the software.
+                        <span class="c3 c1">&nbsp;The software is licensed, not sold. This agreement only gives you some rights to use the software.
                             Microsoft reserves all other rights. Unless applicable law gives you more rights despite this
                             limitation, you may use the software only as expressly permitted in this agreement. &nbsp;In
                             doing so, you must comply with any technical limitations in the software that only allow you
                             to use it in certain ways. You may not:</span>
                     </p>
-                    <p class="c1">
+                    <p class="c8">
-                        <span class="c2 c0">- &nbsp; &nbsp; &nbsp; work around any technical limitations in the software;</span>
+                        <span class="c3 c1">- &nbsp; &nbsp; work around any technical limitations in the software;</span>
                     </p>
-                    <p class="c1">
+                    <p class="c8">
-                        <span class="c2 c0">- &nbsp; &nbsp; &nbsp; reverse engineer, decompile or disassemble the software, or attempt to do
+                        <span class="c3 c1">- &nbsp; &nbsp; reverse engineer, decompile or disassemble the software, or attempt to do so, except
-                            so, except and only to the extent required by third party licensing terms governing use of certain
+                            and only to the extent required by third party licensing terms governing use of certain open
-                            open source components that may be included with the software;</span>
+                            source components that may be included with the software;</span>
                     </p>
-                    <p class="c1">
+                    <p class="c8">
-                        <span class="c2 c0">- &nbsp; &nbsp; &nbsp; remove, minimize, block or modify any notices of Microsoft or its suppliers
+                        <span class="c3 c1">- &nbsp; &nbsp; remove, minimize, block or modify any notices of Microsoft or its suppliers in the
-                            in the software;</span>
+                            software;
+                        </span>
                     </p>
-                    <p class="c1">
+                    <p class="c8">
-                        <span class="c2 c0">- &nbsp; &nbsp; &nbsp; use the software in any way that is against the law; or</span>
+                        <span class="c3 c1">- &nbsp; &nbsp; use the software in any way that is against the law; or</span>
                     </p>
-                    <p class="c1">
+                    <p class="c8">
-                        <span class="c2 c0">- &nbsp; &nbsp; &nbsp; share, publish, rent or lease the software, or provide the software as a stand-alone
+                        <span class="c3 c1">- &nbsp; &nbsp; share, publish, rent or lease the software, or provide the software as a stand-alone
                             offering for others to use.</span>
                     </p>
-                    <p class="c3 c9">
+                    <p class="c2">
-                        <span class="c0 c5">8. &nbsp; UPDATES. </span>
+                        <span class="c5 c1">8. &nbsp; UPDATES. </span>
-                        <span class="c2 c0">The software may periodically check for updates and download and install them for you. You may obtain
+                        <span class="c3 c1">The software may periodically check for updates and download and install them for you. You may obtain
                             updates only from Microsoft or authorized sources. Microsoft may need to update your system to
                             provide you with updates. You agree to receive these automatic updates without any additional
                             notice. Updates may not include or support all existing software features, services, or peripheral
-                            devices.</span>
+                            devices.
+                        </span>
                     </p>
-                    <p class="c3 c9">
+                    <p class="c2">
-                        <span class="c0 c5">9.</span>
+                        <span class="c5 c1">9.</span>
-                        <span class="c0">&nbsp; &nbsp;</span>
+                        <span class="c1">&nbsp; &nbsp;</span>
-                        <span class="c0 c5">EXPORT RESTRICTIONS.</span>
+                        <span class="c5 c1">EXPORT RESTRICTIONS.</span>
-                        <span class="c2 c0">&nbsp;You must comply with all domestic and international export laws and regulations that apply
+                        <span class="c3 c1">&nbsp;You must comply with all domestic and international export laws and regulations that apply
                             to the software, which include restrictions on destinations, end users and end use. For further
                             information on export restrictions, visit (aka.ms/exporting).</span>
                     </p>
-                    <p class="c3 c9">
+                    <p class="c2">
-                        <span class="c0 c5">10.</span>
+                        <span class="c5 c1">10.</span>
-                        <span class="c0">&nbsp;</span>
+                        <span class="c1">&nbsp;</span>
-                        <span class="c0 c5">SUPPORT SERVICES. </span>
+                        <span class="c5 c1">SUPPORT SERVICES. </span>
-                        <span class="c0 c2">Because the software is &ldquo;as is,&rdquo; we may not provide support services for it.</span>
+                        <span class="c3 c1">Because the software is &ldquo;as is,&rdquo; we may not provide support services for it.</span>
                     </p>
-                    <p class="c3 c9">
+                    <p class="c2">
-                        <span class="c0 c5">11.</span>
+                        <span class="c5 c1">11.</span>
-                        <span class="c0">&nbsp;</span>
+                        <span class="c1">&nbsp;</span>
-                        <span class="c0 c5">ENTIRE AGREEMENT.</span>
+                        <span class="c5 c1">ENTIRE AGREEMENT.</span>
-                        <span class="c2 c0">&nbsp;This agreement, and the terms for supplements, updates, Internet-based services and support
+                        <span class="c3 c1">&nbsp;This agreement, and the terms for supplements, updates, Internet-based services and support
                             services that you use, are the entire agreement for the software and support services.</span>
                     </p>
-                    <p class="c3 c9">
+                    <p class="c2">
-                        <span class="c0 c5">12.</span>
+                        <span class="c5 c1">12.</span>
-                        <span class="c0">&nbsp;</span>
+                        <span class="c1">&nbsp;</span>
-                        <span class="c0 c5">APPLICABLE LAW. </span>
+                        <span class="c5 c1">APPLICABLE LAW. </span>
-                        <span class="c2 c0">If you acquired the software in the United States, Washington State law applies to interpretation
+                        <span class="c3 c1">If you acquired the software in the United States, Washington State law applies to interpretation
                             of and claims for breach of this agreement, and the laws of the state where you live apply to
                             all other claims. If you acquired the software in any other country, its laws apply.</span>
                     </p>
-                    <p class="c3 c9">
+                    <p class="c2">
-                        <span class="c0 c5">13.</span>
+                        <span class="c5 c1">13.</span>
-                        <span class="c0">&nbsp;</span>
+                        <span class="c1">&nbsp;</span>
-                        <span class="c0 c5">CONSUMER RIGHTS; REGIONAL VARIATIONS. </span>
+                        <span class="c5 c1">CONSUMER RIGHTS; REGIONAL VARIATIONS. </span>
-                        <span class="c2 c0">This agreement describes certain legal rights. You may have other rights, including consumer rights,
+                        <span class="c3 c1">This agreement describes certain legal rights. You may have other rights, including consumer rights,
                             under the laws of your state or country. Separate and apart from your relationship with Microsoft,
                             you may also have rights with respect to the party from which you acquired the software. This
                             agreement does not change those other rights if the laws of your state or country do not permit
                             it to do so. For example, if you acquired the software in one of the below regions, or mandatory
                             country law applies, then the following provisions apply to you:</span>
                     </p>
-                    <p class="c3 c7">
+                    <p class="c8">
-                        <span class="c0 c5">a.</span>
+                        <span class="c5 c1">a.</span>
-                        <span class="c0">&nbsp; &nbsp;</span>
+                        <span class="c1">&nbsp; &nbsp;</span>
-                        <span class="c0 c5">Australia. </span>
+                        <span class="c5 c1">Australia. </span>
-                        <span class="c2 c0">You have statutory guarantees under the Australian Consumer Law and nothing in this agreement is
+                        <span class="c3 c1">You have statutory guarantees under the Australian Consumer Law and nothing in this agreement is
                             intended to affect those rights.</span>
                     </p>
-                    <p class="c3 c7">
+                    <p class="c8">
-                        <span class="c0 c5">b.</span>
+                        <span class="c5 c1">b.</span>
-                        <span class="c0">&nbsp; &nbsp;</span>
+                        <span class="c1">&nbsp; &nbsp;</span>
-                        <span class="c0 c5">Canada. </span>
+                        <span class="c5 c1">Canada. </span>
-                        <span class="c2 c0">If you acquired the software in Canada, you may stop receiving updates by turning off the automatic
+                        <span class="c3 c1">If you acquired the software in Canada, you may stop receiving updates by turning off the automatic
                             update feature, disconnecting your device from the Internet (if and when you re-connect to the
                             Internet, however, the software will resume checking for and installing updates), or uninstalling
                             the software. The product documentation, if any, may also specify how to turn off updates for
                             your specific device or software.</span>
                     </p>
-                    <p class="c3 c7">
-                        <span class="c0 c5">c.</span>
-                        <span class="c0">&nbsp; &nbsp;</span>
-                        <span class="c0 c5">Germany and Austria</span>
-                        <span class="c2 c0">.</span>
-                    </p>
                     <p class="c8">
-                        <span class="c0 c5">(i)</span>
+                        <span class="c5 c1">c.</span>
-                        <span class="c0">&nbsp; &nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                        <span class="c1">&nbsp; &nbsp;</span>
-                        <span class="c0 c5">Warranty</span>
+                        <span class="c5 c1">Germany and Austria</span>
-                        <span class="c2 c0">. The properly licensed software will perform substantially as described in any Microsoft materials
+                        <span class="c3 c1">.</span>
+                    </p>
+                    <p class="c6">
+                        <span class="c5 c1">(i)</span>
+                        <span class="c1">&nbsp; &nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                        <span class="c5 c1">Warranty</span>
+                        <span class="c3 c1">. The properly licensed software will perform substantially as described in any Microsoft materials
                             that accompany the software. However, Microsoft gives no contractual guarantee in relation to
                             the licensed software.</span>
                     </p>
-                    <p class="c8">
+                    <p class="c6">
-                        <span class="c6 c0 c5">&nbsp;</span>
+                        <span class="c4 c1">&nbsp;</span>
                     </p>
-                    <p class="c8">
+                    <p class="c6">
-                        <span class="c0 c5">(ii)</span>
+                        <span class="c5 c1">(ii)</span>
-                        <span class="c0">&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                        <span class="c1">&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-                        <span class="c0 c5">Limitation of Liability</span>
+                        <span class="c5 c1">Limitation of Liability</span>
-                        <span class="c2 c0">. In case of intentional conduct, gross negligence, claims based on the Product Liability Act, as
+                        <span class="c3 c1">. In case of intentional conduct, gross negligence, claims based on the Product Liability Act, as
                             well as, in case of death or personal or physical injury, Microsoft is liable according to the
                             statutory law.</span>
                     </p>
-                    <p class="c3 c15">
+                    <p class="c10">
-                        <span class="c2 c0">Subject to the foregoing clause (ii), Microsoft will only be liable for slight negligence if Microsoft
+                        <span class="c3 c1">Subject to the foregoing clause (ii), Microsoft will only be liable for slight negligence if Microsoft
                             is in breach of such material contractual obligations, the fulfillment of which facilitate the
                             due performance of this agreement, the breach of which would endanger the purpose of this agreement
                             and the compliance with which a party may constantly trust in (so-called &quot;cardinal obligations&quot;).
                             In other cases of slight negligence, Microsoft will not be liable for slight negligence.</span>
                     </p>
-                    <p class="c3 c9">
+                    <p class="c2">
-                        <span class="c0 c5">14.</span>
+                        <span class="c5 c1">14.</span>
-                        <span class="c0">&nbsp;</span>
+                        <span class="c1">&nbsp;</span>
-                        <span class="c0 c5">LEGAL EFFECT.</span>
+                        <span class="c5 c1">LEGAL EFFECT.</span>
-                        <span class="c2 c0">&nbsp;This agreement describes certain legal rights. You may have other rights under the laws of
+                        <span class="c3 c1">&nbsp;This agreement describes certain legal rights. You may have other rights under the laws of
                             your country. You may also have rights with respect to the party from whom you acquired the software.
                             This agreement does not change your rights under the laws of your country if the laws of your
                             country do not permit it to do so.</span>
                     </p>
-                    <p class="c3 c9">
+                    <p class="c2">
-                        <span class="c0 c5">15.</span>
+                        <span class="c5 c1">15.</span>
-                        <span class="c0">&nbsp;</span>
+                        <span class="c1">&nbsp;</span>
-                        <span class="c6 c0 c5">DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED &ldquo;AS-IS.&rdquo; &nbsp;YOU BEAR THE RISK OF
+                        <span class="c4 c1">DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED &ldquo;AS-IS.&rdquo; &nbsp;YOU BEAR THE RISK OF
                             USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. TO THE EXTENT PERMITTED
                             UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
                             FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.</span>
                     </p>
-                    <p class="c3 c9">
+                    <p class="c2">
-                        <span class="c0 c5">16.</span>
+                        <span class="c5 c1">16.</span>
-                        <span class="c0">&nbsp;</span>
+                        <span class="c1">&nbsp;</span>
-                        <span class="c6 c0 c5">LIMITATION ON AND EXCLUSION OF DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT
+                        <span class="c4 c1">LIMITATION ON AND EXCLUSION OF DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT
                             DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST
                             PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.</span>
                     </p>
-                    <p class="c3 c13">
+                    <p class="c0">
-                        <span class="c2 c0">This limitation applies to (a) anything related to the software, services, content (including code)
+                        <span class="c3 c1">This limitation applies to (a) anything related to the software, services, content (including code)
                             on third party Internet sites, or third party programs; and (b) claims for breach of contract,
                             breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the
                             extent permitted by applicable law.</span>
                     </p>
-                    <p class="c3 c13">
+                    <p class="c0">
-                        <span class="c2 c0">It also applies even if Microsoft knew or should have known about the possibility of the damages.
+                        <span class="c3 c1">It also applies even if Microsoft knew or should have known about the possibility of the damages.
                             The above limitation or exclusion may not apply to you because your country may not allow the
                             exclusion or limitation of incidental, consequential or other damages.</span>
                     </p>
-                    <p class="c3">
+                    <p class="c12">
-                        <span class="c6 c0 c5">Please note: As the software is distributed in Quebec, Canada, some of the clauses in this agreement
+                        <span class="c4 c1">Please note: As the software is distributed in Quebec, Canada, some of the clauses in this agreement
                             are provided below in French.</span>
                     </p>
-                    <p class="c3">
+                    <p class="c12">
-                        <span class="c0 c5 c6">Remarque : Ce logiciel &eacute;tant distribu&eacute; au Qu&eacute;bec, Canada, certaines des clauses
+                        <span class="c4 c1">Remarque : Ce logiciel &eacute;tant distribu&eacute; au Qu&eacute;bec, Canada, certaines des clauses
                             dans ce contrat sont fournies ci-dessous en fran&ccedil;ais.</span>
                     </p>
-                    <p class="c12">
+                    <p class="c11">
-                        <span class="c0 c5">EXON&Eacute;RATION DE GARANTIE.</span>
+                        <span class="c5 c1">EXON&Eacute;RATION DE GARANTIE.</span>
-                        <span class="c2 c0">&nbsp;Le logiciel vis&eacute; par une licence est offert &laquo; tel quel &raquo;. Toute utilisation
+                        <span class="c1 c3">&nbsp;Le logiciel vis&eacute; par une licence est offert &laquo; tel quel &raquo;. Toute utilisation
                             de ce logiciel est &agrave; votre seule risque et p&eacute;ril. Microsoft n&rsquo;accorde aucune
                             autre garantie expresse. Vous pouvez b&eacute;n&eacute;ficier de droits additionnels en vertu
                             du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles
@@ -636,58 +703,70 @@
                             &agrave; un usage particulier et d&rsquo;absence de contrefa&ccedil;on sont exclues.
                         </span>
                     </p>
-                    <p class="c12">
+                    <p class="c11">
-                        <span class="c0 c5">LIMITATION DES DOMMAGES-INT&Eacute;R&Ecirc;TS ET EXCLUSION DE RESPONSABILIT&Eacute; POUR LES DOMMAGES.</span>
+                        <span class="c5 c1">LIMITATION DES DOMMAGES-INT&Eacute;R&Ecirc;TS ET EXCLUSION DE RESPONSABILIT&Eacute; POUR LES DOMMAGES.</span>
-                        <span class="c2 c0">&nbsp;Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages
+                        <span class="c3 c1">&nbsp;Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages
                             directs uniquement &agrave; hauteur de 5,00 $ US. Vous ne pouvez pr&eacute;tendre &agrave; aucune
                             indemnisation pour les autres dommages, y compris les dommages sp&eacute;ciaux, indirects ou
                             accessoires et pertes de b&eacute;n&eacute;fices.</span>
                     </p>
-                    <p class="c3">
+                    <p class="c12">
-                        <span class="c2 c0">Cette limitation concerne :</span>
+                        <span class="c3 c1">Cette limitation concerne :</span>
                     </p>
-                    <p class="c3">
+                    <p class="c2">
-                        <span class="c2 c0">- &nbsp; &nbsp; &nbsp; &nbsp; tout ce qui est reli&eacute; au logiciel, aux services ou au contenu
+                        <span class="c3 c1">- &nbsp; &nbsp; &nbsp; &nbsp; tout ce qui est reli&eacute; au logiciel, aux services ou au contenu
                             (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et</span>
                     </p>
-                    <p class="c3">
+                    <p class="c2">
-                        <span class="c2 c0">- &nbsp; &nbsp; &nbsp; &nbsp; les r&eacute;clamations au titre de violation de contrat ou de garantie,
+                        <span class="c3 c1">- &nbsp; &nbsp; &nbsp; &nbsp; les r&eacute;clamations au titre de violation de contrat ou de garantie,
                             ou au titre de responsabilit&eacute; stricte, de n&eacute;gligence ou d&rsquo;une autre faute
                             dans la limite autoris&eacute;e par la loi en vigueur.</span>
                     </p>
-                    <p class="c3">
+                    <p class="c12">
-                        <span class="c2 c0">Elle s&rsquo;applique &eacute;galement, m&ecirc;me si Microsoft connaissait ou devrait conna&icirc;tre
+                        <span class="c3 c1">Elle s&rsquo;applique &eacute;galement, m&ecirc;me si Microsoft connaissait ou devrait conna&icirc;tre
                             l&rsquo;&eacute;ventualit&eacute; d&rsquo;un tel dommage. Si votre pays n&rsquo;autorise pas
                             l&rsquo;exclusion ou la limitation de responsabilit&eacute; pour les dommages indirects, accessoires
                             ou de quelque nature que ce soit, il se peut que la limitation ou l&rsquo;exclusion ci-dessus
                             ne s&rsquo;appliquera pas &agrave; votre &eacute;gard.</span>
                     </p>
-                    <p class="c17">
+                    <p class="c16">
-                        <span class="c0 c5">EFFET JURIDIQUE.</span>
+                        <span class="c5 c1">EFFET JURIDIQUE.</span>
-                        <span class="c2 c0">&nbsp;Le pr&eacute;sent contrat d&eacute;crit certains droits juridiques. Vous pourriez avoir d&rsquo;autres
+                        <span class="c3 c1">&nbsp;Le pr&eacute;sent contrat d&eacute;crit certains droits juridiques. Vous pourriez avoir d&rsquo;autres
                             droits pr&eacute;vus par les lois de votre pays. Le pr&eacute;sent contrat ne modifie pas les
                             droits que vous conf&egrave;rent les lois de votre pays si celles-ci ne le permettent pas.</span>
                     </p>
-                    <p class="c17 c16">
+                    <p class="c15">
-                        <span class="c2 c0"></span>
+                        <span class="c3 c1"></span>
                     </p>
-                    <p class="c12">
+                    <p class="c16">
-                        <span class="c2 c0">&nbsp;</span>
+                        <span class="c3 c1">&nbsp;</span>
                     </p>
-                    <p class="c12 c16">
+                    <p class="c11">
-                        <span class="c2 c10"></span>
+                        <span class="c3 c1">LEGO, the LEGO logo, MINDSTORMS and the MINDSTORMS EV3 logo are trademarks and/ or copyrights of
+                            the LEGO Group. &copy;2018 The LEGO Group. All rights reserved.</span>
+                    </p>
+                    <p class="c11">
+                        <span class="c3 c1">&nbsp;</span>
+                    </p>
+                    <p class="c20">
+                        <span class="c5 c1 c13">Remainder of this page intentionally left blank.</span>
+                    </p>
+                    <p class="c7">
+                        <span class="c3 c19"></span>
                     </p>
                 </div>
             </div>
             <div class="ui center aligned segment">
                 <input id="agree-checkbox" type="checkbox" autocomplete="off" onchange="agreeCheckboxChanged(this)">
-                <label for="agree-checkbox">I agree to the terms</label>
+                <label for="agree-checkbox">I agree to these Microsoft Software License Terms and to the
+                    <a href="https://privacy.microsoft.com/en-us/privacystatement">Microsoft Privacy Statement.</a>
+                </label>
             </div>
             <div id="download-segment" class="ui center aligned segment hidden">
                 <h3 class="ui">Windows</h3>
-                <button class="ui icon button" onclick="downloadWin32()">
+                <button class="ui icon button" onclick="downloadWin64()">
                     <i class="download icon"></i>
-                    makecode-ev3-setup-win32.exe
+                    makecode-ev3-setup-win64.exe
                 </button>
             </div>
         </div>

docs/tutorials/run-motors.md

@@ -66,7 +66,7 @@ brick.buttonDown.onEvent(ButtonEvent.Pressed, function () {
 
 ## Step 5
 
-Now, let’s add a Medium motor, and tell it how many rotations we want it to run for. Open the ``||brick:Brick||`` Toolbox drawer. Drag out **2** ``|brick:on button||`` blocks. In the ``||brick:on button||`` blocks, use the drop-down menu to select the ``left`` and ``right`` buttons.
+Open the ``||brick:Brick||`` Toolbox drawer and drag out **2** ``|brick:on button||`` blocks. In the ``||brick:on button||`` blocks, use the drop-down menu to select the ``left`` and ``right`` buttons.
 
 ```blocks
 brick.buttonUp.onEvent(ButtonEvent.Pressed, function () {

docs/tutorials/what-animal-am-i.md

@@ -16,7 +16,7 @@ brick.showString("Hello world", 1)
 
 ## Step 2
 
-In the ``||brick:show string||`` block, type the text ``"Guess teh animal"`` to replace ``"Hello world"``.
+In the ``||brick:show string||`` block, type the text ``"Guess the animal"`` to replace ``"Hello world"``.
 
 ```blocks
 brick.showString("Guess the animal", 1)

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "pxt-ev3",
-  "version": "0.3.4",
+  "version": "0.4.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pxt-ev3",
-  "version": "0.3.4",
+  "version": "0.4.2",
   "description": "LEGO MINDSTORMS EV3 for Microsoft MakeCode",
   "private": true,
   "keywords": [
@@ -39,8 +39,8 @@
     "webfonts-generator": "^0.4.0"
   },
   "dependencies": {
-    "pxt-common-packages": "0.23.38",
+    "pxt-common-packages": "0.23.45",
-    "pxt-core": "3.20.8"
+    "pxt-core": "3.21.7"
   },
   "scripts": {
     "test": "node node_modules/pxt-core/built/pxt.js travis"

pxtarget.json

@@ -87,15 +87,15 @@
         "cardLogo": "./static/icons/android-chrome-192x192.png",
         "appLogo": "./static/icons/android-chrome-192x192.png",
         "organization": "Microsoft MakeCode",
-        "organizationUrl": "https://makecode.com/",
+        "organizationUrl": "https://makecode.com/org",
         "organizationLogo": "./static/Microsoft-logo_rgb_c-gray-square.png",
         "organizationWideLogo": "./static/Microsoft-logo_rgb_c-gray.png",
-        "homeUrl": "https://makecode.legoeducation.com/",
+        "homeUrl": "https://makecode.mindstorms.com/",
-        "embedUrl": "https://makecode.legoeducation.com/",
+        "embedUrl": "https://makecode.mindstorms.com/",
         "privacyUrl": "https://go.microsoft.com/fwlink/?LinkId=521839",
         "termsOfUseUrl": "https://go.microsoft.com/fwlink/?LinkID=206977",
         "githubUrl": "https://github.com/Microsoft/pxt-ev3",
-        "betaUrl": "https://makecode.legoeducation.com/about",
+        "betaUrl": "https://makecode.mindstorms.com/about",
         "driveDisplayName": "EV3",
         "boardName": "LEGO® MINDSTORMS® Education EV3",
         "copyrightText": "LEGO, the LEGO logo, MINDSTORMS and the MINDSTORMS EV3 logo are trademarks and/ or copyrights of the LEGO Group. ©2018 The LEGO Group. All rights reserved.",

targetconfig.json

@@ -15,6 +15,6 @@
         "Maker": "maker"
     },
     "electronManifest": {
-        "latest": "v0.1.60"
+        "latest": "v0.3.6"
     }
 }

theme/blockly.less

@@ -33,11 +33,12 @@
 
 /* Music field editor */
 
-.blocklyDropdownText {
+.blocklyMusicFieldOptions .blocklyDropdownText, .blocklyMusicFieldCategories .blocklyDropdownText {
     display: flex;
     justify-content: center;
     line-height: 1.5rem;
     color: #fff;
+    font-size: 13px;
 }
 
 .blocklyMusicFieldCategories {
@@ -47,6 +48,7 @@
     right: 0;
     top: 0;
     width: 100%;
+    font-size: 13px;
 }
 .blocklyMusicFieldOptions {
     margin-top: 80px;