Merge branch 'master' of https://github.com/DMDirc/Meta

.gitignore

@@ -7,11 +7,9 @@
 
 # IDEA generated files
 /atlassian-ide-plugin.xml
-/.idea/workspace.xml
-/.idea/uiDesigner.xml
-/.idea/libraries
+/.idea
 
-#Netbeans generated files
+# Netbeans generated files
 /.nb-gradle/private/
 
 # DMDirc development profile

.idea/.name

@@ -1 +0,0 @@
-dmdirc

.idea/audio.iml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:audio" external.linked.project.path="$MODULE_DIR$/plugins/audio" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/audio/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/audio/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/audio">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/audio/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/audio/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/audio/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/audio/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/audio/generated" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/audio/generated_tests" isTestSource="true" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/audio/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/audio/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/awaycolours.iml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:awaycolours" external.linked.project.path="$MODULE_DIR$/plugins/awaycolours" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/awaycolours/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/awaycolours/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/awaycolours">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/awaycolours/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/awaycolours/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/awaycolours/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/awaycolours/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/awaycolours/generated" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/awaycolours/generated_tests" isTestSource="true" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/awaycolours/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/awaycolours/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/calc.iml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:calc" external.linked.project.path="$MODULE_DIR$/plugins/calc" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/calc/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/calc/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/calc">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/calc/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/calc/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/calc/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/calc/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/calc/generated_tests" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/calc/generated" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/calc/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/calc/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/channelwho.iml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:channelwho" external.linked.project.path="$MODULE_DIR$/plugins/channelwho" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/channelwho/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/channelwho/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/channelwho">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/channelwho/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/channelwho/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/channelwho/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/channelwho/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/channelwho/generated" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/channelwho/generated_tests" isTestSource="true" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/channelwho/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/channelwho/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/client.iml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":client" external.linked.project.path="$MODULE_DIR$/client" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.dmdirc" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/client/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/client/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/client">
-      <sourceFolder url="file://$MODULE_DIR$/client/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/client/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/client/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/client/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/client/generated" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/client/generated_tests" isTestSource="true" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/client/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/client/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="util" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.jimfs:jimfs:1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="module" module-name="common" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
-  </component>
-</module>

.idea/codeStyleSettings.xml

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="100" />
-        <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="100" />
-        <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
-          <value />
-        </option>
-        <option name="IMPORT_LAYOUT_TABLE">
-          <value>
-            <package name="com.dmdirc" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="ch.qos.logback" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="com.google" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="java" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="javax" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="net.miginfocom" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="org" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="" withSubpackages="true" static="true" />
-          </value>
-        </option>
-        <option name="RIGHT_MARGIN" value="100" />
-        <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" />
-        <option name="JD_ADD_BLANK_AFTER_PARM_COMMENTS" value="true" />
-        <option name="JD_ADD_BLANK_AFTER_RETURN" value="true" />
-        <option name="JD_DO_NOT_WRAP_ONE_LINE_COMMENTS" value="true" />
-        <option name="JD_KEEP_EMPTY_PARAMETER" value="false" />
-        <option name="JD_KEEP_EMPTY_EXCEPTION" value="false" />
-        <option name="JD_KEEP_EMPTY_RETURN" value="false" />
-        <option name="WRAP_COMMENTS" value="true" />
-        <JavaCodeStyleSettings>
-          <option name="CLASS_NAMES_IN_JAVADOC" value="3" />
-        </JavaCodeStyleSettings>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-        <codeStyleSettings language="JAVA">
-          <option name="KEEP_LINE_BREAKS" value="false" />
-          <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
-          <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
-          <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-          <option name="ALIGN_MULTILINE_RESOURCES" value="false" />
-          <option name="ALIGN_MULTILINE_FOR" value="false" />
-          <option name="CALL_PARAMETERS_WRAP" value="1" />
-          <option name="METHOD_PARAMETERS_WRAP" value="1" />
-          <option name="RESOURCE_LIST_WRAP" value="1" />
-          <option name="EXTENDS_LIST_WRAP" value="1" />
-          <option name="THROWS_LIST_WRAP" value="1" />
-          <option name="EXTENDS_KEYWORD_WRAP" value="1" />
-          <option name="THROWS_KEYWORD_WRAP" value="1" />
-          <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
-          <option name="BINARY_OPERATION_WRAP" value="1" />
-          <option name="TERNARY_OPERATION_WRAP" value="1" />
-          <option name="FOR_STATEMENT_WRAP" value="1" />
-          <option name="ARRAY_INITIALIZER_WRAP" value="1" />
-          <option name="ASSIGNMENT_WRAP" value="1" />
-          <option name="ASSERT_STATEMENT_WRAP" value="1" />
-          <option name="IF_BRACE_FORCE" value="3" />
-          <option name="DOWHILE_BRACE_FORCE" value="3" />
-          <option name="WHILE_BRACE_FORCE" value="3" />
-          <option name="FOR_BRACE_FORCE" value="3" />
-          <option name="WRAP_LONG_LINES" value="true" />
-        </codeStyleSettings>
-      </value>
-    </option>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </component>
-</project>

.idea/com/google/common/base/annotations.xml

@@ -1,47 +0,0 @@
-<root>
-    <item name='com.google.common.base.Preconditions T checkNotNull(T)'>
-        <annotation name='org.jetbrains.annotations.Contract'>
-            <val val="&quot;null -&gt; fail&quot;"/>
-        </annotation>
-    </item>
-    <item name='com.google.common.base.Preconditions T checkNotNull(T, java.lang.Object)'>
-        <annotation name='org.jetbrains.annotations.Contract'>
-            <val val="&quot;null, _ -&gt; fail&quot;"/>
-        </annotation>
-    </item>
-    <item name='com.google.common.base.Preconditions T checkNotNull(T, java.lang.String, java.lang.Object...)'>
-        <annotation name='org.jetbrains.annotations.Contract'>
-            <val val="&quot;null, _, _ -&gt; fail&quot;"/>
-        </annotation>
-    </item>
-    <item name='com.google.common.base.Preconditions void checkArgument(boolean)'>
-        <annotation name='org.jetbrains.annotations.Contract'>
-            <val val="&quot;false -&gt; fail&quot;"/>
-        </annotation>
-    </item>
-    <item name='com.google.common.base.Preconditions void checkArgument(boolean, java.lang.Object)'>
-        <annotation name='org.jetbrains.annotations.Contract'>
-            <val val="&quot;false, _ -&gt; fail&quot;"/>
-        </annotation>
-    </item>
-    <item name='com.google.common.base.Preconditions void checkArgument(boolean, java.lang.String, java.lang.Object...)'>
-        <annotation name='org.jetbrains.annotations.Contract'>
-            <val val="&quot;false, _, _ -&gt; fail&quot;"/>
-        </annotation>
-    </item>
-    <item name='com.google.common.base.Preconditions void checkState(boolean)'>
-        <annotation name='org.jetbrains.annotations.Contract'>
-            <val val="&quot;false -&gt; fail&quot;"/>
-        </annotation>
-    </item>
-    <item name='com.google.common.base.Preconditions void checkState(boolean, java.lang.Object)'>
-        <annotation name='org.jetbrains.annotations.Contract'>
-            <val val="&quot;false, _ -&gt; fail&quot;"/>
-        </annotation>
-    </item>
-    <item name='com.google.common.base.Preconditions void checkState(boolean, java.lang.String, java.lang.Object...)'>
-        <annotation name='org.jetbrains.annotations.Contract'>
-            <val val="&quot;false, _, _ -&gt; fail&quot;"/>
-        </annotation>
-    </item>
-</root>

.idea/common.iml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":parser:common" external.linked.project.path="$MODULE_DIR$/parser/common" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.dmdirc.parser" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/parser/common/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/parser/common/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/parser/common">
-      <sourceFolder url="file://$MODULE_DIR$/parser/common/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/parser/common/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/parser/common/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/parser/common/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/parser/common/generated" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/parser/common/generated_tests" isTestSource="true" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/parser/common/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/parser/common/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
-  </component>
-</module>

