Merge branch 'master' into CI-exp
Some checks failed
JCS-Prod/Orbital-Satellite/pipeline/head There was a failure building this commit

This commit is contained in:
JackCarterSmith 2019-02-26 14:12:53 +01:00
commit 2361beb9ad

View File

@ -98,7 +98,7 @@ dependencies {
compileOnly "mcp.mobius.waila:Hwyla:1.8.20-B35_1.12" compileOnly "mcp.mobius.waila:Hwyla:1.8.20-B35_1.12"
compileOnly 'industrial-craft:industrialcraft-2:release:ex112'//'net.industrial-craft:industrialcraft-2:2.8.+' compileOnly 'industrial-craft:industrialcraft-2:release:ex112'//'net.industrial-craft:industrialcraft-2:2.8.+'
compileOnly 'baubles:Baubles:1.12:1.5.2' compileOnly 'baubles:Baubles:1.12:1.5.2'
deobfCompile 'elucent:albedo:2.0-SNAPSHOT' deobfCompile "albedo:albedo:0.1.3"
} }