From 50016ae707088ceccb54bc6b8f631f103204d8da Mon Sep 17 00:00:00 2001 From: Blood-Asp Date: Sat, 24 Oct 2015 14:56:00 +0200 Subject: [PATCH] Tried updating builds. Is this right? cofhcore and cofhlib incompatible versions. Codechickencore missing. Updated to a non broken forge version. --- .gitignore | 4 ++++ build.gradle | 1 + build.properties | 7 ++++--- src/main/java/gregtech/GT_Mod.java | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3187928d..b11df8c6 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,7 @@ tmp/ local.properties .settings/ .loadpath +/eclipse # Eclipse Core .project @@ -70,3 +71,6 @@ local.properties .idea_modules/ /out/ +gradle/wrapper/gradle-wrapper.properties +gradlew +gradlew.bat diff --git a/build.gradle b/build.gradle index fb8b1601..cf59e974 100644 --- a/build.gradle +++ b/build.gradle @@ -82,6 +82,7 @@ dependencies { exclude module: '*' } provided "codechicken:CodeChickenLib:${config.minecraft.version}-${config.codechickenlib.version}:dev" + provided "codechicken:CodeChickenCore:${config.minecraft.version}-${config.codechickencore.version}:dev" provided "codechicken:NotEnoughItems:${config.minecraft.version}-${config.nei.version}:dev" provided "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev" provided "net.sengir.forestry:forestry_${config.minecraft.version}:${config.forestry.version}:dev" diff --git a/build.properties b/build.properties index 8f49f5af..0b30a5f4 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ minecraft.version=1.7.10 -forge.version=10.13.4.1481-1.7.10 +forge.version=10.13.4.1517-1.7.10 gt.version=5.08.31 @@ -7,10 +7,11 @@ ae2.version=rv2-beta-33 applecore.version=1.7.10-1.2.1+107.59407 buildcraft.version=7.1.11 codechickenlib.version=1.1.3.140 +codechickencore.version=1.0.7.47 cofhcore.cf=2246/697 -cofhcore.version=[1.7.10]3.0.3B4-302-dev +cofhcore.version=[1.7.10]3.0.3-303-dev cofhlib.cf=2230/207 -cofhlib.version=[1.7.10]1.0.0RC7-127 +cofhlib.version=[1.7.10]1.0.3-175-dev enderio.cf=2219/296 enderio.version=1.7.10-2.3.0.417_beta enderiocore.version=1.7.10-0.1.0.25_beta diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java index f81abdab..cf85dd6f 100644 --- a/src/main/java/gregtech/GT_Mod.java +++ b/src/main/java/gregtech/GT_Mod.java @@ -61,7 +61,7 @@ import java.util.Map.Entry; @Mod(modid = "gregtech", name = "GregTech", version = "MC1710", useMetadata = false, dependencies = "required-after:IC2; after:Forestry; after:PFAAGeologica; after:Thaumcraft; after:Railcraft; after:appliedenergistics2; after:ThermalExpansion; after:TwilightForest; after:harvestcraft; after:magicalcrops; after:BuildCraft|Transport; after:BuildCraft|Silicon; after:BuildCraft|Factory; after:BuildCraft|Energy; after:BuildCraft|Core; after:BuildCraft|Builders; after:GalacticraftCore; after:GalacticraftMars; after:GalacticraftPlanets; after:ThermalExpansion|Transport; after:ThermalExpansion|Energy; after:ThermalExpansion|Factory; after:RedPowerCore; after:RedPowerBase; after:RedPowerMachine; after:RedPowerCompat; after:RedPowerWiring; after:RedPowerLogic; after:RedPowerLighting; after:RedPowerWorld; after:RedPowerControl;") public class GT_Mod implements IGT_Mod { - public static final int VERSION = 508; + public static final int VERSION = 509; public static final int REQUIRED_IC2 = 624; @Mod.Instance("gregtech") public static GT_Mod instance;