Commit Graph
2 Commits
Author SHA1 Message Date
Vexatos 2332c65ac8 Merge branch 'master' of https://github.com/ForestryMC/ForestryMC into master-origin
Conflicts:
	api
2014-08-18 17:45:04 +02:00
Parker 8f2d802f11 Reformed Forestry!
* Updated for BC 6.0.x compatibility
* Re-implemented the Pipes plugin
* Converted to vanilla assets lang system
* Converted to standard gradle file structure
* General warnings cleanup
2014-08-11 16:56:09 -04:00