diff options
| author | Robert Sosnitzka <robert.sosnitzka@gmail.com> | 2017-01-15 23:38:07 +0100 |
|---|---|---|
| committer | Robert Sosnitzka <robert.sosnitzka@gmail.com> | 2017-01-15 23:38:07 +0100 |
| commit | d2cd916be7553f99a814ce4b0d79361ff86709d9 (patch) | |
| tree | 4c1e68c997295ae92f3313fa9c1c6a76205195df /src/main/java/com/sosnitzka/taiga/MaterialTraits.java | |
| parent | 26ab0139c09a8588672ba945778c1504f8ef7e55 (diff) | |
| parent | ab7c7fc2dee4e7a4139b9c47a7acfd4b1aaa4e02 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/main/java/com/sosnitzka/taiga/MaterialTraits.java')
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/MaterialTraits.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java index 41f66ad..ee9ad58 100644 --- a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java +++ b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java @@ -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 { |