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

# Conflicts:
#	src/main/scala/li/cil/oc/server/component/RedstoneBundled.scala
This commit is contained in:
payonel 2018-11-03 18:54:51 -07:00
commit df7825dcf2

View File

@ -4,7 +4,7 @@ buildscript {
jcenter()
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
url = "https://files.minecraftforge.net/maven"
}
}
dependencies {