asdf
Revert "Revert "gonna revert this bitch""

This reverts commit 564c2e419004b9b007f629a2f4e24124d9096230.

Conflicts:
	Materia/Assets/Art/Enemies/Warrior/Materials/armor.mat.meta
	Materia/Assets/Art/Enemies/Warrior/Materials/hairTubeShader1.mat.meta
	Materia/Assets/Art/Enemies/Warrior/Materials/limbJoints.mat.meta
	Materia/Assets/Art/Enemies/Warrior/enWarrior.fbx
	Materia/Assets/Art/Enemies/Warrior/enWarrior.fbx.meta
	Materia/Library/CurrentLayout.dwlt
	Materia/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Materia/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Materia/Library/ScriptAssemblies/Assembly-CSharp.dll
	Materia/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Materia/Library/assetDatabase3
	Materia/Library/expandedItems
	Materia/Library/guidmapper
	Materia/Library/metadata/58/584d23a12a5ce2b45a8b16e050ff7823
	Materia/Library/metadata/b9/b987ae86cec2c4e418e40758f121ac55
	Materia/Library/shadercompiler-1.log
	Materia/Materia-csharp.sln
	Materia/Materia.sln
	Materia/Materia.userprefs
fd