.idea/compiler.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="true">
-        <outputRelativeToContentRoot value="true" />
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-  <component name="JavacSettings">
-    <option name="ADDITIONAL_OPTIONS_STRING" value="-Xlint:all,-processing,-try" />
-  </component>
-</project>

.idea/conditional_execute.iml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:conditional_execute" external.linked.project.path="$MODULE_DIR$/plugins/conditional_execute" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/conditional_execute/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/conditional_execute/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/conditional_execute">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/conditional_execute/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/conditional_execute/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/conditional_execute/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/conditional_execute/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/conditional_execute/generated" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/conditional_execute/generated_tests" isTestSource="true" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/conditional_execute/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/conditional_execute/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/contactlist.iml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:contactlist" external.linked.project.path="$MODULE_DIR$/plugins/contactlist" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/contactlist/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/contactlist/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/contactlist">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/contactlist/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/contactlist/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/contactlist/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/contactlist/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/contactlist/generated" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/contactlist/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/contactlist/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="ui_swing" exported="" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/copyright/DMDirc.xml

@@ -1,9 +0,0 @@
-<component name="CopyrightManager">
-  <copyright>
-    <option name="notice" value="Copyright (c) 2006-2015 DMDirc Developers&#10;&#10;Permission is hereby granted, free of charge, to any person obtaining a copy&#10;of this software and associated documentation files (the &quot;Software&quot;), to deal&#10;in the Software without restriction, including without limitation the rights&#10;to use, copy, modify, merge, publish, distribute, sublicense, and/or sell&#10;copies of the Software, and to permit persons to whom the Software is&#10;furnished to do so, subject to the following conditions:&#10;&#10;The above copyright notice and this permission notice shall be included in&#10;all copies or substantial portions of the Software.&#10;&#10;THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR&#10;IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,&#10;FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE&#10;AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER&#10;LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,&#10;OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE&#10;SOFTWARE." />
-    <option name="keyword" value="Copyright" />
-    <option name="allowReplaceKeyword" value="" />
-    <option name="myName" value="DMDirc" />
-    <option name="myLocal" value="true" />
-  </copyright>
-</component>

.idea/copyright/profiles_settings.xml

@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="DMDirc" />
-</component>

.idea/dcc.iml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:dcc" external.linked.project.path="$MODULE_DIR$/plugins/dcc" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/dcc/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/dcc/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/dcc">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/dcc/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/dcc/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/dcc/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/dcc/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/dcc/generated" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/dcc/generated_tests" isTestSource="true" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/dcc/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/dcc/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="ui_swing" exported="" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/dcop.iml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:dcop" external.linked.project.path="$MODULE_DIR$/plugins/dcop" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/dcop/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/dcop/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/dcop">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/dcop/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/dcop/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/dcop/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/dcop/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/dcop/generated" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/dcop/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/dcop/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/debug.iml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:debug" external.linked.project.path="$MODULE_DIR$/plugins/debug" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/debug/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/debug/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/debug">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/debug/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/debug/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/debug/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/debug/generated" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/debug/generated_tests" isTestSource="true" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/debug/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/debug/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/dns.iml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:dns" external.linked.project.path="$MODULE_DIR$/plugins/dns" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/dns/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/dns/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/dns">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/dns/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/dns/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/dns/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/dns/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/dns/generated" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/dns/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/dns/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/encodings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>

.idea/exec.iml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:exec" external.linked.project.path="$MODULE_DIR$/plugins/exec" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/exec/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/exec/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/exec">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/exec/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/exec/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/exec/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/exec/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/exec/generated" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/exec/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/exec/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/freedesktop_notifications.iml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:freedesktop_notifications" external.linked.project.path="$MODULE_DIR$/plugins/freedesktop_notifications" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/freedesktop_notifications/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/freedesktop_notifications/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/freedesktop_notifications">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/freedesktop_notifications/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/freedesktop_notifications/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/freedesktop_notifications/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/freedesktop_notifications/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/freedesktop_notifications/generated" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/freedesktop_notifications/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/freedesktop_notifications/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/gradle.xml

@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/client" />
-            <option value="$PROJECT_DIR$/parser" />
-            <option value="$PROJECT_DIR$/parser/common" />
-            <option value="$PROJECT_DIR$/parser/irc" />
-            <option value="$PROJECT_DIR$/parser/xmpp" />
-            <option value="$PROJECT_DIR$/plugins" />
-            <option value="$PROJECT_DIR$/plugins/activewindow" />
-            <option value="$PROJECT_DIR$/plugins/audio" />
-            <option value="$PROJECT_DIR$/plugins/awaycolours" />
-            <option value="$PROJECT_DIR$/plugins/calc" />
-            <option value="$PROJECT_DIR$/plugins/channelwho" />
-            <option value="$PROJECT_DIR$/plugins/conditional_execute" />
-            <option value="$PROJECT_DIR$/plugins/contactlist" />
-            <option value="$PROJECT_DIR$/plugins/dcc" />
-            <option value="$PROJECT_DIR$/plugins/dcop" />
-            <option value="$PROJECT_DIR$/plugins/debug" />
-            <option value="$PROJECT_DIR$/plugins/dns" />
-            <option value="$PROJECT_DIR$/plugins/exec" />
-            <option value="$PROJECT_DIR$/plugins/freedesktop_notifications" />
-            <option value="$PROJECT_DIR$/plugins/identd" />
-            <option value="$PROJECT_DIR$/plugins/jpq" />
-            <option value="$PROJECT_DIR$/plugins/lagdisplay" />
-            <option value="$PROJECT_DIR$/plugins/logging" />
-            <option value="$PROJECT_DIR$/plugins/mediasource_dbus" />
-            <option value="$PROJECT_DIR$/plugins/mediasource_dcop" />
-            <option value="$PROJECT_DIR$/plugins/mediasource_linux_title" />
-            <option value="$PROJECT_DIR$/plugins/mediasource_mplayer" />
-            <option value="$PROJECT_DIR$/plugins/mediasource_vlc" />
-            <option value="$PROJECT_DIR$/plugins/mediasource_windows" />
-            <option value="$PROJECT_DIR$/plugins/nickcolours" />
-            <option value="$PROJECT_DIR$/plugins/nickkeep" />
-            <option value="$PROJECT_DIR$/plugins/nma" />
-            <option value="$PROJECT_DIR$/plugins/notifications" />
-            <option value="$PROJECT_DIR$/plugins/nowplaying" />
-            <option value="$PROJECT_DIR$/plugins/osd" />
-            <option value="$PROJECT_DIR$/plugins/osx_integration" />
-            <option value="$PROJECT_DIR$/plugins/parser_irc" />
-            <option value="$PROJECT_DIR$/plugins/parser_xmpp" />
-            <option value="$PROJECT_DIR$/plugins/parserdebug" />
-            <option value="$PROJECT_DIR$/plugins/qauth" />
-            <option value="$PROJECT_DIR$/plugins/redirect" />
-            <option value="$PROJECT_DIR$/plugins/scriptplugin" />
-            <option value="$PROJECT_DIR$/plugins/sessionlock" />
-            <option value="$PROJECT_DIR$/plugins/systray" />
-            <option value="$PROJECT_DIR$/plugins/tabcompletion_bash" />
-            <option value="$PROJECT_DIR$/plugins/tabcompletion_mirc" />
-            <option value="$PROJECT_DIR$/plugins/time" />
-            <option value="$PROJECT_DIR$/plugins/ui_swing" />
-            <option value="$PROJECT_DIR$/plugins/ui_web2" />
-            <option value="$PROJECT_DIR$/plugins/whoisonquery" />
-            <option value="$PROJECT_DIR$/plugins/windowflashing" />
-            <option value="$PROJECT_DIR$/plugins/windowstatus" />
-            <option value="$PROJECT_DIR$/util" />
-          </set>
-        </option>
-        <option name="myModules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/client" />
-            <option value="$PROJECT_DIR$/parser" />
-            <option value="$PROJECT_DIR$/parser/common" />
-            <option value="$PROJECT_DIR$/parser/irc" />
-            <option value="$PROJECT_DIR$/parser/xmpp" />
-            <option value="$PROJECT_DIR$/plugins" />
-            <option value="$PROJECT_DIR$/plugins/activewindow" />
-            <option value="$PROJECT_DIR$/plugins/audio" />
-            <option value="$PROJECT_DIR$/plugins/awaycolours" />
-            <option value="$PROJECT_DIR$/plugins/calc" />
-            <option value="$PROJECT_DIR$/plugins/channelwho" />
-            <option value="$PROJECT_DIR$/plugins/conditional_execute" />
-            <option value="$PROJECT_DIR$/plugins/contactlist" />
-            <option value="$PROJECT_DIR$/plugins/dcc" />
-            <option value="$PROJECT_DIR$/plugins/dcop" />
-            <option value="$PROJECT_DIR$/plugins/debug" />
-            <option value="$PROJECT_DIR$/plugins/dns" />
-            <option value="$PROJECT_DIR$/plugins/exec" />
-            <option value="$PROJECT_DIR$/plugins/freedesktop_notifications" />
-            <option value="$PROJECT_DIR$/plugins/identd" />
-            <option value="$PROJECT_DIR$/plugins/jpq" />
-            <option value="$PROJECT_DIR$/plugins/lagdisplay" />
-            <option value="$PROJECT_DIR$/plugins/logging" />
-            <option value="$PROJECT_DIR$/plugins/mediasource_dbus" />
-            <option value="$PROJECT_DIR$/plugins/mediasource_dcop" />
-            <option value="$PROJECT_DIR$/plugins/mediasource_linux_title" />
-            <option value="$PROJECT_DIR$/plugins/mediasource_mplayer" />
-            <option value="$PROJECT_DIR$/plugins/mediasource_vlc" />
-            <option value="$PROJECT_DIR$/plugins/mediasource_windows" />
-            <option value="$PROJECT_DIR$/plugins/nickcolours" />
-            <option value="$PROJECT_DIR$/plugins/nickkeep" />
-            <option value="$PROJECT_DIR$/plugins/nma" />
-            <option value="$PROJECT_DIR$/plugins/notifications" />
-            <option value="$PROJECT_DIR$/plugins/nowplaying" />
-            <option value="$PROJECT_DIR$/plugins/osd" />
-            <option value="$PROJECT_DIR$/plugins/osx_integration" />
-            <option value="$PROJECT_DIR$/plugins/parser_irc" />
-            <option value="$PROJECT_DIR$/plugins/parser_xmpp" />
-            <option value="$PROJECT_DIR$/plugins/parserdebug" />
-            <option value="$PROJECT_DIR$/plugins/qauth" />
-            <option value="$PROJECT_DIR$/plugins/redirect" />
-            <option value="$PROJECT_DIR$/plugins/scriptplugin" />
-            <option value="$PROJECT_DIR$/plugins/sessionlock" />
-            <option value="$PROJECT_DIR$/plugins/systray" />
-            <option value="$PROJECT_DIR$/plugins/tabcompletion_bash" />
-            <option value="$PROJECT_DIR$/plugins/tabcompletion_mirc" />
-            <option value="$PROJECT_DIR$/plugins/time" />
-            <option value="$PROJECT_DIR$/plugins/ui_swing" />
-            <option value="$PROJECT_DIR$/plugins/ui_web2" />
-            <option value="$PROJECT_DIR$/plugins/whoisonquery" />
-            <option value="$PROJECT_DIR$/plugins/windowflashing" />
-            <option value="$PROJECT_DIR$/plugins/windowstatus" />
-            <option value="$PROJECT_DIR$/util" />
-          </set>
-        </option>
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

