4 commits

Author	SHA1	Message	Date
ElijahZAwesome	edecea1055	fixed remaining merge errors, maybe still dont build this yet	2018-02-06 17:22:10 -06:00
ElijahZAwesome	1e3fb61d76	Merged 1.5 update from Andre, maybe.	2018-02-06 14:08:27 -06:00
Andre Schweiger	4a4f1ecb0e	Small Fixes	2018-02-04 22:34:00 +01:00
Andre Schweiger	d2f7796b79	Version 1.5.0 ... Big Refactor	2018-02-04 18:05:43 +01:00