Merge branch '1.12.2-dev' into 1.12.2-reprod

This commit is contained in:
Jonas Herzig
2017-10-28 19:52:54 +02:00
2 changed files with 4 additions and 3 deletions

View File

@@ -34,7 +34,7 @@ archivesBaseName = "replaymod"
minecraft { minecraft {
coreMod = 'com.replaymod.core.LoadingPlugin' coreMod = 'com.replaymod.core.LoadingPlugin'
version = '1.12.1-14.22.0.2444' version = '1.12.2-14.23.0.2486'
runDir = "eclipse" runDir = "eclipse"
mappings = "snapshot_20170615" mappings = "snapshot_20170615"
replace '@MOD_VERSION@', project.version replace '@MOD_VERSION@', project.version
@@ -69,7 +69,7 @@ dependencies {
shade 'org.aspectj:aspectjrt:1.8.2' shade 'org.aspectj:aspectjrt:1.8.2'
shade 'com.github.replaymod:ReplayStudio:77dc1d7' shade 'com.github.ReplayMod:ReplayStudio:ecb6992'
testCompile 'junit:junit:4.11' testCompile 'junit:junit:4.11'
} }

View File

@@ -8,7 +8,8 @@ public enum MinecraftVersion {
MC_1_11("Minecraft 1.11", "1.11"), MC_1_11("Minecraft 1.11", "1.11"),
MC_1_11_2("Minecraft 1.11.2", "1.11.2"), MC_1_11_2("Minecraft 1.11.2", "1.11.2"),
MC_1_12("Minecraft 1.12", "1.12"), MC_1_12("Minecraft 1.12", "1.12"),
MC_1_12_1("Minecraft 1.12.1", "1.12.1"); MC_1_12_1("Minecraft 1.12.1", "1.12.1"),
MC_1_12_2("Minecraft 1.12.2", "1.12.2");
private String niceName, apiName; private String niceName, apiName;