.idea/identd.iml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:identd" external.linked.project.path="$MODULE_DIR$/plugins/identd" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/identd/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/identd/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/identd">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/identd/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/identd/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/identd/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/identd/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/identd/generated" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/identd/generated_tests" isTestSource="true" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/identd/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/identd/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="module" module-name="irc" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/inspectionProfiles/Project_Default.xml

@@ -1,343 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0" is_locked="false">
-    <option name="myName" value="Project Default" />
-    <option name="myLocal" value="false" />
-    <inspection_tool class="AbstractMethodCallInConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="AccessToStaticFieldLockedOnInstance" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoredClasses">
-        <set>
-          <option value="org.slf4j.Logger" />
-        </set>
-      </option>
-    </inspection_tool>
-    <inspection_tool class="AnonymousClassComplexity" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="m_limit" value="3" />
-    </inspection_tool>
-    <inspection_tool class="AnonymousClassVariableHidesContainingMethodVariable" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ArrayEquality" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ArraysAsListWithZeroOrOneArgument" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="AssertEqualsCalledOnArray" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="AssertEqualsMayBeAssertSame" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="AssignmentToCatchBlockParameter" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="AssignmentToCollectionFieldFromParameter" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignorePrivateMethods" value="true" />
-    </inspection_tool>
-    <inspection_tool class="AssignmentToDateFieldFromParameter" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignorePrivateMethods" value="true" />
-    </inspection_tool>
-    <inspection_tool class="AssignmentToForLoopParameter" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="m_checkForeachParameters" value="false" />
-    </inspection_tool>
-    <inspection_tool class="AssignmentToMethodParameter" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoreTransformationOfOriginalParameter" value="false" />
-    </inspection_tool>
-    <inspection_tool class="AssignmentToStaticFieldFromInstanceMethod" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="AssignmentToSuperclassField" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="AutoCloseableResource" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="BeforeClassOrAfterClassIsPublicStaticVoidNoArg" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="BeforeOrAfterIsPublicVoidNoArg" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="BreakStatementWithLabel" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="CStyleArrayDeclaration" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="CallToStringConcatCanBeReplacedByOperator" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="CastConflictsWithInstanceof" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="CastThatLosesPrecision" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoreIntegerCharCasts" value="false" />
-    </inspection_tool>
-    <inspection_tool class="CastToIncompatibleInterface" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ChainedEquality" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ChannelResource" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="insideTryAllowed" value="false" />
-    </inspection_tool>
-    <inspection_tool class="CheckDtdRefs" enabled="false" level="ERROR" enabled_by_default="false" />
-    <inspection_tool class="CheckNodeTest" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="CheckTagEmptyBody" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="CheckXmlFileWithXercesValidator" enabled="false" level="ERROR" enabled_by_default="false" />
-    <inspection_tool class="ClassComplexity" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="m_limit" value="80" />
-    </inspection_tool>
-    <inspection_tool class="ClassCoupling" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="m_includeJavaClasses" value="false" />
-      <option name="m_includeLibraryClasses" value="false" />
-      <option name="m_limit" value="15" />
-    </inspection_tool>
-    <inspection_tool class="ClassEscapesItsScope" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ClassInTopLevelPackage" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ClassInitializer" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ClassNameDiffersFromFileName" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ClassOnlyUsedInOneModule" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ClassOnlyUsedInOnePackage" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ClassWithMultipleLoggers" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="loggerNamesString" value="java.util.logging.Logger,org.slf4j.Logger,org.apache.commons.logging.Log,org.apache.log4j.Logger" />
-    </inspection_tool>
-    <inspection_tool class="CollectionAddedToSelf" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="CollectionContainsUrl" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="CollectionsFieldAccessReplaceableByMethodCall" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ConditionalExpressionWithIdenticalBranches" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ConstantValueVariableUse" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ContinueStatementWithLabel" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="CyclicClassDependency" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="CyclomaticComplexity" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="m_limit" value="10" />
-    </inspection_tool>
-    <inspection_tool class="DeclareCollectionAsInterface" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoreLocalVariables" value="false" />
-      <option name="ignorePrivateMethodsAndFields" value="false" />
-    </inspection_tool>
-    <inspection_tool class="DeprecatedClassUsageInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="DivideByZero" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="DuplicateBooleanBranch" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="DuplicateCondition" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoreMethodCalls" value="false" />
-    </inspection_tool>
-    <inspection_tool class="ElementOnlyUsedFromTestCode" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="EnumSwitchStatementWhichMissesCases" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoreSwitchStatementsWithDefault" value="true" />
-    </inspection_tool>
-    <inspection_tool class="EnumerationCanBeIteration" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="EqualsCalledOnEnumConstant" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="EqualsHashCodeCalledOnUrl" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="FallthruInSwitchStatement" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="FieldMayBeFinal" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="FieldMayBeStatic" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="FinalMethodInFinalClass" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="HardwiredNamespacePrefix" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="IOResource" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoredTypesString" value="java.io.ByteArrayOutputStream,java.io.ByteArrayInputStream,java.io.StringBufferInputStream,java.io.CharArrayWriter,java.io.CharArrayReader,java.io.StringWriter,java.io.StringReader" />
-      <option name="insideTryAllowed" value="false" />
-    </inspection_tool>
-    <inspection_tool class="IfStatementWithIdenticalBranches" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="IgnoreResultOfCall" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="m_reportAllNonLibraryCalls" value="false" />
-      <option name="callCheckString" value="java.io.File,.*,java.io.InputStream,read|skip|available|markSupported,java.io.Writer,read|skip|ready|markSupported,java.lang.Boolean,.*,java.lang.Byte,.*,java.lang.Character,.*,java.lang.Double,.*,java.lang.Float,.*,java.lang.Integer,.*,java.lang.Long,.*,java.lang.Math,.*,java.lang.Object,equals|hashCode|toString,java.lang.Short,.*,java.lang.StrictMath,.*,java.lang.String,.*,java.math.BigInteger,.*,java.math.BigDecimal,.*,java.net.InetAddress,.*,java.net.URI,.*,java.util.UUID,.*,java.util.regex.Matcher,pattern|toMatchResult|start|end|group|groupCount|matches|find|lookingAt|quoteReplacement|replaceAll|replaceFirst|regionStart|regionEnd|hasTransparantBounds|hasAnchoringBounds|hitEnd|requireEnd,java.util.regex.Pattern,.*,net.engio.mbassy.bus.MBassador,post" />
-    </inspection_tool>
-    <inspection_tool class="ImplicitTypeConversion" enabled="false" level="WARNING" enabled_by_default="false">
-      <option name="BITS" value="1720" />
-      <option name="FLAG_EXPLICIT_CONVERSION" value="true" />
-      <option name="IGNORE_NODESET_TO_BOOLEAN_VIA_STRING" value="true" />
-    </inspection_tool>
-    <inspection_tool class="IndexZeroUsage" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="InnerClassMayBeStatic" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="InstanceofCatchParameter" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="InstanceofThis" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="InstantiationOfUtilityClass" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="JavaLangImport" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="LabeledStatement" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="LengthOneStringInIndexOf" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="LengthOneStringsInConcatenation" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ListenerMayUseAdapter" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="checkForEmptyMethods" value="true" />
-    </inspection_tool>
-    <inspection_tool class="LiteralAsArgToStringEquals" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="LocalCanBeFinal" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="REPORT_VARIABLES" value="true" />
-      <option name="REPORT_PARAMETERS" value="true" />
-      <option name="REPORT_CATCH_PARAMETERS" value="false" />
-      <option name="REPORT_FOREACH_PARAMETERS" value="false" />
-    </inspection_tool>
-    <inspection_tool class="LoggerInitializedWithForeignClass" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
-      <option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
-    </inspection_tool>
-    <inspection_tool class="LoopConditionNotUpdatedInsideLoop" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoreIterators" value="false" />
-    </inspection_tool>
-    <inspection_tool class="MapReplaceableByEnumMap" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="MethodCanBeVariableArityMethod" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="MethodReturnAlwaysConstant" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="MisorderedAssertEqualsParameters" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="MissingDeprecatedAnnotation" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="MissingOverrideAnnotation" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoreObjectMethods" value="false" />
-      <option name="ignoreAnonymousClassMethods" value="false" />
-    </inspection_tool>
-    <inspection_tool class="MissortedModifiers" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="m_requireAnnotationsFirst" value="true" />
-    </inspection_tool>
-    <inspection_tool class="MisspelledEquals" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="MisspelledToString" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="MultipleDeclaration" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoreForLoopDeclarations" value="true" />
-    </inspection_tool>
-    <inspection_tool class="MultipleTopLevelClassesInFile" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="NegatedConditional" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="m_ignoreNegatedNullComparison" value="true" />
-    </inspection_tool>
-    <inspection_tool class="NegatedConditionalExpression" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="NegatedEqualityExpression" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="NegatedIfElse" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="m_ignoreNegatedNullComparison" value="false" />
-      <option name="m_ignoreNegatedZeroComparison" value="false" />
-    </inspection_tool>
-    <inspection_tool class="NegativelyNamedBooleanVariable" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="NonCommentSourceStatements" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="m_limit" value="30" />
-    </inspection_tool>
-    <inspection_tool class="NonFinalFieldInEnum" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="NonFinalFieldOfException" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="NonFinalUtilityClass" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="NonStaticFinalLogger" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="loggerClassName" value="" />
-    </inspection_tool>
-    <inspection_tool class="NotifyCalledOnCondition" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="NullThrown" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ObjectToString" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ObsoleteCollection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoreRequiredObsoleteCollectionTypes" value="true" />
-    </inspection_tool>
-    <inspection_tool class="OnDemandImport" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="OverlyStrongTypeCast" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoreInMatchingInstanceof" value="false" />
-    </inspection_tool>
-    <inspection_tool class="OverridableMethodCallDuringObjectConstruction" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="OverriddenMethodCallDuringObjectConstruction" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="PackageVisibleField" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="PackageVisibleInnerClass" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoreEnums" value="false" />
-      <option name="ignoreInterfaces" value="false" />
-    </inspection_tool>
-    <inspection_tool class="ParameterizedParametersStaticCollection" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="PointlessIndexOfComparison" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="PointlessNullCheck" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ProblematicWhitespace" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ProtectedMemberInFinalClass" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="RawUseOfParameterizedType" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="RedundantFieldInitialization" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="RedundantImplements" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoreSerializable" value="false" />
-      <option name="ignoreCloneable" value="false" />
-    </inspection_tool>
-    <inspection_tool class="RedundantStringFormatCall" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="RedundantSuppression" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="RedundantThrowsDeclaration" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="RedundantTypeConversion" enabled="false" level="WARNING" enabled_by_default="false">
-      <option name="CHECK_ANY" value="false" />
-    </inspection_tool>
-    <inspection_tool class="ReplaceAllDot" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ReplaceAssignmentWithOperatorAssignment" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoreLazyOperators" value="true" />
-      <option name="ignoreObscureOperators" value="false" />
-    </inspection_tool>
-    <inspection_tool class="ReturnNull" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="m_reportObjectMethods" value="false" />
-      <option name="m_reportArrayMethods" value="true" />
-      <option name="m_reportCollectionMethods" value="true" />
-      <option name="m_ignorePrivateMethods" value="false" />
-    </inspection_tool>
-    <inspection_tool class="ReturnOfCollectionField" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignorePrivateMethods" value="true" />
-    </inspection_tool>
-    <inspection_tool class="ReturnOfDateField" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ReuseOfLocalVariable" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="SamePackageImport" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="SetReplaceableByEnumSet" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="SimplifiableAnnotation" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="Singleton" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="SizeReplaceableByIsEmpty" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="SocketResource" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="insideTryAllowed" value="false" />
-    </inspection_tool>
-    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
-      <option name="processCode" value="false" />
-      <option name="processLiterals" value="false" />
-      <option name="processComments" value="false" />
-    </inspection_tool>
-    <inspection_tool class="StaticCallOnSubclass" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="StaticFieldReferenceOnSubclass" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="StaticMethodOnlyUsedInOneClass" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="StaticNonFinalField" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="StringBufferToStringInConcatenation" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="StringConcatenationInLoops" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="m_ignoreUnlessAssigned" value="true" />
-    </inspection_tool>
-    <inspection_tool class="StringEqualsEmptyString" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="StringReplaceableByStringBuffer" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="onlyWarnOnLoop" value="true" />
-    </inspection_tool>
-    <inspection_tool class="SubstringZero" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="SuppressionAnnotation" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
-    <inspection_tool class="SwitchStatementWithConfusingDeclaration" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="SynchronizationOnStaticField" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="SynchronizeOnLock" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="SynchronizeOnThis" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="SynchronizedMethod" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <option name="m_includeNativeMethods" value="true" />
-      <option name="ignoreSynchronizedSuperMethods" value="true" />
-    </inspection_tool>
-    <inspection_tool class="SynchronizedOnLiteralObject" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="SystemOutErr" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="TestCaseWithNoTestMethods" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoreSupers" value="false" />
-    </inspection_tool>
-    <inspection_tool class="ThisEscapedInConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ThreadWithDefaultRunMethod" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ThrowablePrintStackTrace" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="TodoComment" enabled="false" level="INFO" enabled_by_default="false" />
-    <inspection_tool class="TooBroadScope" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="m_allowConstructorAsInitializer" value="false" />
-      <option name="m_onlyLookAtBlocks" value="false" />
-    </inspection_tool>
-    <inspection_tool class="TypeMayBeWeakened" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="useRighthandTypeAsWeakestTypeInAssignments" value="true" />
-      <option name="useParameterizedTypeForCollectionMethods" value="true" />
-      <option name="doNotWeakenToJavaLangObject" value="true" />
-      <option name="onlyWeakentoInterface" value="true" />
-    </inspection_tool>
-    <inspection_tool class="UnaryPlus" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="UnnecessaryBlockStatement" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoreSwitchBranches" value="false" />
-    </inspection_tool>
-    <inspection_tool class="UnnecessaryCallToStringValueOf" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="UnnecessaryConstantArrayCreationExpression" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="UnnecessaryConstructor" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoreAnnotations" value="true" />
-    </inspection_tool>
-    <inspection_tool class="UnnecessaryEnumModifier" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="UnnecessaryFullyQualifiedName" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="m_ignoreJavadoc" value="false" />
-    </inspection_tool>
-    <inspection_tool class="UnnecessaryInheritDoc" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="UnnecessaryInterfaceModifier" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="UnnecessaryParentheses" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoreClarifyingParentheses" value="false" />
-      <option name="ignoreParenthesesOnConditionals" value="false" />
-      <option name="ignoreParenthesesOnLambdaParameter" value="false" />
-    </inspection_tool>
-    <inspection_tool class="UnnecessaryQualifierForThis" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="UnnecessarySuperConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="UnnecessarySuperQualifier" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="UnnecessaryThis" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoreAssignments" value="true" />
-    </inspection_tool>
-    <inspection_tool class="UnnecessaryToStringCall" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="UnusedImport" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="UseOfAnotherObjectsPrivateField" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoreSameClass" value="false" />
-      <option name="ignoreEquals" value="false" />
-    </inspection_tool>
-    <inspection_tool class="UtilityClassWithPublicConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="UtilityClassWithoutPrivateConstructor" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignorableAnnotations">
-        <value />
-      </option>
-      <option name="ignoreClassesWithOnlyMain" value="false" />
-    </inspection_tool>
-    <inspection_tool class="WaitCalledOnCondition" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="WaitNotInLoop" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="WaitNotInSynchronizedContext" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="WaitWhileHoldingTwoLocks" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="WaitWithoutCorrespondingNotify" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="WhileLoopSpinsOnField" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoreNonEmtpyLoops" value="false" />
-    </inspection_tool>
-    <inspection_tool class="XmlDuplicatedId" enabled="false" level="ERROR" enabled_by_default="false" />
-    <inspection_tool class="XmlInvalidId" enabled="false" level="ERROR" enabled_by_default="false" />
-    <inspection_tool class="XmlPathReference" enabled="false" level="ERROR" enabled_by_default="false" />
-    <inspection_tool class="XmlUnboundNsPrefix" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="XmlUnusedNamespaceDeclaration" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="XmlWrongRootElement" enabled="false" level="ERROR" enabled_by_default="false" />
-    <inspection_tool class="XsltDeclarations" enabled="false" level="ERROR" enabled_by_default="false" />
-    <inspection_tool class="XsltTemplateInvocation" enabled="false" level="ERROR" enabled_by_default="false" />
-    <inspection_tool class="XsltUnusedDeclaration" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="XsltVariableShadowing" enabled="false" level="WARNING" enabled_by_default="false" />
-  </profile>
-</component>

