Merge branch 'development' into 1.8.9

Huge merge with 202 conflicts, hopefully not *too* broken.
This commit is contained in:
Ben Spiers committed 2016-03-18 04:24:19 +00:00
commit 84336ec4d1
571 files changed
+10295 -4773

No files matched your search

+12
View File
@@ -0,0 +1,12 @@
package cofh.api;
public class CoFHAPIProps {
private CoFHAPIProps() {
}
// Until CofH updates, this is the version number
public static final String VERSION = "1.8-BuildCraft-Testing";
}