Kenzie Togami 7f43bc4b47 Merge in from master, mostly. ... The most important part of this merge is that it REVERTS FMP compatibility, since no such thing needs to exist in 1.8. In fact, there isn't even an FMP in 1.8 yet. It will be added back if FMP ever ports to 1.8 and the problem still exists.		2016-02-22 17:54:50 -08:00
..
src/main	Merge in from master, mostly.	2016-02-22 17:54:50 -08:00
build.gradle	Merge in from master, mostly.	2016-02-22 17:54:50 -08:00