.idea/inspectionProfiles/profiles_settings.xml

@@ -1,7 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="PROJECT_PROFILE" value="Project Default" />
-    <option name="USE_PROJECT_PROFILE" value="true" />
-    <version value="1.0" />
-  </settings>
-</component>

.idea/irc.iml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":parser:irc" external.linked.project.path="$MODULE_DIR$/parser/irc" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.dmdirc.parser" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/parser/irc/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/parser/irc/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/parser/irc">
-      <sourceFolder url="file://$MODULE_DIR$/parser/irc/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/parser/irc/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/parser/irc/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/parser/irc/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/parser/irc/generated" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/parser/irc/generated_tests" isTestSource="true" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/parser/irc/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/parser/irc/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="common" exported="" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
-  </component>
-</module>

.idea/jpq.iml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:jpq" external.linked.project.path="$MODULE_DIR$/plugins/jpq" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/jpq/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/jpq/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/jpq">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/jpq/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/jpq/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/jpq/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/jpq/test-res" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/jpq/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/jpq/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/lagdisplay.iml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:lagdisplay" external.linked.project.path="$MODULE_DIR$/plugins/lagdisplay" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/lagdisplay/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/lagdisplay/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/lagdisplay">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/lagdisplay/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/lagdisplay/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/lagdisplay/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/lagdisplay/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/lagdisplay/generated" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/lagdisplay/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/lagdisplay/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="ui_swing" exported="" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/logging.iml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:logging" external.linked.project.path="$MODULE_DIR$/plugins/logging" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/logging/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/logging/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/logging">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/logging/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/logging/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/logging/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/logging/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/logging/generated" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/logging/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/logging/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.jimfs:jimfs:1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/mediasource_dbus.iml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:mediasource_dbus" external.linked.project.path="$MODULE_DIR$/plugins/mediasource_dbus" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/mediasource_dbus/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/mediasource_dbus/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/mediasource_dbus">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/mediasource_dbus/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/mediasource_dbus/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/mediasource_dbus/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/mediasource_dbus/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/mediasource_dbus/generated" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/mediasource_dbus/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/mediasource_dbus/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="nowplaying" exported="" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/mediasource_dcop.iml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:mediasource_dcop" external.linked.project.path="$MODULE_DIR$/plugins/mediasource_dcop" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/mediasource_dcop/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/mediasource_dcop/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/mediasource_dcop">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/mediasource_dcop/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/mediasource_dcop/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/mediasource_dcop/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/mediasource_dcop/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/mediasource_dcop/generated" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/mediasource_dcop/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/mediasource_dcop/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="nowplaying" exported="" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/mediasource_linux_title.iml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:mediasource_linux_title" external.linked.project.path="$MODULE_DIR$/plugins/mediasource_linux_title" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/mediasource_linux_title/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/mediasource_linux_title/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/mediasource_linux_title">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/mediasource_linux_title/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/mediasource_linux_title/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/mediasource_linux_title/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/mediasource_linux_title/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/mediasource_linux_title/generated" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/mediasource_linux_title/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/mediasource_linux_title/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="nowplaying" exported="" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/mediasource_mplayer.iml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:mediasource_mplayer" external.linked.project.path="$MODULE_DIR$/plugins/mediasource_mplayer" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/mediasource_mplayer/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/mediasource_mplayer/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/mediasource_mplayer">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/mediasource_mplayer/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/mediasource_mplayer/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/mediasource_mplayer/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/mediasource_mplayer/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/mediasource_mplayer/generated" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/mediasource_mplayer/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/mediasource_mplayer/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="nowplaying" exported="" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/mediasource_vlc.iml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:mediasource_vlc" external.linked.project.path="$MODULE_DIR$/plugins/mediasource_vlc" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/mediasource_vlc/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/mediasource_vlc/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/mediasource_vlc">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/mediasource_vlc/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/mediasource_vlc/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/mediasource_vlc/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/mediasource_vlc/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/mediasource_vlc/generated" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/mediasource_vlc/generated_tests" isTestSource="true" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/mediasource_vlc/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/mediasource_vlc/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="nowplaying" exported="" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/mediasource_windows.iml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:mediasource_windows" external.linked.project.path="$MODULE_DIR$/plugins/mediasource_windows" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/mediasource_windows/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/mediasource_windows/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/mediasource_windows">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/mediasource_windows/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/mediasource_windows/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/mediasource_windows/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/mediasource_windows/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/mediasource_windows/generated" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/mediasource_windows/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/mediasource_windows/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="nowplaying" exported="" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/misc.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-    <list size="3">
-      <item index="0" class="java.lang.String" itemvalue="com.dmdirc.config.ConfigBinding" />
-      <item index="1" class="java.lang.String" itemvalue="dagger.Provides" />
-      <item index="2" class="java.lang.String" itemvalue="net.engio.mbassy.listener.Handler" />
-    </list>
-  </component>
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="javax.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="javax.annotation.Nonnull" />
-    <option name="myNullables">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-        </list>
-      </value>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-</project>

