Merge branch 'dev' into 2020.2

# Conflicts:
#	gradle.properties

Author: DenWav

gradle.properties

@@ -9,10 +9,12 @@
 #
 
 # suppress inspection "UnusedProperty" for whole file
+kotlin.code.style=official
+
 ideaVersion = 2020.2
 ideaVersionName = 2020.2
 
-coreVersion = 1.5.4
+coreVersion = 1.5.5
 downloadIdeaSources = true
 
 pluginTomlVersion = 0.2.140.3644-202

readme.md

@@ -44,7 +44,7 @@ Minecraft Development for IntelliJ
     </tr>
 </table>
 
-Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.5.4-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
+Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.5.5-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
 ----------------------
 
 <a href="https://discord.gg/j6UNcfr"><img src="https://i.imgur.com/JXu9C1G.png" height="48px"></img></a>