Merge branch '1.12' of https://github.com/TechReborn/TechReborn into 1.12-v2.16

This commit is contained in:
Prospector 2018-06-12 15:13:23 -07:00
commit ac9c01555f
32 changed files with 647 additions and 150 deletions

View file

@ -85,7 +85,7 @@ configurations {
compile.extendsFrom shade
}
version = "2.15.12"
version = "2.15.15"
def ENV = System.getenv()
if (ENV.BUILD_NUMBER) {