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
|
@ -96,6 +96,11 @@ public class ModItems {
|
|||
GameRegistry.registerItem(parts, "part");
|
||||
cells = new ItemCells();
|
||||
GameRegistry.registerItem(cells, "cell");
|
||||
for (int i = 0; i < ItemCells.types.length; i++) {
|
||||
if(FluidRegistry.getFluid("fluid" + ItemCells.types[i].toLowerCase()) != null){
|
||||
FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluid("fluid" + ItemCells.types[i].toLowerCase()), ItemCells.getCellByName(ItemCells.types[i]));
|
||||
}
|
||||
}
|
||||
rockCutter = PoweredItem.createItem(ItemRockCutter.class);
|
||||
GameRegistry.registerItem(rockCutter, "rockCutter");
|
||||
lithiumBatpack = PoweredItem.createItem(ItemLithiumBatpack.class);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue