Lars Brubaker e4a761bdd9 Merge branch '1.5.0' ... Conflicts: StaticData/Translations/Master.txt		2016-01-21 15:12:50 -08:00
..
Layouts.txt	Added the ability to turn off support outlines.	2016-01-18 12:20:53 -08:00
Properties.json	Merge branch '1.5.0'	2016-01-21 15:12:50 -08:00