tentative fix for #1826
do not send power where power is received, close #1827
prepare hotfix 6.0.15
fixed version number
Fix possible NPE in FacadeItemRenderer
Fix canFill/canDrain in tanks
Merge pull request #1831 from Prototik/npe-item-facade

Fix possible NPE in FacadeItemRenderer
added handling of blueprints without unique ids, close #1842
Merge pull request #1833 from Prototik/tank-drain

Fix canFill/canDrain in tanks
Fix potential NPE in TileEnergyConverter
Merge pull request #1848 from Prototik/energy-converter-crash

Energy converter crash
Fix pump crash
Fix tile marker crash
Merge pull request #1852 from Prototik/pump-drain-crash

Fix pump crash
Merge pull request #1854 from Prototik/tile-marker-crash

Fix tile marker crash
tentative fix for packet leaks, #1855
Merge branch '5.0.x' into 6.0.x

Conflicts:
	common/buildcraft/BuildCraftBuilders.java
	common/buildcraft/BuildCraftCore.java
	common/buildcraft/BuildCraftEnergy.java
	common/buildcraft/BuildCraftFactory.java
	common/buildcraft/BuildCraftSilicon.java
	common/buildcraft/BuildCraftTransport.java
	common/buildcraft/builders/network/PacketHandlerBuilders.java
	common/buildcraft/core/network/PacketHandler.java
	common/buildcraft/core/network/PacketTileState.java
	common/buildcraft/factory/network/PacketHandlerFactory.java
	common/buildcraft/silicon/network/PacketHandlerSilicon.java
	common/buildcraft/transport/network/PacketHandlerTransport.java
prepare version 6.0.16