Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11

# Conflicts:
#	build.gradle
#	src/main/java/techreborn/init/IC2Dict.java
#	src/main/java/techreborn/init/ModRecipes.java
#	src/main/java/techreborn/init/OreDict.java
This commit is contained in:
modmuss50 2016-12-26 23:49:42 +00:00
commit 0922e0b886
No known key found for this signature in database
GPG key ID: 773D17BE8BF49C82
10 changed files with 456 additions and 233 deletions

View file

@ -1,5 +1,6 @@
package techreborn.parts.powerCables;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IStringSerializable;
import reborncore.api.power.EnumPowerTier;
@ -38,4 +39,8 @@ public enum EnumStandaloneCableType implements IStringSerializable {
public String getName() {
return friendlyName.toLowerCase();
}
public ItemStack getStack(){
return ItemStandaloneCables.getCableByName(getName());
}
}