Merge branch 'master-MC1.7.10' into master-MC1.8.9

This commit is contained in:
Vexatos 2017-10-14 18:44:37 +02:00
commit d7bb35d6f0
2 changed files with 0 additions and 4 deletions

View File

@ -43,9 +43,6 @@ def getGitRef() {
if (System.getenv("BUILD_NUMBER") != null) if (System.getenv("BUILD_NUMBER") != null)
version += ".${System.getenv("BUILD_NUMBER")}" version += ".${System.getenv("BUILD_NUMBER")}"
if (config.oc.subversion != null && config.oc.subversion != "")
version += "-${config.oc.subversion}"
if (System.getenv("BUILD_NUMBER") == null) if (System.getenv("BUILD_NUMBER") == null)
version += "+" + getGitRef() version += "+" + getGitRef()

View File

@ -2,7 +2,6 @@ minecraft.version=1.8.9
forge.version=11.15.1.1808 forge.version=11.15.1.1808
oc.version=1.7.0 oc.version=1.7.0
oc.subversion=dev
ae2.version=rv2-beta-26 ae2.version=rv2-beta-26
bc.version=7.0.9 bc.version=7.0.9