.idea/modules.xml

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/audio.iml" filepath="$PROJECT_DIR$/.idea/audio.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/awaycolours.iml" filepath="$PROJECT_DIR$/.idea/awaycolours.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/calc.iml" filepath="$PROJECT_DIR$/.idea/calc.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/channelwho.iml" filepath="$PROJECT_DIR$/.idea/channelwho.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/client.iml" filepath="$PROJECT_DIR$/.idea/client.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/common.iml" filepath="$PROJECT_DIR$/.idea/common.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/conditional_execute.iml" filepath="$PROJECT_DIR$/.idea/conditional_execute.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/contactlist.iml" filepath="$PROJECT_DIR$/.idea/contactlist.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/dcc.iml" filepath="$PROJECT_DIR$/.idea/dcc.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/dcop.iml" filepath="$PROJECT_DIR$/.idea/dcop.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/debug.iml" filepath="$PROJECT_DIR$/.idea/debug.iml" />
-      <module fileurl="file://$PROJECT_DIR$/dmdirc.iml" filepath="$PROJECT_DIR$/dmdirc.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/dns.iml" filepath="$PROJECT_DIR$/.idea/dns.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/exec.iml" filepath="$PROJECT_DIR$/.idea/exec.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/freedesktop_notifications.iml" filepath="$PROJECT_DIR$/.idea/freedesktop_notifications.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/identd.iml" filepath="$PROJECT_DIR$/.idea/identd.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/irc.iml" filepath="$PROJECT_DIR$/.idea/irc.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/jpq.iml" filepath="$PROJECT_DIR$/.idea/jpq.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/lagdisplay.iml" filepath="$PROJECT_DIR$/.idea/lagdisplay.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/logging.iml" filepath="$PROJECT_DIR$/.idea/logging.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/mediasource_dbus.iml" filepath="$PROJECT_DIR$/.idea/mediasource_dbus.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/mediasource_dcop.iml" filepath="$PROJECT_DIR$/.idea/mediasource_dcop.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/mediasource_linux_title.iml" filepath="$PROJECT_DIR$/.idea/mediasource_linux_title.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/mediasource_mplayer.iml" filepath="$PROJECT_DIR$/.idea/mediasource_mplayer.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/mediasource_vlc.iml" filepath="$PROJECT_DIR$/.idea/mediasource_vlc.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/mediasource_windows.iml" filepath="$PROJECT_DIR$/.idea/mediasource_windows.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/nickcolours.iml" filepath="$PROJECT_DIR$/.idea/nickcolours.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/nickkeep.iml" filepath="$PROJECT_DIR$/.idea/nickkeep.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/nma.iml" filepath="$PROJECT_DIR$/.idea/nma.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/notifications.iml" filepath="$PROJECT_DIR$/.idea/notifications.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/nowplaying.iml" filepath="$PROJECT_DIR$/.idea/nowplaying.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/osd.iml" filepath="$PROJECT_DIR$/.idea/osd.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/osx_integration.iml" filepath="$PROJECT_DIR$/.idea/osx_integration.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/parser.iml" filepath="$PROJECT_DIR$/.idea/parser.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/parser_irc.iml" filepath="$PROJECT_DIR$/.idea/parser_irc.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/parser_xmpp.iml" filepath="$PROJECT_DIR$/.idea/parser_xmpp.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/parserdebug.iml" filepath="$PROJECT_DIR$/.idea/parserdebug.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/plugins.iml" filepath="$PROJECT_DIR$/.idea/plugins.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/qauth.iml" filepath="$PROJECT_DIR$/.idea/qauth.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/redirect.iml" filepath="$PROJECT_DIR$/.idea/redirect.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/scriptplugin.iml" filepath="$PROJECT_DIR$/.idea/scriptplugin.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/sessionlock.iml" filepath="$PROJECT_DIR$/.idea/sessionlock.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/systray.iml" filepath="$PROJECT_DIR$/.idea/systray.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/tabcompletion_bash.iml" filepath="$PROJECT_DIR$/.idea/tabcompletion_bash.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/tabcompletion_mirc.iml" filepath="$PROJECT_DIR$/.idea/tabcompletion_mirc.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/time.iml" filepath="$PROJECT_DIR$/.idea/time.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/ui_swing.iml" filepath="$PROJECT_DIR$/.idea/ui_swing.iml" />
-      <module fileurl="file://$PROJECT_DIR$/Plugins/ui_web2/ui_web2.iml" filepath="$PROJECT_DIR$/Plugins/ui_web2/ui_web2.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/util.iml" filepath="$PROJECT_DIR$/.idea/util.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/whoisonquery.iml" filepath="$PROJECT_DIR$/.idea/whoisonquery.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/windowflashing.iml" filepath="$PROJECT_DIR$/.idea/windowflashing.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/windowstatus.iml" filepath="$PROJECT_DIR$/.idea/windowstatus.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/xmpp.iml" filepath="$PROJECT_DIR$/.idea/xmpp.iml" />
-    </modules>
-  </component>
-</project>

