FX
Merge branch 'master' of https://github.com/nekosune/Thaumic_Exploration

Conflicts:
	src/main/java/flaxbeard/thaumicexploration/client/ClientProxy.java