Merge pull request #102 from csmith/master

Project file updates.

.idea/activewindow.iml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":plugins:activewindow" external.linked.project.path="$MODULE_DIR$/plugins/activewindow" 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/activewindow/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/plugins/activewindow/build/classes/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/plugins/activewindow">
-      <sourceFolder url="file://$MODULE_DIR$/plugins/activewindow/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/activewindow/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/activewindow/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/activewindow/test-res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/activewindow/generated" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/activewindow/generated_tests" isTestSource="true" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/activewindow/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/plugins/activewindow/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/audio.iml

@@ -9,14 +9,12 @@
       <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="module" module-name="client" />
     <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" />
@@ -27,5 +25,19 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
   </component>
 </module>

.idea/awaycolours.iml

@@ -9,14 +9,12 @@
       <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="module" module-name="client" />
     <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" />
@@ -27,5 +25,19 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
   </component>
 </module>

.idea/calc.iml

@@ -9,14 +9,12 @@
       <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="module" module-name="client" />
     <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" />
@@ -27,5 +25,19 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
   </component>
 </module>

.idea/channelwho.iml

@@ -9,14 +9,12 @@
       <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="module" module-name="client" />
     <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" />
@@ -27,5 +25,19 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
   </component>
 </module>

.idea/client.iml

@@ -16,21 +16,18 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="util" exported="" />
+    <orderEntry type="module" module-name="util" />
     <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: net.engio:mbassador:1.2.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" exported="" name="Gradle: javax.el:el-api:2.2" 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="module" module-name="common" />
     <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: net.kencochrane.raven:raven:6.0.0" 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" />
@@ -38,5 +35,11 @@
     <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" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
   </component>
 </module>

.idea/common.iml

@@ -9,8 +9,6 @@
       <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>
@@ -24,14 +22,13 @@
     <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: net.engio:mbassador:1.2.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" exported="" name="Gradle: javax.el:el-api:2.2" 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" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
   </component>
 </module>

.idea/conditional_execute.iml

@@ -9,14 +9,12 @@
       <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="module" module-name="client" />
     <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" />
@@ -27,5 +25,19 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
   </component>
 </module>

.idea/contactlist.iml

@@ -9,14 +9,13 @@
       <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="module" module-name="ui_swing" />
+    <orderEntry type="module" module-name="client" />
     <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" />
@@ -27,5 +26,22 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-swing:4.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.greboid.libraries:menuscroller:0.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-core:4.2" level="project" />
   </component>
 </module>

.idea/dcc.iml

@@ -9,15 +9,13 @@
       <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="module" module-name="ui_swing" />
+    <orderEntry type="module" module-name="client" />
     <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" />
@@ -28,5 +26,22 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-swing:4.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.greboid.libraries:menuscroller:0.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-core:4.2" level="project" />
   </component>
 </module>

.idea/dcop.iml

@@ -9,13 +9,12 @@
       <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="module" module-name="client" />
     <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" />
@@ -26,5 +25,19 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
   </component>
 </module>

.idea/debug.iml

@@ -9,14 +9,12 @@
       <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="module" module-name="client" />
     <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" />
@@ -27,5 +25,19 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
   </component>
 </module>

.idea/dns.iml

@@ -9,13 +9,12 @@
       <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="module" module-name="client" />
     <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" />
@@ -26,5 +25,19 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
   </component>
 </module>

.idea/exec.iml

@@ -9,13 +9,12 @@
       <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="module" module-name="client" />
     <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" />
@@ -26,5 +25,19 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
   </component>
 </module>

.idea/freedesktop_notifications.iml

@@ -9,13 +9,12 @@
       <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="module" module-name="client" />
     <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" />
@@ -26,5 +25,19 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
   </component>
 </module>

.idea/gradle.xml

@@ -14,7 +14,6 @@
             <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" />
@@ -72,7 +71,6 @@
             <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" />

.idea/identd.iml

@@ -9,24 +9,36 @@
       <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="module" module-name="client" />
     <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="module" module-name="irc" />
     <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" />
+    <orderEntry type="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
   </component>
 </module>

.idea/inspectionProfiles/Project_Default.xml

@@ -15,7 +15,6 @@
     </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" />
@@ -69,7 +68,6 @@
     <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" />
@@ -206,13 +204,11 @@
       <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" />
@@ -253,7 +249,6 @@
     <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" />
@@ -291,12 +286,10 @@
     <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" />

