Merge branch '1.7.10' into 1.8.9
Conflicts: build.gradle src/main/java/techreborn/blocks/BlockOre.java src/main/java/techreborn/items/ItemCells.java
This commit is contained in:
commit
9a585bcfb2
9 changed files with 81 additions and 8 deletions
|
@ -73,7 +73,7 @@ public class BlockOre extends BaseBlock implements ITexturedBlock {
|
|||
this.setDefaultState(this.blockState.getBaseState().withProperty(METADATA, 0));
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@Deprecated
|
||||
public ArrayList<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue