diff --git a/jGui b/jGui index a1c71294..a13e1e31 160000 --- a/jGui +++ b/jGui @@ -1 +1 @@ -Subproject commit a1c71294b1e3c909c062e09b33f4cd9b26f6fd74 +Subproject commit a13e1e31c946483a2dd5eca82181c487029daaf4 diff --git a/versions/common.gradle b/versions/common.gradle index 79c208cb..629b5d27 100644 --- a/versions/common.gradle +++ b/versions/common.gradle @@ -35,16 +35,14 @@ buildscript { classpath('net.minecraftforge.gradle:ForgeGradle:3.+'){ exclude group: 'trove', module: 'trove' // preprocessor/idea requires more recent one } - } else { + } else if (mcVersion >= 10800) { classpath('com.github.ReplayMod:ForgeGradle:' + ( - mcVersion >= 11200 ? 'd5c13801' : // FG 2.3 - mcVersion >= 10904 ? 'bf0ea7b8' : // FG 2.2 - mcVersion >= 10800 ? 'ab81684e' : // FG 2.1 - 'e93f77b4' // FG 1.2 - )){ - exclude group: 'net.sf.trove4j', module: 'trove4j' // preprocessor/idea requires more recent one - exclude group: 'trove', module: 'trove' // different name same thing - } + mcVersion >= 11200 ? 'b64de9c' : // FG 2.3 + mcVersion >= 10904 ? '5bb7a53' : // FG 2.2 + 'fc1eabc' // FG 2.1 + ) + ':all') + } else { + classpath 'com.github.ReplayMod:ForgeGradle:e93f77b4' // FG 1.2 } } }