.idea/irc.iml

@@ -9,14 +9,12 @@
       <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="module" module-name="common" />
     <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" />
@@ -25,14 +23,13 @@
     <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: net.engio:mbassador:1.2.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" exported="" name="Gradle: javax.el:el-api:2.2" 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" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
   </component>
 </module>

.idea/jpq.iml

@@ -14,7 +14,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
+    <orderEntry type="module" module-name="client" />
     <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" />
@@ -25,5 +25,19 @@
     <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" />
+    <orderEntry type="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
   </component>
 </module>

.idea/lagdisplay.iml

@@ -9,14 +9,13 @@
       <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="module" module-name="ui_swing" />
+    <orderEntry type="module" module-name="client" />
     <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" />
@@ -27,5 +26,22 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-swing:4.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.greboid.libraries:menuscroller:0.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-core:4.2" level="project" />
   </component>
 </module>

.idea/logging.iml

@@ -9,13 +9,12 @@
       <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="module" module-name="client" />
     <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" />
@@ -27,5 +26,19 @@
     <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" />
+    <orderEntry type="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
   </component>
 </module>

.idea/mediasource_dbus.iml

@@ -9,14 +9,13 @@
       <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="module" module-name="nowplaying" />
+    <orderEntry type="module" module-name="client" />
     <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" />
@@ -27,5 +26,23 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="module" module-name="ui_swing" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-swing:4.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.greboid.libraries:menuscroller:0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-core:4.2" level="project" />
   </component>
 </module>

.idea/mediasource_dcop.iml

@@ -9,14 +9,13 @@
       <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="module" module-name="nowplaying" />
+    <orderEntry type="module" module-name="client" />
     <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" />
@@ -27,5 +26,23 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="module" module-name="ui_swing" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-swing:4.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.greboid.libraries:menuscroller:0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-core:4.2" level="project" />
   </component>
 </module>

.idea/mediasource_linux_title.iml

@@ -9,14 +9,13 @@
       <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="module" module-name="nowplaying" />
+    <orderEntry type="module" module-name="client" />
     <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" />
@@ -27,5 +26,23 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="module" module-name="ui_swing" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-swing:4.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.greboid.libraries:menuscroller:0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-core:4.2" level="project" />
   </component>
 </module>

.idea/mediasource_mplayer.iml

@@ -9,14 +9,13 @@
       <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="module" module-name="nowplaying" />
+    <orderEntry type="module" module-name="client" />
     <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" />
@@ -27,5 +26,23 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="module" module-name="ui_swing" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-swing:4.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.greboid.libraries:menuscroller:0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-core:4.2" level="project" />
   </component>
 </module>

.idea/mediasource_vlc.iml

@@ -9,15 +9,13 @@
       <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="module" module-name="nowplaying" />
+    <orderEntry type="module" module-name="client" />
     <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" />
@@ -28,5 +26,23 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="module" module-name="ui_swing" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-swing:4.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.greboid.libraries:menuscroller:0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-core:4.2" level="project" />
   </component>
 </module>

.idea/mediasource_windows.iml

@@ -9,14 +9,13 @@
       <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="module" module-name="nowplaying" />
+    <orderEntry type="module" module-name="client" />
     <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" />
@@ -27,5 +26,23 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="module" module-name="ui_swing" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-swing:4.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.greboid.libraries:menuscroller:0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-core:4.2" level="project" />
   </component>
 </module>

.idea/modules.xml

@@ -2,7 +2,6 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/activewindow.iml" filepath="$PROJECT_DIR$/.idea/activewindow.iml" />
       <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" />
@@ -58,4 +57,4 @@
       <module fileurl="file://$PROJECT_DIR$/.idea/xmpp.iml" filepath="$PROJECT_DIR$/.idea/xmpp.iml" />
     </modules>
   </component>
-</project>
+</project>

.idea/nickcolours.iml

@@ -9,14 +9,13 @@
       <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="module" module-name="ui_swing" />
+    <orderEntry type="module" module-name="client" />
     <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" />
@@ -28,5 +27,21 @@
     <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" />
+    <orderEntry type="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-swing:4.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.greboid.libraries:menuscroller:0.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-core:4.2" level="project" />
   </component>
 </module>

.idea/nickkeep.iml

@@ -9,13 +9,12 @@
       <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="module" module-name="client" />
     <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" />
@@ -26,5 +25,19 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
   </component>
 </module>

