Merge branch 'master-MC1.10.2' of https://github.com/ForestryMC/Binnie into master-MC1.10.2

# Conflicts:
#	src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java
#	src/main/java/binnie/extratrees/genetics/ModuleGenetics.java
This commit is contained in:
marcin212 committed 2016-10-31 21:11:27 +01:00
commit 8c9cd7c202
43 files changed
+258 -215

No files matched your search

@@ -48,5 +48,4 @@ public class ModuleGenetics implements IInitializable {
}
}
}
}
}