Gea/TAIGA
1
0
Fork 0
forked from TAIGA/TAIGA
Code Issues Pull Requests Releases Wiki Activity

updated dependencies

Browse Source 
compatibility with latest TCon
This commit is contained in:
Giovanni Harting
2016-09-11 23:10:43 +02:00
parent 8c334a4cdd
commit 58eacac28c
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
build.gradle
View File

@@ -61,7 +61,7 @@ task buildInfo {
version = project.buildInfo.revision
minecraft {
version = "1.10.2-12.18.1.2011"
version = "1.10.2-12.18.1.2079"
runDir = "run"
// the mappings can be changed at any time, and must be in the following format.
@@ -69,7 +69,7 @@ minecraft {
// stable_# stables are built at the discretion of the MCP team.
// Use non-default mappings at your own risk. they may not allways work.
// simply re-run your setup task after changing the mappings to update your workspace.
mappings = "snapshot_20160701"
mappings = "snapshot_20160911"
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
replace "${version}", project.version
@@ -83,10 +83,10 @@ dependencies {
//deobfCompile "codechicken:CodeChickenLib:1.9.4-2.0.2.39:deobf"
//deobfCompile "codechicken:CodeChickenCore:1.9.4-2.0.3.65:deobf"
//deobfCompile "codechicken:NotEnoughItems:1.9-${nei_version}:dev"
deobfCompile "slimeknights.mantle:Mantle:1.10.2-0.10.3.jenkins161:deobf"
deobfCompile "slimeknights.mantle:Mantle:1.10.2-1.0.0.jenkins170:deobf"
//Old: deobfCompile "slimeknights.mantle:Mantle:1.9-0.10.0.jenkins132:deobf"
deobfCompile "mezz.jei:jei_1.10.2:3.7.6.231"
deobfCompile "slimeknights:TConstruct:1.10-2.3.3a.jenkins271:deobf"
deobfCompile "mezz.jei:jei_1.10.2:3.9.3.252"
deobfCompile "slimeknights:TConstruct:1.10.2-2.5.0.jenkins345:deobf"
//compile files('libs/TConstruct-1.9-2.3.1.DEV.1d4c1de-deobf.jar')
}
@@ -134,8 +134,8 @@ curseforge {
id = '247661'
changelog = project.buildInfo.changes // A file can also be set using: changelog = file('changelog.txt')
releaseType = 'release'
addGameVersion '1.10.2'
addGameVersion '1.10.1'
//addGameVersion '1.10.2'
//addGameVersion '1.10.1'
addArtifact deobfJar
mainArtifact(jar) {

2
src/main/java/com/sosnitzka/taiga/MaterialTraits.java
View File

@@ -8,7 +8,7 @@ import slimeknights.tconstruct.library.materials.HeadMaterialStats;
import slimeknights.tconstruct.library.materials.Material;
import slimeknights.tconstruct.library.traits.AbstractTrait;
import static slimeknights.tconstruct.tools.TinkerMaterials.*;
import static slimeknights.tconstruct.tools.TinkerTraits.*;
public class MaterialTraits {

6
src/main/java/com/sosnitzka/taiga/TAIGA.java
View File

@@ -130,11 +130,11 @@ public class TAIGA {
private void registerTinkerMaterials() {
double d = durabilityFactorGeneral;
System.out.println("DURABILITY FACTOR" + d);
System.out.println("Durability=" + d);
float s = (float) speedFactorGeneral;
System.out.println("SPEED FACTOR" + s);
System.out.println("Speed=" + s);
float a = (float) attackFactorGeneral;
System.out.println("ATTACK FACTOR" + a);
System.out.println("Attack=" + a);
// ARCANE ORES
registerTinkerMaterial("Tiberium", tiberium, tiberiumFluid, (int) (223 * d), 6.2f * s, 8.35f * a, 0.63f, 50, 50, OBSIDIAN, false, true);