fix the death, fix head, fix energy display
Merge branch 'master' of https://github.com/FFMT/nanotech_mod

Conflicts:
	common/fr/mcnanotech/kevin_68/nanotech_mod/main/core/Nanotech_mod.java