Commit Graph
4 Commits
Author SHA1 Message Date
Progwml6 07062a59d1 fix merge derps 2013-11-27 17:14:47 -05:00
Sunstrike 6ad0723020 Merge 1.7 prep into master.
This was one hell of a messy merge; things may very well explode.

Signed-off-by: Sunstrike <sunstrike@azurenode.net>
2013-11-27 17:46:07 +00:00
Progwml6 707f7996b5 method doesnt need override anymore 2013-11-22 22:44:02 -05:00
Sunstrike cb87c836c8 Initial test of Gradle (not working yet) 2013-11-21 16:13:51 +00:00