possible new upgrade textures
changed tiering of icons
merge conflict resolution for terrain.png
Merge pull request #106 from thraaawn/master

Sensor for Applied Energistics
Merge pull request #107 from mikeemoo/master

fixed sonic sensor..
Merge branch 'master' of git://github.com/Cloudhunter/OpenCCSensors
return error message rather than throwing error
Merge pull request #110 from lyqyd/master

Change to error return methodology.
ready for 0.1.4c
updated build with current versions
added mcmod.info into the build
Merge branch 'master' of git://github.com/Cloudhunter/OpenCCSensors

Conflicts:
	openccsensors/OpenCCSensors.java
	resources/openccsensors/resources/lua/apis/sensor
	src/openccsensors/common/helper/BCHelper.java
	src/openccsensors/common/sensors/targets/WorldTarget.java