From c12e405467cc31325fcb5bfe2904db45b8985b0b Mon Sep 17 00:00:00 2001
From: Daniel_M_Williams <equipoise@gmail.com>
Date: Sat, 15 Feb 2020 08:42:40 -0500
Subject: [PATCH 1/2] [fix] local JDK pathing fixes to make branch work on my
 machine

---
 .idea/misc.xml                                | 2 +-
 .idea/runConfigurations/Openrocket_UI_Jar.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6f34b5b64..0df800997 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -46,7 +46,7 @@
       </profile-state>
     </entry>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" project-jdk-name="Oracle JDK 11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Openrocket_UI_Jar.xml b/.idea/runConfigurations/Openrocket_UI_Jar.xml
index 633c05286..a701b0db8 100644
--- a/.idea/runConfigurations/Openrocket_UI_Jar.xml
+++ b/.idea/runConfigurations/Openrocket_UI_Jar.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="Openrocket UI Jar" type="JarApplication">
     <option name="JAR_PATH" value="build/jar/OpenRocket.jar" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-    <option name="ALTERNATIVE_JRE_PATH" value="11" />
+    <option name="ALTERNATIVE_JRE_PATH" value="Oracle JDK 11" />
     <method v="2">
       <option name="BuildArtifacts" enabled="true">
         <artifact name="openrocket:jar" />

From aeab0c3d81a177a758d5e9a39da8c01c296214b4 Mon Sep 17 00:00:00 2001
From: Daniel_M_Williams <equipoise@gmail.com>
Date: Wed, 19 Feb 2020 22:30:32 -0500
Subject: [PATCH 2/2] [fix] added example rockets to jarfile

---
 core/OpenRocket Core.iml   | 1 +
 swing/OpenRocket Swing.iml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/core/OpenRocket Core.iml b/core/OpenRocket Core.iml
index eca58a704..046a03158 100644
--- a/core/OpenRocket Core.iml	
+++ b/core/OpenRocket Core.iml	
@@ -30,6 +30,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src-extra" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="inheritedJdk" />
diff --git a/swing/OpenRocket Swing.iml b/swing/OpenRocket Swing.iml
index 95b144e5f..52132d387 100644
--- a/swing/OpenRocket Swing.iml	
+++ b/swing/OpenRocket Swing.iml	
@@ -30,6 +30,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="inheritedJdk" />