.idea/nma.iml

@@ -9,13 +9,12 @@
       <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="module" module-name="client" />
     <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" />
@@ -26,5 +25,19 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
   </component>
 </module>

.idea/notifications.iml

@@ -9,14 +9,13 @@
       <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="module" module-name="ui_swing" />
+    <orderEntry type="module" module-name="client" />
     <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" />
@@ -27,5 +26,22 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-swing:4.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.greboid.libraries:menuscroller:0.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-core:4.2" level="project" />
   </component>
 </module>

.idea/nowplaying.iml

@@ -9,14 +9,13 @@
       <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="module" module-name="ui_swing" />
+    <orderEntry type="module" module-name="client" />
     <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" />
@@ -27,5 +26,22 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-swing:4.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.greboid.libraries:menuscroller:0.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-core:4.2" level="project" />
   </component>
 </module>

.idea/osd.iml

@@ -9,15 +9,13 @@
       <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="module" module-name="ui_swing" />
+    <orderEntry type="module" module-name="client" />
     <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" />
@@ -28,5 +26,22 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-swing:4.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.greboid.libraries:menuscroller:0.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-core:4.2" level="project" />
   </component>
 </module>

.idea/osx_integration.iml

@@ -9,14 +9,13 @@
       <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="module" module-name="ui_swing" />
+    <orderEntry type="module" module-name="client" />
     <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" />
@@ -27,5 +26,22 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-swing:4.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.greboid.libraries:menuscroller:0.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-core:4.2" level="project" />
   </component>
 </module>

.idea/parser_irc.iml

@@ -9,23 +9,36 @@
       <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="module" module-name="client" />
     <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="module" module-name="irc" />
     <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" />
+    <orderEntry type="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
   </component>
 </module>

.idea/parser_xmpp.iml

@@ -14,7 +14,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
+    <orderEntry type="module" module-name="client" />
     <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" />
@@ -23,8 +23,22 @@
     <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="module" module-name="xmpp" />
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
   </component>
 </module>

.idea/parserdebug.iml

@@ -9,13 +9,12 @@
       <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="module" module-name="client" />
     <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" />
@@ -26,5 +25,19 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
   </component>
 </module>

.idea/qauth.iml

@@ -9,13 +9,12 @@
       <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="module" module-name="client" />
     <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" />
@@ -26,5 +25,19 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
   </component>
 </module>

.idea/redirect.iml

@@ -9,14 +9,12 @@
       <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="module" module-name="client" />
     <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" />
@@ -27,5 +25,19 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
   </component>
 </module>

.idea/scriptplugin.iml

@@ -9,13 +9,12 @@
       <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="module" module-name="client" />
     <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" />
@@ -26,5 +25,19 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
   </component>
 </module>

.idea/sessionlock.iml

@@ -9,13 +9,12 @@
       <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="module" module-name="client" />
     <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" />
@@ -29,5 +28,19 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
   </component>
 </module>

.idea/systray.iml

@@ -9,14 +9,13 @@
       <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="module" module-name="ui_swing" />
+    <orderEntry type="module" module-name="client" />
     <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" />
@@ -27,5 +26,22 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-swing:4.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.greboid.libraries:menuscroller:0.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-core:4.2" level="project" />
   </component>
 </module>

.idea/tabcompletion_bash.iml

@@ -9,13 +9,12 @@
       <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="module" module-name="client" />
     <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" />
@@ -26,5 +25,19 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
   </component>
 </module>

.idea/tabcompletion_mirc.iml

@@ -9,13 +9,12 @@
       <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="module" module-name="client" />
     <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" />
@@ -26,5 +25,19 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
   </component>
 </module>

.idea/time.iml

@@ -9,13 +9,12 @@
       <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="module" module-name="client" />
     <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" />
@@ -26,5 +25,19 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
   </component>
 </module>

.idea/ui_swing.iml

@@ -9,14 +9,12 @@
       <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="module" module-name="client" />
     <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" />
@@ -30,5 +28,19 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
   </component>
 </module>

.idea/ui_web2.iml

@@ -1,20 +1,20 @@
 <?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" />
+    <output url="file://$MODULE_DIR$/plugins/ui_web2/build/classes/main" />
+    <output-test url="file://$MODULE_DIR$/plugins/ui_web2/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 url="file://$MODULE_DIR$/plugins/ui_web2">
+      <sourceFolder url="file://$MODULE_DIR$/plugins/ui_web2/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/plugins/ui_web2/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/plugins/ui_web2/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/plugins/ui_web2/test-res" type="java-test-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/ui_web2/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/ui_web2/build" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
+    <orderEntry type="module" module-name="client" />
     <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" />
