From 6e7144df6aef496fdec9be6dddfa90ead419f4ef Mon Sep 17 00:00:00 2001
From: badvision <brendan.robert@gmail.com>
Date: Mon, 3 Jul 2017 10:39:06 -0500
Subject: [PATCH 1/3] Updated POM dependencies to newer versions of things. 
 Because OOOoooo SHINY!

---
 OutlawEditor/pom.xml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/OutlawEditor/pom.xml b/OutlawEditor/pom.xml
index 29de056d..a1abf1a9 100644
--- a/OutlawEditor/pom.xml
+++ b/OutlawEditor/pom.xml
@@ -22,7 +22,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-scr-plugin</artifactId>
-                <version>1.22.0</version>
+                <version>1.24.0</version>
                 <executions>
                     <execution>
                         <id>generate-scr-scrdescriptor</id>
@@ -40,7 +40,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>3.0.1</version>
+                <version>3.3.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
@@ -88,12 +88,12 @@
                     <source>1.8</source>
                     <target>1.8</target>
                 </configuration>
-                <version>3.6.0</version>
+                <version>3.6.1</version>
             </plugin>
             <plugin>
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.13.1</version>
+                <version>0.13.2</version>
                 <executions>
                     <execution>
                         <goals>
@@ -113,7 +113,7 @@
                                 <plugin>                                                                
                                     <groupId>org.jvnet.jaxb2_commons</groupId>
                                     <artifactId>jaxb2-basics</artifactId>
-                                    <version>1.11.1</version>
+                                    <version>0.11.1</version>
                                 </plugin>
                             </plugins>
                         </configuration>
@@ -135,37 +135,37 @@
         <dependency>
             <groupId>org.jvnet.jaxb2_commons</groupId>
             <artifactId>jaxb2-basics</artifactId>
-            <version>0.11.0</version>
+            <version>0.11.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
-            <version>5.4.0</version>
+            <version>5.6.4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.main</artifactId>
-            <version>5.4.0</version>
+            <version>5.6.4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr.annotations</artifactId>
-            <version>1.10.0</version>
+            <version>1.12.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr</artifactId>
-            <version>2.0.2</version>
+            <version>2.0.12</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>3.14</version>
+            <version>3.16</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>3.14</version>
+            <version>3.16</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file

From c13befd4146860583eb4f4223dbe9721c04854eb Mon Sep 17 00:00:00 2001
From: badvision <brendan.robert@gmail.com>
Date: Mon, 3 Jul 2017 10:40:09 -0500
Subject: [PATCH 2/3] Removed unused imports

---
 .../outlaweditor/ui/MythosScriptEditorController.java          | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/MythosScriptEditorController.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/MythosScriptEditorController.java
index 52e2eb34..f52e8661 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/MythosScriptEditorController.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/ui/MythosScriptEditorController.java
@@ -20,9 +20,6 @@ import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.scene.control.MenuItem;
-import javafx.scene.control.TextInputDialog;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
 import javafx.scene.web.PromptData;
 import javafx.scene.web.WebView;
 import netscape.javascript.JSObject;

From 12e7407b5a8d8a8f3ee93912d375be00af5ecb98 Mon Sep 17 00:00:00 2001
From: badvision <brendan.robert@gmail.com>
Date: Mon, 3 Jul 2017 10:41:36 -0500
Subject: [PATCH 3/3] Added hack to inject namespace into blockly XML because
 Stupid java introduced a stupid breaking change to their stupid XML parsing
 logic for no valid reason.  Just all stupid.  Also I'm grumpy about this. 
 HEY JAVA DEVS: NO BREAKING CHANGES DURING POINT RELEASES!

---
 .../main/java/org/badvision/outlaweditor/MythosEditor.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java
index 2f7be0f2..281d0cc3 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/MythosEditor.java
@@ -13,15 +13,14 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javafx.fxml.FXMLLoader;
@@ -109,7 +108,8 @@ public class MythosEditor {
 
     public void applyChanges() {
         try {
-            String xml = controller.getScriptXml();
+            String xml = controller.getScriptXml()
+                    .replaceFirst(Pattern.quote("<block"), "<block xmlns=\"outlaw\"");
             JAXBContext context = JAXBContext.newInstance("org.badvision.outlaweditor.data.xml");
             Unmarshaller unmarshaller = context.createUnmarshaller();
             DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();