Merge branch 'develop'

gbmhunter · Sep 21, 2016 · 34876d5 · 34876d5
2 parents 62fa160 + 55ad374
commit 34876d5
Show file tree

Hide file tree

Showing 110 changed files with 7,006 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,63 @@
+# Created by .ignore support plugin (hsz.mobi)
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/workspace.xml
+.idea/tasks.xml
+#.idea/dictionaries
+#.idea/vcs.xml
+#.idea/jsLibraryMappings.xml
+
+# Sensitive or high-churn files:
+#.idea/dataSources.ids
+#.idea/dataSources.xml
+#.idea/dataSources.local.xml
+#.idea/sqlDataSources.xml
+#.idea/dynamic.xml
+#.idea/uiDesigner.xml
+
+# Gradle:
+#.idea/gradle.xml
+#.idea/libraries
+
+# Mongo Explorer plugin:
+#.idea/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+#.idea_modules/
+
+# JIRA plugin
+#atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+#com_crashlytics_export_strings.xml
+#crashlytics.properties
+#crashlytics-build.properties
+#fabric.properties
+
+### Java template
+#*.class
+
+# Mobile Tools for Java (J2ME)
+#.mtj.tmp/
+
+# Package Files #
+#*.jar
+#*.war
+#*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+#hs_err_pid*
+
+# Installer-generated files
+/install/
diff --git a/.idea/artifacts/NinjaTerm_jar.xml b/.idea/artifacts/NinjaTerm_jar.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/description.html b/.idea/description.html
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/libraries/controlsfx_8_40_11.xml b/.idea/libraries/controlsfx_8_40_11.xml
diff --git a/.idea/libraries/i4jruntime.xml b/.idea/libraries/i4jruntime.xml
diff --git a/.idea/libraries/junit_junit_4_12.xml b/.idea/libraries/junit_junit_4_12.xml
diff --git a/.idea/libraries/org_jfxtras_jfxtras_controls_8_0_r5.xml b/.idea/libraries/org_jfxtras_jfxtras_controls_8_0_r5.xml
diff --git a/.idea/libraries/org_scream3r_jssc_2_8_0.xml b/.idea/libraries/org_scream3r_jssc_2_8_0.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/uiDesigner.xml b/.idea/uiDesigner.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/NinjaTerm.iml b/NinjaTerm.iml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <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="org.scream3r:jssc:2.8.0" level="project" />
+    <orderEntry type="library" name="junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="controlsfx-8.40.11" level="project" />
+    <orderEntry type="library" name="org.jfxtras:jfxtras-controls:8.0-r5" level="project" />
+    <orderEntry type="library" name="i4jruntime" level="project" />
+  </component>
+</module>