Merge branch '2016.3' into 2017.1

# Conflicts:
#	gradle.properties
#	readme.md
#	src/main/resources/META-INF/plugin.xml

Author: DenWav

gradle.properties

@@ -13,7 +13,7 @@ javaVersion = 1.8
 kotlinVersion = 1.1.1
 
 group = com.demonwav.minecraft-dev
-version = 2017.1-0.6.1
+version = 2017.1-0.6.2
 downloadIdeaSources = true
 
 org.gradle.script.lang.kotlin.accessors.auto=true

readme.md

@@ -9,7 +9,7 @@ Minecraft Development for IntelliJ [![forthebadge](http://forthebadge.com/images
 |**CircleCI**|[![Travis Build Status](https://img.shields.io/circleci/project/github/minecraft-dev/MinecraftDev/2016.3.svg?style=flat-square)](https://circleci.com/gh/minecraft-dev/MinecraftDev)|
 |**Travis**  |[![CircleCI Build Status](https://img.shields.io/travis/minecraft-dev/MinecraftDev/2016.3.svg?style=flat-square)](https://travis-ci.org/minecraft-dev/MinecraftDev/)|
 
-Info and Documentation [![Current Release](https://img.shields.io/badge/release-2017.1--0.6.1-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
+Info and Documentation [![Current Release](https://img.shields.io/badge/release-2017.1--0.6.2-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
 ----------------------
 
 Visit [https://minecraftdev.org](https://minecraftdev.org) for information about the project, change logs, features, FAQs, and chat.

src/main/kotlin/com/demonwav/mcdev/platform/mcp/at/AtAnnotator.kt

@@ -23,8 +23,10 @@ import com.intellij.lang.annotation.Annotator
 import com.intellij.lang.annotation.HighlightSeverity
 import com.intellij.openapi.editor.colors.TextAttributesKey
 import com.intellij.openapi.editor.markup.EffectType
+import com.intellij.openapi.editor.markup.TextAttributes
 import com.intellij.openapi.module.ModuleUtilCore
 import com.intellij.psi.PsiElement
+import java.awt.Font
 
 class AtAnnotator : Annotator {
 
@@ -78,11 +80,15 @@ class AtAnnotator : Annotator {
     }
 
     companion object {
-        val key = TextAttributesKey.createTextAttributesKey("AT_UNDERLINE")
-
-        init {
-            key.defaultAttributes.effectType = EffectType.LINE_UNDERSCORE
-            key.defaultAttributes.effectColor = AtSyntaxHighlighter.ELEMENT_NAME.defaultAttributes.foregroundColor
-        }
+        val key = TextAttributesKey.createTextAttributesKey(
+            "AT_UNDERLINE",
+            TextAttributes(
+                null,
+                null,
+                AtSyntaxHighlighter.ELEMENT_NAME.defaultAttributes.foregroundColor,
+                EffectType.LINE_UNDERSCORE,
+                Font.PLAIN
+            )
+        )
     }
 }

src/main/resources/META-INF/plugin.xml

@@ -28,7 +28,7 @@
         Alpha release, may break. More features to come. Please report issues to
         <a href="https://github.com/minecraft-dev/MinecraftDev/issues">the issue tracker</a>!
         <p>
-        v. 2017.1-0.6.1
+        v. 2017.1-0.6.2
       </div>
     ]]>
     </change-notes>