Merge branch 'OC1.3-MC1.7.2' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10

This commit is contained in:
Florian Nücke 2014-07-17 17:02:37 +02:00
commit 70dbb33d46

View File

@ -25,13 +25,13 @@ processResources {
expand 'version': project.simpleVersion, 'mcversion': config.minecraft.version expand 'version': project.simpleVersion, 'mcversion': config.minecraft.version
} }
from(sourceSets.main.resources.srcDirs) { from(sourceSets.main.resources.srcDirs) {
include 'reference.conf' include 'application.conf'
filter { line -> filter { line ->
line.replaceAll("@VERSION@", project.simpleVersion) line.replaceAll("@VERSION@", project.simpleVersion)
} }
} }
from(sourceSets.main.resources.srcDirs) { from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info' exclude 'mcmod.info'
exclude 'reference.conf' exclude 'application.conf'
} }
} }