a
Merge branch 'master' of https://github.com/jannickj/minecraftmod

Conflicts:
	forge/mcp/src/minecraft/mmm/esm/thirst/ThirstLoader.java