Stage 1.2.0 release

Author: paul-griffith

conveyor.conf

@@ -5,7 +5,7 @@ include "#!./gradlew -q printConveyorConfig"
 include required("https://raw.githubusercontent.com/hydraulic-software/conveyor/master/configs/jvm/extract-native-libraries.conf")
 
 app {
-  version = "1.1.0"
+  version = "1.2.0"
   display-name = "Kindling"
   rdns-name = "io.github.inductiveautomation.kindling"
   vcs-url = "github.com/inductiveautomation/kindling"
@@ -27,15 +27,15 @@ app {
   }
 
   file-associations = [
-    .data,
-    .gwbk,
-    .idb,
-    .json,
-    .log,
-    .modl,
-    .script,
-    .txt,
-    .zip,
+    .data application/data,
+    .gwbk application/gwbk,
+    .idb application/idb,
+    .json application/json,
+    .log text/log,
+    .modl application/modl,
+    .script application/script,
+    .txt text/plain,
+    .zip application/zip,
   ]
 
   icons = "src/main/resources/logo.svg"

gradle.properties

@@ -1,2 +1,2 @@
-version=1.1.1-SNAPSHOT
+version=1.2.1-SNAPSHOT
 org.gradle.jvmargs=-Xmx2G