[1.2] Material rework (#60)

* Developement tests for nbt data in traits

* Lot of trait changes and better balancing

* Traits reworked a bit, new traits added.

* First correction of NBT Data in Trait (Soulbound). Is shown twice. Still needs corrections.

* Few fixes in traits and new trait "catcher"

* Small fix, needs workaround

* fixed some catch issues

* Fixed Catcher and Reviving Traits, new Trait: Souleater. Updated build.gradle for new TiC Version.

* Splitted SoulEater to get the bad touch to an extra trait "Cursed". Added method for using nbt more easily. Changed declaration names of fluids

* Some minor changes in Traits, Registry and Utils.

* Iron_nugget is replaced with oreDict Item when not loaded via TAIGA.

* Beginning of new material  integration. Lot of names changed, lot more work to do here. Many null pointer exceptions and no changes of values up to now.

* Some Small changes in names, registry and recipes

* Some weird stuff I don't remember :D

* fixed some things I missed while merging

* Rollback to something

* More Stuff

* fixed some merging stuff

* Fixed some misspelled names. Actually working with lots of restrictions.

* Rearranged alloys, tried to add blocks / ingots for non-tinker-materials, but they won't work.

* Again tried to fix the melting issue, but non-tinker materials still are not able to be casted as a block, ingot or nugget...

* Fixed integration of materials without tools.

* changed IMC to direct lib calls

* removed more IMC, removed redundant code

* some reformatting

* Alloy integration reworked, needs to be balanced.

* updated deps, renamed some func's, added duplicate material check

* some more renaming

* some reformatting, fixed wrong import, fixed string cmp's

* Added images for blocks, ingots, nuggets and dust. Json changes do not work yet.

* some reformatting

* Removed old json files. Placeholder needed.

* Fixed block json, items not working yet.

* Fixed my own derp (missing json files)

* Reduced materials to ensure unique traits for most of them. Still 30 though, but reduced by 20 more :'( RIP

* Changed some generator stuff, not working properly right now!

* rewrote offset generation, added some debug command, fixed some stuff

* fixed on-surface-generation, made dependencies more flexible

* reverted gen-weight back to its normal value

* Meteor generator implemented.

* fixed generating on ground

* optimized a thing

* Replaced Uru with Osram, replaced Meteorite with Uru, added Meteorite again for Hull-Material and late game alloy.

* Some changes in generation of ores, not ready yet.

* Added Cobble Meteorite. Added debug command. Implemented rest of ore generation. Some minor fixes left for generation including balancing.

* Some changes for ore generation. Added 2 separate Generic Blocks for meteorite and their cobble variant.

* some cleanup in Generator class, added meteor world save handler

* Added Textures. Added blockstates and item models. Fixed fluid rendering.

* renamed world save data file to be little more specific, removed a unused method

* some preps for the upcoming release

* First attempt of well balancing material stats. Renamed TiberiumX to Triberium.

* Final changes... ready for beta testing

* Added missing alloys.

* Corrected balancing of ore generation. Still WIP

* removed some last debug out

* one last reformat

1 files changed, 7 insertions, 6 deletions

diff --git a/build.gradle b/build.gradle
index aa413e0..e6b2633 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,3 @@
-// For those who want the bleeding edge
 buildscript {
     repositories {
         jcenter()
@@ -61,9 +60,9 @@ task buildInfo {
 version = project.buildInfo.revision
 
 minecraft {
-    version = "1.10.2-12.18.2.2107"
+    version = "1.10.2-12.18.2.2147"
     runDir = "run"
-    mappings = "snapshot_20161015"
+    mappings = "snapshot_20161101"
     replace '@VERSION@', project.version
 }
 
@@ -75,11 +74,12 @@ 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-1.0.0.jenkins170:deobf"
+    deobfCompile "slimeknights.mantle:Mantle:1.10.2-1.1.+:deobf"
     //Old: deobfCompile "slimeknights.mantle:Mantle:1.9-0.10.0.jenkins132:deobf"
-    deobfCompile "mezz.jei:jei_1.10.2:3.9.3.252"
-    deobfCompile "slimeknights:TConstruct:1.10.2-2.5.5.jenkins393:deobf"
+    deobfCompile "mezz.jei:jei_1.10.2:3.+"
+    deobfCompile "slimeknights:TConstruct:1.10.2-2.6.+:deobf"
     //compile files('libs/TConstruct-1.9-2.3.1.DEV.1d4c1de-deobf.jar')
+    //compile group: 'com.google.guava', name: 'guava', version: '20.0'
 }
 
 sourceSets {
@@ -111,6 +111,7 @@ processResources {
 }
 
 task deobfJar(type: Jar) {
+    //noinspection GroovyAssignabilityCheck
     from sourceSets.main.output
     classifier = 'deobf'
 }