3 Days Ago
Merge from armor_slots, fix modifier enum and phrase conflicts