Sollace 0393daa0ba Fix merge conflicts		2018-06-02 18:05:33 +02:00
..
ModelPonyArmor.java	Fix merge conflicts	2018-06-02 18:05:33 +02:00
package-info.java	One last codestyle commit to clean stuff up I missed, correct and document some names, and add TODO items for everything that needs to be done.	2018-05-01 12:38:13 +02:00
PonyArmor.java	Cut all of the extra code from armour	2018-06-02 13:35:28 +02:00