Fixed stairs

This commit is contained in:
thatsIch
2015-09-29 15:47:55 +02:00
parent 8b921a7b79
commit 59dbfb1452
169 changed files with 1470 additions and 1095 deletions
+2
View File
@@ -10,10 +10,12 @@ task javadocJar(type: Jar, dependsOn: myJavadocs) {
from 'build/docs/javadoc/'
}
/*
task sourceJar(type: Jar, dependsOn: classes) {
classifier = 'sources'
from sourceSets.main.allSource
}
*/
task devJar(type: Jar) {
+11 -10
View File
@@ -1,12 +1,13 @@
// searches for NEI and Chicken stuff from compile set
// and adds them to the mods in run dir
task copyChicken(type: Copy, dependsOn: "extractUserDev") {
from { configurations.compile }
include "**/*Chicken*.jar", "**/*NotEnoughItems*.jar"
exclude "**/CodeChickenLib*" // because CCC downloads it anyways.. -_-
into file(minecraft.runDir + "/mods")
mustRunAfter "deobfBinJar"
mustRunAfter "repackMinecraft"
}
tasks.setupDevWorkspace.dependsOn copyChicken
tasks.setupDecompWorkspace.dependsOn copyChicken
// task copyChicken(type: Copy, dependsOn: "extractUserDev") {
// from { configurations.compile }
// include "**/*Chicken*.jar", "**/*NotEnoughItems*.jar"
// exclude "**/CodeChickenLib*" // because CCC downloads it anyways.. -_-
// into file(minecraft.runDir + "/mods")
// mustRunAfter "deobfBinJar"
// mustRunAfter "repackMinecraft"
// }
// tasks.setupDevWorkspace.dependsOn copyChicken
// tasks.setupDecompWorkspace.dependsOn copyChicken
+4 -4
View File
@@ -89,7 +89,7 @@ configurations {
dependencies {
// installable
// mods "mcp.mobius.waila:Waila:${waila_version}_${minecraft_version}:dev"
// mods "mcp.mobius.waila:Waila:${waila_version}_1.8.1:dev"
// mods "mcp.mobius.jabba:Jabba:${jabba_version}_${minecraft_version}:dev"
// mods "codechicken:EnderStorage:${minecraft_version}-${enderstorage_version}:dev"
// mods "codechicken:Translocator:${minecraft_version}-${translocator_version}:dev"
@@ -105,9 +105,9 @@ dependencies {
// mods name: 'ThermalFoundation', version: "[${minecraft_version}]${tfoundation_version}-dev", ext: 'jar'
// compile "codechicken:ForgeMultipart:${minecraft_version}-${fmp_version}:dev"
compile "codechicken:CodeChickenLib:${minecraft_version}-${code_chicken_lib_version}:dev"
compile "codechicken:CodeChickenCore:${minecraft_version}-${code_chicken_core_version}:dev"
compile "codechicken:NotEnoughItems:${minecraft_version}-${nei_version}:dev"
// compile "codechicken:CodeChickenLib:${minecraft_version}-${code_chicken_lib_version}:dev"
// compile "codechicken:CodeChickenCore:${minecraft_version}-${code_chicken_core_version}:dev"
// compile "codechicken:NotEnoughItems:${minecraft_version}-${nei_version}:dev"
// compile "com.mod-buildcraft:buildcraft:${bc_version}:dev"
// provided APIs
+5
View File
@@ -3,5 +3,10 @@ apply plugin: 'idea'
idea {
module {
inheritOutputDirs = true
// excludes integration due to not being available upon port
excludeDirs += file('src/main/java/appeng/integration/modules/')
excludeDirs += file('src/main/java/appeng/fmp/')
excludeDirs += file('src/main/java/appeng/parts/layers/')
}
}
+1 -1
View File
@@ -1,5 +1,5 @@
task wrapper(type: Wrapper) {
gradleVersion = "2.4"
gradleVersion = "2.7"
}
// WAILA