diff options
| -rw-r--r-- | .idea/vcs.xml | 6 | ||||
| -rw-r--r-- | GTNewHorizonsCoreMod-1.7.10-1.5.10-.jar | bin | 3287685 -> 0 bytes | |||
| -rw-r--r-- | build.gradle | 6 | ||||
| -rw-r--r-- | build.properties | 2 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.jar | bin | 51017 -> 53324 bytes | |||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 4 | ||||
| -rw-r--r-- | src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java | 4 |
7 files changed, 8 insertions, 14 deletions
diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7f4c..0000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="VcsDirectoryMappings"> - <mapping directory="$PROJECT_DIR$" vcs="Git" /> - </component> -</project>
\ No newline at end of file diff --git a/GTNewHorizonsCoreMod-1.7.10-1.5.10-.jar b/GTNewHorizonsCoreMod-1.7.10-1.5.10-.jar Binary files differdeleted file mode 100644 index 45d7dc3183..0000000000 --- a/GTNewHorizonsCoreMod-1.7.10-1.5.10-.jar +++ /dev/null diff --git a/build.gradle b/build.gradle index 440fee920a..6fccbe64e8 100644 --- a/build.gradle +++ b/build.gradle @@ -22,8 +22,8 @@ apply plugin: 'signing' allprojects { apply plugin: 'java' - sourceCompatibility = 1.7 - targetCompatibility = 1.7 + sourceCompatibility = 1.8 + targetCompatibility = 1.8 } file "build.properties" withReader { @@ -74,7 +74,7 @@ repositories { dependencies { compile "eu.usrv:YAMCore:${config.minecraft.version}-${config.yamcore.version}:deobf" compile "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev" - provided name: 'CoFHLib', version: config.cofhlib.version, ext: 'jar' + //provided name: 'CoFHLib', version: config.cofhlib.version, ext: 'jar' provided name: 'CoFHCore', version: config.cofhcore.version, ext: 'jar' compile "codechicken:CodeChickenLib:${config.minecraft.version}-${config.codechickenlib.version}:dev" compile "codechicken:CodeChickenCore:${config.minecraft.version}-${config.codechickencore.version}:dev" diff --git a/build.properties b/build.properties index 4a262ce947..7cdca650d8 100644 --- a/build.properties +++ b/build.properties @@ -6,7 +6,7 @@ ic2.version=2.2.790-experimental codechickenlib.version=1.1.3.140 codechickencore.version=1.0.7.47 nei.version=1.0.5.120 -gregtech.jenkinsbuild=175 +gregtech.jenkinsbuild=192 gregtech.version=5.09.33.03 cofhcore.version=[1.7.10]3.1.4-329-dev cofhlib.version=[1.7.10]1.0.3-175-dev diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differindex b761216703..3baa851b28 100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7b6f003e09..e4af87c689 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri May 04 06:18:33 CEST 2018 +#Tue Dec 04 18:55:27 CET 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip diff --git a/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java b/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java index b7e96707be..f38fc1fc60 100644 --- a/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java +++ b/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java @@ -77,7 +77,7 @@ public class TT_recipeAdder extends GT_RecipeAdder { ItemStack[] aStacks = (ItemStack[]) obj; if (aStacks.length > 0) { tInputs[i] = aStacks[0]; - tAlts[i] = (ItemStack[]) Arrays.copyOf(aStacks, aStacks.length); + tAlts[i] = Arrays.copyOf(aStacks, aStacks.length); continue; } } else if (obj instanceof Object[]) { @@ -85,7 +85,7 @@ public class TT_recipeAdder extends GT_RecipeAdder { List<ItemStack> tList; if (objs.length >= 2 && !(tList = GT_OreDictUnificator.getOres(objs[0])).isEmpty()) { try { - int tAmount = (int) objs[1]; + int tAmount = ((Number) objs[1]).intValue(); List<ItemStack> uList = new ArrayList<>(); for (ItemStack tStack : tList) { ItemStack uStack = GT_Utility.copyAmount(tAmount, tStack); |