Fixed Backspace derps
Merge branch 'master' of https://github.com/BackSpace47/main

Conflicts:
	java/net/RPower/RPowermod/entity/EntityJadeTNTPrimed.java
deleted {// TODO Auto-generated method stub} lines
trying to fix things