Merge remote-tracking branch 'origin/master'

This commit is contained in:
Robert Sosnitzka
2017-01-15 23:38:07 +01:00
13 changed files with 22 additions and 21 deletions

View File

@@ -8,7 +8,8 @@ import slimeknights.tconstruct.library.materials.MaterialTypes;
import slimeknights.tconstruct.library.traits.AbstractTrait;
import static com.sosnitzka.taiga.Fluids.obsidioriteFluid;
import static slimeknights.tconstruct.tools.TinkerTraits.*;
import static slimeknights.tconstruct.tools.TinkerTraits.alien;
import static slimeknights.tconstruct.tools.TinkerTraits.crumbling;
public class MaterialTraits {