Temp fix JABBA icon problem (will be fixed in next JABBA version)
Merge branch 'origin/master'

Conflicts:
	java/com/dynious/refinedrelocation/block/BlockSortingBarrel.java