Merge remote-tracking branch 'origin/master-MC1.11.2' into master-MC1.11.2

This commit is contained in:
Nedelosk committed 2017-07-29 23:21:17 +02:00
commit 2ca2cef6a2
2 files changed
+4 -4

No files matched your search

+3 -3
View File
@@ -73,9 +73,9 @@ processResources {
// replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) {
include 'mcmod.info'
expand 'version': project.version,
'mcversion': project.minecraft.version,
'modid': "binniemods"
// replace version and mcversion
expand 'version':project.version, 'mcversion':project.minecraft.version
}
// copy everything else, thats not the mcmod.info
+1 -1
View File
@@ -12,7 +12,7 @@
"logoFile": "/assets/binniecore/logo.png",
"parent": "",
"requiredMods": [ "forestry" ],
"dependencies": [ "forestry" ],
"dependencies": [ "forestry" ]
},
{
"modid": "extrabees",