Merge branch 'NikkyAI-master'

.gitignore

@@ -0,0 +1,16 @@
+# gradle
+
+.gradle/
+build/
+out/
+
+# idea
+
+.idea/
+*.iml
+*.ipr
+*.iws
+
+# fabric
+
+run/

build.gradle

@@ -1,24 +1,10 @@
-buildscript {
-	repositories {
-		jcenter()
-		maven {
-			name = 'Fabric'
-			url = 'http://maven.modmuss50.me/'
-		}
-	}
-	dependencies {
-		classpath "net.fabricmc:fabric-loom:0.0.13-SNAPSHOT"
-	}
-}
-
 plugins {
 	id 'java'
 	id 'eclipse'
 	id 'idea'
+	id 'fabric-loom' version '0.0.14-SNAPSHOT'
 }
 
-apply plugin: net.fabricmc.loom.LoomGradlePlugin
-
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 

settings.gradle

@@ -0,0 +1,10 @@
+pluginManagement {
+    repositories {
+        jcenter()
+        maven {
+            name = 'Fabric'
+            url = 'http://maven.modmuss50.me/'
+        }
+        gradlePluginPortal()
+    }
+}