Skip to content

Commit 77751ff

Browse files
committed
Fix ProjectRed dependency
1 parent 24337f0 commit 77751ff

File tree

2 files changed

+19
-10
lines changed

2 files changed

+19
-10
lines changed

build.gradle

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,10 @@ repositories {
106106
name 'DVS1 Maven FS'
107107
url 'http://dvs1.progwml6.com/files/maven'
108108
}
109-
109+
maven {
110+
name 'ProjectRed'
111+
url 'http://files.projectredwiki.com/maven/'
112+
}
110113
ivy {
111114
name "BuildCraft"
112115
artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision]-[classifier].[ext]"
@@ -119,19 +122,18 @@ repositories {
119122
name 'Mekanism'
120123
artifactPattern "http://ci.cil.li/job/Mekanism/${config.mekanism.build}/artifact/output/[module]-${config.minecraft.version}-[revision].${config.mekanism.build}.[ext]"
121124
}
122-
ivy {
123-
name 'ProjectRed'
124-
artifactPattern "http://projectredwiki.com/maven/mrtjp/[module]/${config.minecraft.version}-[revision]/[module]-${config.minecraft.version}-[revision]-dev.[ext]"
125-
}
126125
ivy {
127126
name 'immibis'
128127
artifactPattern "https://dl.dropboxusercontent.com/u/2944265/mods/autobuilt/files/[module]-[revision].[ext]"
129128
}
130-
131129
ivy {
132130
name 'CoFHLib'
133131
artifactPattern "http://addons-origin.cursecdn.com/files/${config.cofhlib.cf}/[module]-[revision].[ext]"
134132
}
133+
ivy {
134+
name 'CoFHCore'
135+
artifactPattern "http://addons-origin.cursecdn.com/files/${config.cofhcore.cf}/[module]-[revision].[ext]"
136+
}
135137
ivy {
136138
name 'MineFactoryReloaded'
137139
artifactPattern "http://addons-origin.cursecdn.com/files/${config.mfr.cf}/[module]-[revision].[ext]"
@@ -166,7 +168,9 @@ configurations {
166168

167169
dependencies {
168170
provided "appeng:RotaryCraft:${config.rotc.version}:api"
169-
provided "appeng:appliedenergistics2:${config.ae2.version}:dev"
171+
provided ("appeng:appliedenergistics2:${config.ae2.version}:dev") {
172+
exclude module: 'buildcraft'
173+
}
170174
provided "codechicken:CodeChickenLib:${config.minecraft.version}-${config.ccl.version}:dev"
171175
provided "codechicken:EnderStorage:${config.minecraft.version}-${config.es.version}:dev"
172176
provided "codechicken:ForgeMultipart:${config.minecraft.version}-${config.fmp.version}:dev"
@@ -182,14 +186,17 @@ dependencies {
182186
provided "notenoughkeys:NeK:${config.minecraft.version}-${config.nek.version}:deobf-dev"
183187
provided "qmunity:QmunityLib:${config.qmunitylib.version}:deobf"
184188
provided "tmech:TMechworks:${config.minecraft.version}-${config.tmech.version}:deobf"
189+
provided ("mrtjp:ProjectRed:${config.projred.version}:dev") {
190+
exclude module: 'CoFHCore'
191+
}
185192

186-
provided name: "buildcraft", version: "${config.bc.version}", classifier: "dev", ext: 'jar'
193+
provided name: 'buildcraft', version: config.bc.version, classifier: "dev", ext: 'jar'
187194
provided name: 'GalacticraftCoreAll', version: config.gc.version, ext: 'jar'
188195
provided name: 'MekanismAll', version: config.mekanism.version, ext: 'jar'
189-
provided name: 'ProjectRed', version: config.projred.version, ext: 'jar'
190196
provided name: 'redlogic', version: config.redlogic.version, ext: 'jar'
191197

192198
provided name: 'CoFHLib', version: config.cofhlib.version, ext: 'jar'
199+
provided name: 'CoFHCore', version: config.cofhcore.version, ext: 'jar'
193200
provided name: 'MineFactoryReloaded', version: config.mfr.version, ext: 'jar'
194201
provided name: 'ComputerCraft', version: config.cc.version, ext: 'jar'
195202
provided name: 'EnderIO', version: config.eio.version, ext: 'jar'

build.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ mfr.cf=2229/626
3232
mfr.version=[1.7.10]2.8.0RC8-86
3333
nei.version=1.0.3.57
3434
nek.version=1.0.0b35dev
35-
projred.version=4.7.0pre2.87
35+
projred.version=1.7.10-4.6.2.82
3636
qmunitylib.version=0.1.105
3737
rc.cf=2219/321
3838
rc.version=1.7.10-9.4.0.0
@@ -42,5 +42,7 @@ tmech.version=75.0afb56c
4242
re.version=3.0.0.342
4343
waila.version=1.5.8a
4444
wrcbe.version=1.4.1.2
45+
cofhcore.cf=2246/697
46+
cofhcore.version=[1.7.10]3.0.3B4-302-dev
4547

4648
maven.url=file:///home/www/maven.cil.li/web

0 commit comments

Comments
 (0)