diff --git a/.gitignore b/.gitignore index ad94d50e1..7988aa7c0 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,6 @@ # OS X .DS_Store + +# VSCode +/.vscode diff --git a/build.gradle b/build.gradle index 561dbacaa..fcc99a357 100644 --- a/build.gradle +++ b/build.gradle @@ -90,7 +90,7 @@ repositories { } maven { name = "mobius" - url = "http://mobiusstrip.eu/maven" + url = "http://default.mobiusstrip.eu/maven" } maven { name = "dmodoomsirius" @@ -112,10 +112,10 @@ repositories { name 'ProjectRed' url 'http://files.projectredwiki.com/maven/' } - ivy { - name 'ColoredLightCore' - artifactPattern "http://coloredlightscore.us.to:8080/job/ColoredLightsCore%20v1.7.10/${config.coloredlights.build}/artifact/build/libs/[module]-[revision]-[classifier].[ext]" - } + // ivy { + // name 'ColoredLightCore' + // artifactPattern "http://coloredlightscore.us.to:8080/job/ColoredLightsCore%20v1.7.10/${config.coloredlights.build}/artifact/build/libs/[module]-[revision]-[classifier].[ext]" + // } ivy { name "BuildCraft" artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision]-[classifier].[ext]" @@ -199,7 +199,7 @@ dependencies { provided ("mrtjp:ProjectRed:${config.projred.version}:dev") { exclude module: 'CoFHCore' } - provided "coloredlightscore:ColoredLightsCore:${config.coloredlights.version}:api" + // provided "coloredlightscore:ColoredLightsCore:${config.coloredlights.version}:api" provided name: 'buildcraft', version: config.bc.version, classifier: "dev", ext: 'jar' provided name: 'GalacticraftCoreAll', version: config.gc.version, ext: 'jar' diff --git a/build.properties b/build.properties index c86b8512f..aca168d52 100644 --- a/build.properties +++ b/build.properties @@ -41,10 +41,10 @@ redlogic.version=59.0.3 rotc.version=V5c thaumicenergistics.cf=2277/520 thaumicenergistics.version=1.0.0.1-RV2 -tis3d.version=MC1.7.10-0.7.1.53 +tis3d.version=MC1.7.10-1.2.4.70 tmech.version=75.0afb56c re.version=3.0.0.342 -waila.version=1.5.8a +waila.version=1.5.10 wrcbe.version=1.4.1.2 cofhcore.cf=2246/697 cofhcore.version=[1.7.10]3.0.3B4-302-dev