@@ -25,5 +25,35 @@
     <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" />
+    <orderEntry type="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: com.sparkjava:spark-core:2.3" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.12" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.12" level="project" />
+    <orderEntry type="library" name="Gradle: org.eclipse.jetty:jetty-server:9.3.2.v20150730" level="project" />
+    <orderEntry type="library" name="Gradle: org.eclipse.jetty:jetty-webapp:9.3.2.v20150730" level="project" />
+    <orderEntry type="library" name="Gradle: org.eclipse.jetty.websocket:websocket-server:9.3.2.v20150730" level="project" />
+    <orderEntry type="library" name="Gradle: org.eclipse.jetty.websocket:websocket-servlet:9.3.2.v20150730" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: javax.servlet:javax.servlet-api:3.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.eclipse.jetty:jetty-http:9.3.2.v20150730" level="project" />
+    <orderEntry type="library" name="Gradle: org.eclipse.jetty:jetty-io:9.3.2.v20150730" level="project" />
+    <orderEntry type="library" name="Gradle: org.eclipse.jetty:jetty-xml:9.3.2.v20150730" level="project" />
+    <orderEntry type="library" name="Gradle: org.eclipse.jetty:jetty-servlet:9.3.2.v20150730" level="project" />
+    <orderEntry type="library" name="Gradle: org.eclipse.jetty.websocket:websocket-common:9.3.2.v20150730" level="project" />
+    <orderEntry type="library" name="Gradle: org.eclipse.jetty.websocket:websocket-client:9.3.2.v20150730" level="project" />
+    <orderEntry type="library" name="Gradle: org.eclipse.jetty.websocket:websocket-api:9.3.2.v20150730" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: org.eclipse.jetty:jetty-util:9.3.2.v20150730" level="project" />
+    <orderEntry type="library" name="Gradle: org.eclipse.jetty:jetty-security:9.3.2.v20150730" level="project" />
   </component>
 </module>

.idea/util.iml

@@ -9,8 +9,6 @@
       <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>

.idea/whoisonquery.iml

@@ -14,7 +14,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="client" exported="" />
+    <orderEntry type="module" module-name="client" />
     <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" />
@@ -25,5 +25,19 @@
     <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" />
+    <orderEntry type="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
   </component>
 </module>

.idea/windowflashing.iml

@@ -9,14 +9,13 @@
       <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="module" module-name="ui_swing" />
+    <orderEntry type="module" module-name="client" />
     <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" />
@@ -29,5 +28,22 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-swing:4.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.greboid.libraries:menuscroller:0.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-core:4.2" level="project" />
   </component>
 </module>

.idea/windowstatus.iml

@@ -9,14 +9,13 @@
       <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="module" module-name="ui_swing" />
+    <orderEntry type="module" module-name="client" />
     <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" />
@@ -27,5 +26,22 @@
     <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="module" module-name="util" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-classic:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Gradle: com.esotericsoftware.yamlbeans:yamlbeans:1.08" level="project" />
+    <orderEntry type="library" name="Gradle: net.kencochrane.raven:raven:6.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-swing:4.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.greboid.libraries:menuscroller:0.0" level="project" />
+    <orderEntry type="library" name="Gradle: ch.qos.logback:logback-core:1.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-api:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-impl:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: de.odysseus.juel:juel-spi:2.2.7" level="project" />
+    <orderEntry type="library" name="Gradle: com.miglayout:miglayout-core:4.2" level="project" />
   </component>
 </module>

.idea/xmpp.iml

@@ -14,7 +14,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="common" exported="" />
+    <orderEntry type="module" module-name="common" />
     <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" />
@@ -25,14 +25,13 @@
     <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: net.engio:mbassador:1.2.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" exported="" name="Gradle: javax.el:el-api:2.2" 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" name="Gradle: net.engio:mbassador:1.2.4" level="project" />
   </component>
 </module>

dmdirc.iml

@@ -1,16 +1,18 @@
 <?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">
+  <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/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" 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" />
-    <orderEntry type="module" module-name="parser" />
-    <orderEntry type="module" module-name="plugins" />
-    <orderEntry type="module" module-name="util" />
   </component>
 </module>