Merge branch 'master' of C:\Users\James\Desktop\Modding\MineralEssentials with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gradle/gradle.log
	MineralEssentials.iml
	src/main/resources/assets/MineralEssentials/textures/items/FireCrystalSword[annimate].png
Updated Forge version
firetexture.mcm
firetexture.mcm