Added equipment attribute stacking and fixed multiple bugs