whatever
Merge branch 'master' of https://github.com/ntzrmtthihu777/SCPCraft

Conflicts:
	src/main/java/netz/mods/scp/item/ItemArmorClassD.java
fixed conflict