.idea/nickcolours.iml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:nickcolours" external.linked.project.path="$MODULE_DIR$/plugins/nickcolours" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/nickcolours/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/nickcolours/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/nickcolours">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/nickcolours/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/nickcolours/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/nickcolours/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/nickcolours/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/nickcolours/generated" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/nickcolours/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/nickcolours/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="ui_swing" exported="" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/nickkeep.iml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:nickkeep" external.linked.project.path="$MODULE_DIR$/plugins/nickkeep" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/nickkeep/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/nickkeep/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/nickkeep">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/nickkeep/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/nickkeep/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/nickkeep/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/nickkeep/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/nickkeep/generated" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/nickkeep/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/nickkeep/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/nma.iml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:nma" external.linked.project.path="$MODULE_DIR$/plugins/nma" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/nma/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/nma/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/nma">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/nma/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/nma/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/nma/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/nma/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/nma/generated" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/nma/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/nma/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/notifications.iml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:notifications" external.linked.project.path="$MODULE_DIR$/plugins/notifications" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/notifications/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/notifications/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/notifications">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/notifications/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/notifications/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/notifications/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/notifications/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/notifications/generated" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/notifications/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/notifications/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="ui_swing" exported="" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/nowplaying.iml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:nowplaying" external.linked.project.path="$MODULE_DIR$/plugins/nowplaying" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/nowplaying/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/nowplaying/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/nowplaying">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/nowplaying/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/nowplaying/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/nowplaying/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/nowplaying/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/nowplaying/generated" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/nowplaying/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/nowplaying/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="ui_swing" exported="" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/osd.iml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:osd" external.linked.project.path="$MODULE_DIR$/plugins/osd" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/osd/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/osd/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/osd">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/osd/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/osd/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/osd/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/osd/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/osd/generated" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/osd/generated_tests" isTestSource="true" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/osd/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/osd/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="ui_swing" exported="" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/osx_integration.iml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:osx_integration" external.linked.project.path="$MODULE_DIR$/plugins/osx_integration" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/osx_integration/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/osx_integration/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/osx_integration">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/osx_integration/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/osx_integration/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/osx_integration/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/osx_integration/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/osx_integration/generated" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/osx_integration/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/osx_integration/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="ui_swing" exported="" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/parser.iml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":parser" external.linked.project.path="$MODULE_DIR$/parser" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/parser">
-      <excludeFolder url="file://$MODULE_DIR$/parser/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/parser/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/parser_irc.iml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:parser_irc" external.linked.project.path="$MODULE_DIR$/plugins/parser_irc" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/parser_irc/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/parser_irc/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/parser_irc">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/parser_irc/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/parser_irc/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/parser_irc/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/parser_irc/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/parser_irc/generated" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/parser_irc/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/parser_irc/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="module" module-name="irc" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/parser_xmpp.iml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:parser_xmpp" external.linked.project.path="$MODULE_DIR$/plugins/parser_xmpp" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/parser_xmpp/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/parser_xmpp/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/parser_xmpp">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/parser_xmpp/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/parser_xmpp/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/parser_xmpp/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/parser_xmpp/test-res" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/parser_xmpp/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/parser_xmpp/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="module" module-name="xmpp" exported="" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/parserdebug.iml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:parserdebug" external.linked.project.path="$MODULE_DIR$/plugins/parserdebug" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/parserdebug/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/parserdebug/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/parserdebug">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/parserdebug/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/parserdebug/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/parserdebug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/parserdebug/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/parserdebug/generated" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/parserdebug/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/parserdebug/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/plugins.iml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins" external.linked.project.path="$MODULE_DIR$/plugins" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins">
-      <excludeFolder url="file://$MODULE_DIR$/plugins/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/qauth.iml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:qauth" external.linked.project.path="$MODULE_DIR$/plugins/qauth" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/qauth/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/qauth/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/qauth">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/qauth/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/qauth/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/qauth/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/qauth/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/qauth/generated" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/qauth/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/qauth/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/redirect.iml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:redirect" external.linked.project.path="$MODULE_DIR$/plugins/redirect" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/redirect/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/redirect/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/redirect">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/redirect/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/redirect/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/redirect/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/redirect/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/redirect/generated" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/redirect/generated_tests" isTestSource="true" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/redirect/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/redirect/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/runConfigurations/All_tests.xml

