Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed merge resolution in build script

Browse source
This commit is contained in:
LemADEC 2017-03-12 18:23:49 +01:00
parent 07c2a001d7
commit c82b0c6e56
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
build.gradle
View file

@ -90,11 +90,7 @@ dependencies {
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
// http://www.gradle.org/docs/current/userguide/dependency_management.html // http://www.gradle.org/docs/current/userguide/dependency_management.html
<<<<<<< HEAD
compileOnly "blusunrize:ImmersiveEngineering:0.10-+:deobf"
=======
compileOnly "blusunrize:ImmersiveEngineering:0.10-+:deobf" compileOnly "blusunrize:ImmersiveEngineering:0.10-+:deobf"
>>>>>>> MC1.7-2017-03-12
// compileOnly "mezz.jei:jei_1.10.2:3.13.+" // compileOnly "mezz.jei:jei_1.10.2:3.13.+"
// compileOnly "mcp.mobius.waila:Waila:1.7.0-B3_1.9.4" // compileOnly "mcp.mobius.waila:Waila:1.7.0-B3_1.9.4"
// compileOnly "slimeknights.mantle:Mantle:1.10.2-1.+" // compileOnly "slimeknights.mantle:Mantle:1.10.2-1.+"
@ -113,11 +109,7 @@ processResources {
// skip source assets // skip source assets
exclude '**/*.pdn' exclude '**/*.pdn'
exclude '**/*.psd' exclude '**/*.psd'
<<<<<<< HEAD
=======
>>>>>>> MC1.7-2017-03-12
// replace stuff in mcmod.info, nothing else // replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) { from(sourceSets.main.resources.srcDirs) {
include 'mcmod.info' include 'mcmod.info'
@ -134,11 +126,7 @@ processResources {
jar { jar {
manifest { manifest {
<<<<<<< HEAD
attributes FMLAT: "warpdrive_at.cfg"
=======
attributes FMLAT: "warpdrive_at.cfg" attributes FMLAT: "warpdrive_at.cfg"
>>>>>>> MC1.7-2017-03-12
attributes FMLCorePlugin: "cr0s.warpdrive.core.FMLLoadingPlugin" attributes FMLCorePlugin: "cr0s.warpdrive.core.FMLLoadingPlugin"
attributes FMLCorePluginContainsFMLMod: "true" attributes FMLCorePluginContainsFMLMod: "true"
} }