Merge pull request #3 from BlueHuskyStudios/dev

Merge in changes from dev
BlueHuskyStudios · Feb 2, 2019 · e6f1b61 · e6f1b61
2 parents 6887f49 + 075b487
commit e6f1b61
Show file tree

Hide file tree

Showing 40 changed files with 577 additions and 1,651 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,9 @@
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+
+\.idea/workspace\.xml
+
+\.DS_Store
+
+out/
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/dictionaries/ben.xml b/.idea/dictionaries/ben.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/libraries/KotlinJavaRuntime.xml b/.idea/libraries/KotlinJavaRuntime.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/JVM/Husky UI.iml → Husky UI Core.iml b/JVM/Husky UI.iml → Husky UI Core.iml
@@ -1,15 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="kotlin-language" name="Kotlin">
+      <configuration version="3" platform="JVM 1.8">
+        <compilerSettings />
+        <compilerArguments>
+          <option name="jvmTarget" value="1.8" />
+        </compilerArguments>
+      </configuration>
+    </facet>
+  </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
-    <orderEntry type="module" module-name="Blue Base" exported="" />
     <orderEntry type="module-library" scope="TEST">
       <library name="JUnit4">
         <CLASSES>
@@ -20,5 +28,7 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module" module-name="Blue-Base" />
+    <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
diff --git a/JVM/.idea/compiler.xml b/JVM/.idea/compiler.xml
diff --git a/JVM/.idea/copyright/profiles_settings.xml b/JVM/.idea/copyright/profiles_settings.xml
diff --git a/JVM/.idea/encodings.xml b/JVM/.idea/encodings.xml
diff --git a/JVM/.idea/libraries/KotlinJavaRuntime.xml b/JVM/.idea/libraries/KotlinJavaRuntime.xml
diff --git a/JVM/.idea/misc.xml b/JVM/.idea/misc.xml
diff --git a/JVM/.idea/modules.xml b/JVM/.idea/modules.xml