Merge branch '1.12.2'

This commit is contained in:
JackCarterSmith 2019-06-02 22:29:40 +02:00
commit b52b170375

View File

@ -1,3 +1,7 @@
# Sets default memory used for gradle commands. Can be overridden by user or command line properties. # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process. # This is required to provide enough memory for the Minecraft decompilation process.
baseVersion=1.0
minecraftVersion=1.12.2
forgeVersion=14.23.5.2838
org.gradle.jvmargs=-Xmx4G org.gradle.jvmargs=-Xmx4G