Merge branch 'master' into 1.8.8

# Conflicts:
#	build.gradle
This commit is contained in:
modmuss50 2015-12-19 09:53:54 +00:00
commit 48a94205e2

View file

@ -69,9 +69,9 @@ configurations {
def ENV = System.getenv()
if (ENV.BUILD_NUMBER) {
version = "0.7.3." + "${System.getenv().BUILD_NUMBER}"
version = "0.7.4." + "${System.getenv().BUILD_NUMBER}"
} else {
version = "0.7.3.BUILD"
version = "0.7.4.BUILD"
}
minecraft {