Merge branch 'dev' into 2018.1

Author: DenWav

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,16 @@
+Please include the following information in all issues:
+
+* Minecraft Development for IntelliJ plugin version
+* IntelliJ version
+* Operating System (this has come up enough times to be important)
+* Target platforms
+  * Either where the issue occurs
+  * Or where the feature request is relevant
+
+For feature requests, try to avoid vague requests. The more details there are explaining what the feature request is, how it should work,
+and why it would be useful, the more likely it'll be able to be add quickly.  Feel free to be vague if you have a general idea that
+something might be cool, but you can't think of specifics, but these are less likely to be prioritized.
+
+For issues, bugs, or error stack traces, always include a stack trace if there is one. Otherwise, the more information you can provide in
+terms of how to reproduce the problem, the more likely it'll be fixed. If there is something specific about your project, a link to the
+GitHub project can be very helpful.

.github/stale.yml

@@ -0,0 +1,22 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 30
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 14
+# we only want issues
+only: 'issues'
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - 'status: accepted'
+  - 'status: future'
+  - 'status: wip'
+  - 'type: bug'
+# Label to use when marking an issue as stale
+staleLabel: 'status: stale'
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+closeComment: >
+  This issue has been automatically closed because it has not had
+  activity in a long time. Please feel free to reopen it or create a new issue.

build.gradle.kts

@@ -3,7 +3,7 @@
  *
  * https://minecraftdev.org
  *
- * Copyright (c) 2017 minecraft-dev
+ * Copyright (c) 2018 minecraft-dev
  *
  * MIT License
  */
@@ -87,8 +87,8 @@ val gradleToolingExtensionJar = task<Jar>(gradleToolingExtension.jarTaskName) {
 
 dependencies {
     "kotlin"(kotlin("stdlib")) { isTransitive = false }
-    compile(kotlin("stdlib-jre7")) { isTransitive = false }
-    compile(kotlin("stdlib-jre8")) { isTransitive = false }
+    compile(kotlin("stdlib-jdk7")) { isTransitive = false }
+    compile(kotlin("stdlib-jdk8")) { isTransitive = false }
 
     // Add tools.jar for the JDI API
     compile(files(Jvm.current().toolsJar))
@@ -132,6 +132,7 @@ publishPlugin {
 
 tasks.withType<JavaCompile> {
     options.encoding = "UTF-8"
+    options.compilerArgs = listOf("-proc:none")
 }
 
 tasks.withType<KotlinCompile> {
@@ -166,7 +167,7 @@ idea {
 license {
     header = file("copyright.txt")
     include("**/*.java", "**/*.kt", "**/*.groovy", "**/*.gradle", "**/*.xml", "**/*.properties", "**/*.html")
-    exclude("com/demonwav/mcdev/platform/mcp/at/gen/**", "com/demonwav/mcdev/nbt/lang/gen/**")
+    exclude("com/demonwav/mcdev/platform/mcp/at/gen/**", "com/demonwav/mcdev/nbt/lang/gen/**", "com/demonwav/mcdev/i18n/lang/gen/**")
 }
 
 // Credit for this intellij-rust
@@ -223,10 +224,15 @@ val generateAtPsiAndParser = generatePsiAndParser("generateAtPsiAndParser", "AtP
 val generateNbttLexer = generateLexer("generateNbttLexer", "NbttLexer", "nbt/lang/gen/")
 val generateNbttPsiAndParser = generatePsiAndParser("generateNbttPsiAndParser", "NbttParser", "nbt/lang/gen")
 
+val generateI18nLexer = generateLexer("generateI18nLexer", "I18nLexer", "i18n/lang/gen/")
+val generateI18nPsiAndParser = generatePsiAndParser("generateI18nPsiAndParser", "I18nParser", "i18n/lang/gen")
+
+val generateI18nTemplateLexer = generateLexer("generateI18nTemplateLexer", "I18nTemplateLexer", "i18n/lang/gen/")
+
 val generate = task("generate") {
     group = "minecraft"
     description = "Generates sources needed to compile the plugin."
-    dependsOn(generateAtLexer, generateAtPsiAndParser, generateNbttLexer, generateNbttPsiAndParser)
+    dependsOn(generateAtLexer, generateAtPsiAndParser, generateNbttLexer, generateNbttPsiAndParser, generateI18nLexer, generateI18nPsiAndParser, generateI18nTemplateLexer)
     outputs.dir("gen")
 }
 

copyright.txt

@@ -2,6 +2,6 @@ Minecraft Dev for IntelliJ
 
 https://minecraftdev.org
 
-Copyright (c) 2017 minecraft-dev
+Copyright (c) 2018 minecraft-dev
 
 MIT License

gradle.properties

@@ -3,14 +3,14 @@
 #
 # https://minecraftdev.org
 #
-# Copyright (c) 2017 minecraft-dev
+# Copyright (c) 2018 minecraft-dev
 #
 # MIT License
 #
 # suppress inspection "UnusedProperty" for whole file
-ideaVersion = 181-SNAPSHOT
+ideaVersion = 181-EAP-SNAPSHOT
 javaVersion = 1.8
 
 group = com.demonwav.minecraft-dev
-version = 2018.1-1.1.1
+version = 2018.1-1.2.0
 downloadIdeaSources = true

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

license.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 minecraft-dev
+Copyright (c) 2018 minecraft-dev
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

readme.md

@@ -10,10 +10,10 @@ Minecraft Development for IntelliJ
 |**CircleCI**|[![Travis Build Status](https://img.shields.io/circleci/project/github/minecraft-dev/MinecraftDev/dev.svg?style=flat-square)](https://circleci.com/gh/minecraft-dev/MinecraftDev)|
 | **Travis** |[![CircleCI Build Status](https://img.shields.io/travis/minecraft-dev/MinecraftDev/dev.svg?style=flat-square)](https://travis-ci.org/minecraft-dev/MinecraftDev/)|
 
-Info and Documentation [![Current Release](https://img.shields.io/badge/release-2018.1--1.1.1-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
+Info and Documentation [![Current Release](https://img.shields.io/badge/release-2018.1--1.2.0-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.
+Visit [https://minecraftdev.org](https://minecraftdev.org) for some information about the project, FAQs, and chat.
 
 Installation
 ------------
@@ -66,6 +66,7 @@ Developers
 
 - Project Owner - [**@DemonWav** - Kyle Wood](https://github.com/DemonWav)
 - [**@Minecrell**](https://github.com/Minecrell)
+- [**@PaleoCrafter** - Marvin Rösch](https://github.com/PaleoCrafter)
 
 #### **Contributors**
 

settings.gradle.kts

@@ -3,7 +3,7 @@
  *
  * https://minecraftdev.org
  *
- * Copyright (c) 2017 minecraft-dev
+ * Copyright (c) 2018 minecraft-dev
  *
  * MIT License
  */

src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/forge/gradle/tooling/ForgePatcherModelBuilderImpl.groovy

@@ -3,7 +3,7 @@
  *
  * https://minecraftdev.org
  *
- * Copyright (c) 2017 minecraft-dev
+ * Copyright (c) 2018 minecraft-dev
  *
  * MIT License
  */