This mod is a Forge port of VillagerFix by drexhd. This mod contains all features except for the old trading mechanics. See his mod's page for details.
Disclaimer: I am not affiliated with drexhd. He has not worked with me on porting this, so do not bother him about issues with this Forge port.
