upstream/AE2FluidCraft-Rework
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/AE2FluidCraft-Rework.git synced 2026-11-14 01:04:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge conflic fix

Browse Source
This commit is contained in:
Martin Robertz committed 2025-09-07 13:24:35 +02:00
1 parent 446920485a
commit 029b479297
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
dependencies.gradle
+2 -2
View File
@@ -35,7 +35,7 @@
*/
dependencies {
api('com.github.GTNewHorizons:NotEnoughItems:2.7.80-GTNH:dev')
api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-683-GTNH:dev')
api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-684-GTNH:dev')
api('curse.maven:cofh-core-69162:2388751')
api('com.github.GTNewHorizons:waila:1.8.12:dev')
api("com.github.GTNewHorizons:GTNHLib:0.6.39:dev")
@@ -48,7 +48,7 @@ dependencies {
compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.35:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.17:dev')
compileOnly('com.github.GTNewHorizons:EnderIO:2.9.22:dev')
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.444:dev') {
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.446:dev') {
exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework'
exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial'
}