diff --git a/README.md b/README.md index 56b8343..5c75670 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ The mod is planned to keep original look of GregTech 4 with some technical impro ## Contributing & Build guide -You are welcome to participate in development, but if you planning to **add something new** make sure you **disscussed it with @TheDarkDnKTv** before you started write actual code. Since policy is keeping original look, I can disagree with you about changes. +You are welcome to participate in development, but if you planning to **add something new** make sure you **disscussed it with @TheDarkDnKTv** before you started write actual code. Since policy is keeping original look, I can disagree with you about changes. #### Setting up enviroment ``` @@ -31,6 +31,9 @@ git clone https://github.com/Nukepowered/GregTech4.git gradlew setupDecompWorkspace gradlew eclipse/idea ``` + +*Do not forget to put `-Dfml.coreMods.load=gregtechmod.common.asm.GT_CoreMod` VM argument for launch, otherwise coremod will not work* + #### Building jar file ``` diff --git a/build.gradle b/build.gradle index 99aebbc..8fb3db2 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,7 @@ minecraft { repositories { maven { - url = "http://maven.ic2.player.to/" + url = "https://gregtech.overminddl1.com/" } maven { name = "ChickenBones maven" @@ -66,6 +66,12 @@ jar { } } +sourceSets { + main { + output.resourcesDir = output.classesDir + } +} + dependencies { compile "codechicken:CodeChickenCore:${mc_ver}-${ccc_version}:dev" compile "codechicken:NotEnoughItems:${mc_ver}-${nei_version}:dev" diff --git a/gradle.properties b/gradle.properties index 902690f..f33911c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,4 +4,4 @@ ccc_version=1.0.7.47 nei_version=1.0.5.120 ccl_version=1.1.3.138 ic2_ver=2.2.828 -forestry_ver=4.2.9.57 \ No newline at end of file +forestry_ver=4.2.16.64 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a6aff76..039e57b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip diff --git a/libs/Railcraft_1.7.10-9.12.2.1-dev.jar b/libs/Railcraft_1.7.10-9.12.2.1-dev.jar index 5630a9d..a8cc462 100644 Binary files a/libs/Railcraft_1.7.10-9.12.2.1-dev.jar and b/libs/Railcraft_1.7.10-9.12.2.1-dev.jar differ