From e01adbaa371502c625cc4bc8f72fa0c4c603b6fd Mon Sep 17 00:00:00 2001
From: Eric Rosenbaum <eric.rosenbaum@gmail.com>
Date: Mon, 2 Oct 2017 12:19:00 -0400
Subject: [PATCH 1/5] =?UTF-8?q?Load=20the=20gui=E2=80=99s=20toolbox=20on?=
 =?UTF-8?q?=20mount?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

To prevent loading scratch-blocks default toolbox
---
 src/containers/blocks.jsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/containers/blocks.jsx b/src/containers/blocks.jsx
index b15718483..f4c381001 100644
--- a/src/containers/blocks.jsx
+++ b/src/containers/blocks.jsx
@@ -56,6 +56,9 @@ class Blocks extends React.Component {
         const workspaceConfig = defaultsDeep({}, Blocks.defaultOptions, this.props.options);
         this.workspace = this.ScratchBlocks.inject(this.blocks, workspaceConfig);
 
+        // Load the toolbox from the GUI (otherwise we get the scratch-blocks default toolbox)
+        this.workspace.updateToolbox(makeToolboxXML());
+
         // @todo change this when blockly supports UI events
         addFunctionListener(this.workspace, 'translate', this.onWorkspaceMetricsChange);
         addFunctionListener(this.workspace, 'zoom', this.onWorkspaceMetricsChange);

From b24970f271073c58be9fa2f0ec9b71aec5003d7d Mon Sep 17 00:00:00 2001
From: Eric Rosenbaum <eric.rosenbaum@gmail.com>
Date: Mon, 2 Oct 2017 12:23:29 -0400
Subject: [PATCH 2/5] Re-order categories

---
 src/lib/make-toolbox-xml.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/make-toolbox-xml.js b/src/lib/make-toolbox-xml.js
index cbdbf771e..442a4ad29 100644
--- a/src/lib/make-toolbox-xml.js
+++ b/src/lib/make-toolbox-xml.js
@@ -620,12 +620,12 @@ const makeToolboxXML = function (categoriesXML) {
         motion, gap,
         looks, gap,
         sound, gap,
-        pen, gap,
-        data, gap,
         events, gap,
         control, gap,
         sensing, gap,
-        operators
+        pen, gap,
+        operators, gap,
+        data
     ];
 
     if (categoriesXML) {

From 8f14d313df9d99ea72538fb25af0991ec5b2ed59 Mon Sep 17 00:00:00 2001
From: Eric Rosenbaum <eric.rosenbaum@gmail.com>
Date: Mon, 2 Oct 2017 13:54:59 -0400
Subject: [PATCH 3/5] =?UTF-8?q?Add=20the=20=E2=80=9Cglide=20to=E2=80=9D=20?=
 =?UTF-8?q?block=20back=20into=20toolbox=20xml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lib/make-toolbox-xml.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/lib/make-toolbox-xml.js b/src/lib/make-toolbox-xml.js
index 442a4ad29..7c26eb2bb 100644
--- a/src/lib/make-toolbox-xml.js
+++ b/src/lib/make-toolbox-xml.js
@@ -71,6 +71,17 @@ const motion = `
                 </shadow>
             </value>
         </block>
+        <block type="motion_glideto" id="motion_glideto">
+            <value name="SECS">
+                <shadow type="math_number">
+                    <field name="NUM">1</field>
+                </shadow>
+            </value>
+            <value name="TO">
+                <shadow type="motion_glideto_menu">
+                </shadow>
+            </value>
+        </block>
         <block type="motion_changexby">
             <value name="DX">
                 <shadow type="math_number">

From 8470b080dd28f35741ad412653a22f9c6e11613e Mon Sep 17 00:00:00 2001
From: Eric Rosenbaum <eric.rosenbaum@gmail.com>
Date: Tue, 3 Oct 2017 11:40:22 -0400
Subject: [PATCH 4/5] Use the existing value of the prop for the toolbox

---
 src/containers/blocks.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/containers/blocks.jsx b/src/containers/blocks.jsx
index f4c381001..7a2a4d908 100644
--- a/src/containers/blocks.jsx
+++ b/src/containers/blocks.jsx
@@ -57,7 +57,7 @@ class Blocks extends React.Component {
         this.workspace = this.ScratchBlocks.inject(this.blocks, workspaceConfig);
 
         // Load the toolbox from the GUI (otherwise we get the scratch-blocks default toolbox)
-        this.workspace.updateToolbox(makeToolboxXML());
+        this.workspace.updateToolbox(this.props.toolboxXML);
 
         // @todo change this when blockly supports UI events
         addFunctionListener(this.workspace, 'translate', this.onWorkspaceMetricsChange);

From 611a4c2542645a1e9bc4d78b7081bf6bbbbd872f Mon Sep 17 00:00:00 2001
From: Eric Rosenbaum <eric.rosenbaum@gmail.com>
Date: Tue, 3 Oct 2017 12:34:18 -0400
Subject: [PATCH 5/5] Add pen transparency blocks back into toolbox

---
 src/lib/make-toolbox-xml.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/lib/make-toolbox-xml.js b/src/lib/make-toolbox-xml.js
index 7c26eb2bb..598cec673 100644
--- a/src/lib/make-toolbox-xml.js
+++ b/src/lib/make-toolbox-xml.js
@@ -332,6 +332,20 @@ const pen = `
                 </shadow>
             </value>
         </block>
+        <block type="pen_changepentransparencyby" id="pen_changepentransparencyby">
+            <value name="TRANSPARENCY">
+                <shadow type="math_number">
+                    <field name="NUM">10</field>
+            </shadow>
+          </value>
+        </block>
+        <block type="pen_setpentransparencyto" id="pen_setpentransparencyto">
+            <value name="TRANSPARENCY">
+                <shadow type="math_number">
+                    <field name="NUM">50</field>
+                </shadow>
+            </value>
+        </block>
     </category>
 `;