Merge branch 'dev' into 2017.2

# 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.2-0.7.0
+version = 2017.2-0.7.1
 downloadIdeaSources = true
 
 org.gradle.script.lang.kotlin.accessors.auto=true

readme.md

@@ -10,7 +10,7 @@ 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-2017.2--0.7.0-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
+Info and Documentation [![Current Release](https://img.shields.io/badge/release-2017.2--0.7.1-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/grammars/NbttLexer.flex

@@ -122,7 +122,7 @@ LONG_ARRAY_LITERAL = [+-]?\d+[lL]?
     // Everything below this is invalid
     // we just want to match them correctly so the parser has something to grab on to
 
-    {BYTE_LITERAL}              { stack.offerFirst(IN_INT_ARRAY); yybegin(EXPECT_NEXT); return INT_LITERAL; }
+    {BYTE_LITERAL}              { stack.offerFirst(IN_INT_ARRAY); yybegin(EXPECT_NEXT); return BYTE_LITERAL; }
     {SHORT_LITERAL}             { stack.offerFirst(IN_INT_ARRAY); yybegin(EXPECT_NEXT); return SHORT_LITERAL; }
     {LONG_LITERAL}              { stack.offerFirst(IN_INT_ARRAY); yybegin(EXPECT_NEXT); return LONG_LITERAL; }
     {FLOAT_LITERAL}             { stack.offerFirst(IN_INT_ARRAY); yybegin(EXPECT_NEXT); return FLOAT_LITERAL; }
@@ -159,12 +159,13 @@ LONG_ARRAY_LITERAL = [+-]?\d+[lL]?
     "["                         { stack.offerFirst(IN_LIST); stack.offerFirst(EXPECT_NEXT); yybegin(IN_LIST); return LBRACKET; }
     "bytes"                     { stack.offerFirst(IN_LIST); stack.offerFirst(EXPECT_NEXT); yybegin(IN_BYTE_ARRAY); return BYTES; }
     "ints"                      { stack.offerFirst(IN_LIST); stack.offerFirst(EXPECT_NEXT); yybegin(IN_INT_ARRAY); return INTS; }
+    "longs"                     { stack.offerFirst(IN_LIST); stack.offerFirst(EXPECT_NEXT); yybegin(IN_LONG_ARRAY); return LONGS; }
 
     ","                         { return COMMA; }
 
     "]"                         { yybegin(stack.pollFirst()); return RBRACKET; }
 
-    {BYTE_LITERAL}              { stack.offerFirst(IN_LIST); yybegin(EXPECT_NEXT); return INT_LITERAL; }
+    {BYTE_LITERAL}              { stack.offerFirst(IN_LIST); yybegin(EXPECT_NEXT); return BYTE_LITERAL; }
     {SHORT_LITERAL}             { stack.offerFirst(IN_LIST); yybegin(EXPECT_NEXT); return SHORT_LITERAL; }
     {INT_LITERAL}               { stack.offerFirst(IN_LIST); yybegin(EXPECT_NEXT); return INT_LITERAL; }
     {LONG_LITERAL}              { stack.offerFirst(IN_LIST); yybegin(EXPECT_NEXT); return LONG_LITERAL; }

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.2-0.7.0
+        v. 2017.2-0.7.1
       </div>
     ]]>
     </change-notes>