Merge branch 'master' of https://github.com/gamax92/Thistle

Author: gamax92

build.gradle

@@ -17,7 +17,7 @@ buildscript {
 
 apply plugin: 'forge'
 
-version = "1.7.10-1.0.4"
+version = "1.7.10-1.1.0"
 group = "gamax92.thistle"
 archivesBaseName = "Thistle"
 

src/main/java/gamax92/thistle/Thistle.java

@@ -19,7 +19,7 @@
 public class Thistle {
 	public static final String MODID = "thistle";
 	public static final String NAME = "Thistle Computer";
-	public static final String VERSION = "1.0.4";
+	public static final String VERSION = "1.1.0";
 
 	@Mod.Instance
 	public static Thistle instance;