Merge branch 'stable'
commit acc8e8856ddc1f0cde08ef0695a7b5c3e233128e
2 parents 6b73ec1 + 52ec9f3
@vlad20012 vlad20012 authored on 10 Dec 2016
Showing 2 changed files
View
src/main/java/cpw/mods/fml/common/registry/GameRegistry.java
View
src/main/java/org/ultramine/server/chunk/WrappedWorldGenerator.java 100644 → 0