@@ -1,33 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests" type="JUnit" factoryName="JUnit">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <module name="" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="PACKAGE_NAME" value="" />
-    <option name="MAIN_CLASS_NAME" value="" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="-ea" />
-    <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="wholeProject" />
-    </option>
-    <envs />
-    <patterns />
-    <RunnerSettings RunnerId="Cover" />
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="" />
-      <option name="TRANSPORT" value="0" />
-      <option name="LOCAL" value="true" />
-    </RunnerSettings>
-    <RunnerSettings RunnerId="Run" />
-    <ConfigurationWrapper RunnerId="Cover" />
-    <ConfigurationWrapper RunnerId="Debug" />
-    <ConfigurationWrapper RunnerId="Run" />
-    <method />
-  </configuration>
-</component>

.idea/runConfigurations/Remote_debug.xml

@@ -1,16 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Remote debug" type="Remote" factoryName="Remote">
-    <option name="USE_SOCKET_TRANSPORT" value="true" />
-    <option name="SERVER_MODE" value="false" />
-    <option name="SHMEM_ADDRESS" value="javadebug" />
-    <option name="HOST" value="localhost" />
-    <option name="PORT" value="5005" />
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="5005" />
-      <option name="TRANSPORT" value="0" />
-      <option name="LOCAL" value="false" />
-    </RunnerSettings>
-    <ConfigurationWrapper RunnerId="Debug" />
-    <method />
-  </configuration>
-</component>

.idea/runConfigurations/Run_DMDirc.xml

@@ -1,14 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run DMDirc" type="JarApplication" factoryName="JAR Application">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <option name="JAR_PATH" value="$PROJECT_DIR$/client/dist/DMDirc.jar" />
-    <option name="PROGRAM_PARAMETERS" value="-d etc/profile" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <envs />
-    <RunnerSettings RunnerId="Basic" />
-    <ConfigurationWrapper RunnerId="Basic" />
-    <method>
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks=":client:jar" externalProjectPath="$PROJECT_DIR$" vmOptions="" scriptParameters="" />
-    </method>
-  </configuration>
-</component>

.idea/scopes/scope_settings.xml

@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>

.idea/scriptplugin.iml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:scriptplugin" external.linked.project.path="$MODULE_DIR$/plugins/scriptplugin" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/scriptplugin/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/scriptplugin/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/scriptplugin">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/scriptplugin/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/scriptplugin/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/scriptplugin/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/scriptplugin/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/scriptplugin/generated" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/scriptplugin/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/scriptplugin/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/serverlistdialog.iml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:serverlistdialog" external.linked.project.path="$MODULE_DIR$/plugins/serverlistdialog" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/serverlistdialog/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/serverlistdialog/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/serverlistdialog">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/serverlistdialog/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/serverlistdialog/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/serverlistdialog/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/serverlistdialog/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/serverlistdialog/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/serverlistdialog/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/serverlistdialog/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/serverlistdialog/test-res" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/serverlistdialog/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/serverlistdialog/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="ui_swing" exported="" />
-    <orderEntry type="module" module-name="serverlists" exported="" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.11" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-all:1.9.5" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-  </component>
-</module>
-

.idea/serverlists.iml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:serverlists" external.linked.project.path="$MODULE_DIR$/plugins/serverlists" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/serverlists/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/serverlists/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/serverlists">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/serverlists/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/serverlists/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/serverlists/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/serverlists/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/serverlists/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/serverlists/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/serverlists/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/serverlists/test-res" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/serverlists/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/serverlists/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.11" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-all:1.9.5" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-  </component>
-</module>
-

.idea/sessionlock.iml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:sessionlock" external.linked.project.path="$MODULE_DIR$/plugins/sessionlock" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/sessionlock/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/sessionlock/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/sessionlock">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/sessionlock/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/sessionlock/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/sessionlock/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/sessionlock/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/sessionlock/generated" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/sessionlock/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/sessionlock/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: net.java.dev.jna:jna:4.1.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: net.java.dev.jna:jna-platform:4.1.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.greboid.libraries:locksupport:0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/systray.iml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:systray" external.linked.project.path="$MODULE_DIR$/plugins/systray" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/systray/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/systray/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/systray">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/systray/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/systray/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/systray/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/systray/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/systray/generated" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/systray/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/systray/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="ui_swing" exported="" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/tabcompletion_bash.iml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:tabcompletion_bash" external.linked.project.path="$MODULE_DIR$/plugins/tabcompletion_bash" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/tabcompletion_bash/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/tabcompletion_bash/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/tabcompletion_bash">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/tabcompletion_bash/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/tabcompletion_bash/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/tabcompletion_bash/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/tabcompletion_bash/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/tabcompletion_bash/generated" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/tabcompletion_bash/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/tabcompletion_bash/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/tabcompletion_mirc.iml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:tabcompletion_mirc" external.linked.project.path="$MODULE_DIR$/plugins/tabcompletion_mirc" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/tabcompletion_mirc/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/tabcompletion_mirc/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/tabcompletion_mirc">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/tabcompletion_mirc/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/tabcompletion_mirc/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/tabcompletion_mirc/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/tabcompletion_mirc/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/tabcompletion_mirc/generated" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/tabcompletion_mirc/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/tabcompletion_mirc/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/time.iml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:time" external.linked.project.path="$MODULE_DIR$/plugins/time" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/time/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/time/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/time">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/time/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/time/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/time/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/time/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/time/generated" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/time/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/time/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/ui_swing.iml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:ui_swing" external.linked.project.path="$MODULE_DIR$/plugins/ui_swing" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/ui_swing/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/ui_swing/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/ui_swing">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/ui_swing/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/ui_swing/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/ui_swing/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/ui_swing/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/ui_swing/generated" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/ui_swing/generated_tests" isTestSource="true" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/ui_swing/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/ui_swing/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.miglayout:miglayout-swing:4.2" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.greboid.libraries:menuscroller:0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.miglayout:miglayout-core:4.2" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/ui_web2.iml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:ui_web2" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="0.8-1237-gb1e5c13-SNAPSHOT" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
-    <exclude-output />
-    <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$/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/test-res" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/util.iml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":util" external.linked.project.path="$MODULE_DIR$/util" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.dmdirc" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/util/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/util/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/util">
-      <sourceFolder url="file://$MODULE_DIR$/util/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/util/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/util/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/util/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/util/generated" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/util/generated_tests" isTestSource="true" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/util/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/util/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.jimfs:jimfs:1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-  </component>
-</module>

