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
Binary file not shown.
Before Width: | Height: | Size: 587 B |
Binary file not shown.
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 16 KiB |
Loading…
Add table
Add a link
Reference in a new issue