Weapons in property editor
Merge branch 'master' of https://github.com/ModwizSoftware/LD31
javadocing a method