.idea/vcs.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/client" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/installers" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/parser" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/plugins" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/util" vcs="Git" />
-  </component>
-</project>

.idea/whoisonquery.iml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:whoisonquery" external.linked.project.path="$MODULE_DIR$/plugins/whoisonquery" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/whoisonquery/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/whoisonquery/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/whoisonquery">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/whoisonquery/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/whoisonquery/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/whoisonquery/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/whoisonquery/test-res" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/whoisonquery/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/whoisonquery/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/windowflashing.iml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:windowflashing" external.linked.project.path="$MODULE_DIR$/plugins/windowflashing" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/windowflashing/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/windowflashing/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/windowflashing">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/windowflashing/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/windowflashing/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/windowflashing/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/windowflashing/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/windowflashing/generated" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/windowflashing/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/windowflashing/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="ui_swing" exported="" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: net.java.dev.jna:jna:4.1.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: net.java.dev.jna:jna-platform:4.1.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/windowstatus.iml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:windowstatus" external.linked.project.path="$MODULE_DIR$/plugins/windowstatus" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.plugins" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/plugins/windowstatus/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/windowstatus/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/windowstatus">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/windowstatus/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/windowstatus/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/windowstatus/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/windowstatus/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/windowstatus/generated" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/windowstatus/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/windowstatus/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="ui_swing" exported="" />
-    <orderEntry type="module" module-name="client" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-  </component>
-</module>

.idea/xmpp.iml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":parser:xmpp" external.linked.project.path="$MODULE_DIR$/parser/xmpp" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.dmdirc.parser" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/parser/xmpp/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/parser/xmpp/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/parser/xmpp">
-      <sourceFolder url="file://$MODULE_DIR$/parser/xmpp/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/parser/xmpp/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/parser/xmpp/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/parser/xmpp/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/parser/xmpp/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/parser/xmpp/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="common" exported="" />
-    <orderEntry type="library" exported="" name="Gradle: org.igniterealtime.smack:smack:3.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: org.igniterealtime.smack:smackx:3.2.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.code.findbugs:jsr305:3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger-compiler:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:1.10.17" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.1" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
-  </component>
-</module>

README.md

@@ -4,10 +4,25 @@ DMDirc
 DMDirc is an IRC client written in Java. It's cross-platform, hugely
 configurable, and is easily extensible with a robust plugins system.
 
+![DMDirc Screenshot](etc/screenshot.png?raw=true)
+
+Getting DMDirc
+--------------------------------------------------------------------------------
+
+To download and run the latest stable version of DMDirc, download an installer
+or archive for your platform from
+[the releases page](https://github.com/DMDirc/DMDirc/releases).
+
+If there's not a distribution for your platform, you can download the Jar file
+instead. You will need to manually install OpenJDK 8 or newer in this case.
+
+Repositories
+--------------------------------------------------------------------------------
+
 This repository doesn't actually contain the source for DMDirc. Instead it's
 split over four different components, each with their own repository:
 
-* [client](https://github.com/DMDirc/client):
+* [client](https://github.com/DMDirc/DMDirc):
   contains the main guts of the client
 * [parser](https://github.com/DMDirc/parser):
   an interface for parsers and a full IRC parser
@@ -24,7 +39,7 @@ together — that's what this repository is for! Each of the components mentione
 above is included as a submodule, and there are some handy top-level build
 scripts for bundling everything together.
 
-Getting Started
+Development
 --------------------------------------------------------------------------------
 
 ### Prerequisites
@@ -50,10 +65,19 @@ tests in the project:
 ### Using an IDE
 
 We strongly recommend using [IntelliJ IDEA](http://www.jetbrains.com/idea/).
-There are project files available in this repository which will load all of the
-subprojects properly, and configure IDEA with our preferred code style,
-license headers, etc. Simply tell IDEA to open a new project, and select the
-directory this repository is checked out to.
+To get started install IDEA 2016.1 or newer and follow these steps to import
+the project and enable annotation processing:
+
+  1. Select `Import project`
+  2. Select the `build.gradle` file in this directory
+  3. Ensure `Create separate module per source set` is ticked
+  4. Click OK; you should see a list of modules
+  5. Click OK; the IDE itself should now load
+  6. Open the main settings window (File -> Settings)
+  7. Under `Build, Execution and Deployment` navigate to `Compiler`, then
+     `Annotation Processors` (you can also use the search field)
+  8. Tick the box to enable annotation processing
+  9. Change the `Store generated sources relative to` option to `content root`
 
 ### Running the client
 
@@ -83,7 +107,8 @@ they don't test how your change will affect DMDirc itself. It's good practice
 to run all of the tests in the project and compile and run an actual client to
 make sure everything actually still works!
 
-You can see an overview of open pull requests across all of the DMDirc projects [here](https://github.com/pulls?q=is%3Aopen+is%3Apr+user%3Admdirc).
+You can see an overview of open pull requests across all of the DMDirc projects
+[here](https://github.com/pulls?q=is%3Aopen+is%3Apr+user%3Admdirc).
 
 ### Continuous Integration and Code Coverage
 
@@ -133,13 +158,3 @@ repository.
 The meta repository includes a gradle build script that finds these dependencies
 and replaces them with project links instead. This ensures that while developing
 the client your changes are reflected across modules properly.
-
-### Adding new projects
-
-To ensure all IDE configuration files are kept together in this repository,
-a few manual steps are required when adding a new project:
-
-After creating a new gradle project, refresh the root project in IDEA to create
-the .iml file in the project's base directory (e.g. `plugins/yourplugin/`).
-Then manually move the .iml file into `.idea` in this repository, and edit
-`.idea/modules.xml` to update the path.

build.gradle

@@ -10,8 +10,8 @@ apply from: 'gradle/resolve-dependencies.gradle'
 subprojects.each { evaluationDependsOn it.path }
 tasks.dependencies.dependsOn subprojects*.tasks.dependencies
 
-task createWrapper(type: Wrapper) {
+task wrapper(type: Wrapper) {
     description 'Downloads and installs an up-to-date wrapper for gradle.'
-    gradleVersion = '2.11'
+    gradleVersion = '2.14'
 }
 

dmdirc.iml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="dmdirc" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" />
-    <orderEntry type="module" module-name="parser" />
-    <orderEntry type="module" module-name="plugins" />
-    <orderEntry type="module" module-name="util" />
-  </component>
-</module>

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Feb 21 16:52:42 GMT 2016
+#Mon Jul 04 18:46:31 BST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip

gradlew

@@ -6,12 +6,30 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

gradlew.bat

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,7 +46,7 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
 if "%@eval[2+2]" == "4" goto 4NT_args

settings.gradle

@@ -8,6 +8,10 @@ include 'parser:common'
 include 'parser:irc'
 include 'parser:xmpp'
 
+project(':parser:common').name = 'parser-common'
+project(':parser:irc').name = 'parser-irc'
+project(':parser:xmpp').name = 'parser-xmpp'
+
 // Include all of the plugin projects
 project(':plugins').projectDir.eachDir() { File dir ->
   if (new File(dir, "src").directory) {