Update forge, add back BLM screen and JEI integration

democat3457 · Jul 19, 2020 · ccca095 · ccca095
1 parent b54db43
commit ccca095
Show file tree

Hide file tree

Showing 10 changed files with 375 additions and 389 deletions.
diff --git a/build.gradle b/build.gradle
@@ -97,11 +97,10 @@ dependencies {
     minecraft "net.minecraftforge:forge:${config.mc_version}-${config.forge_version}"
 
     compile fg.deobf("vazkii.autoreglib:AutoRegLib:${config.arl_version}")
-
-/*    
+
     compileOnly fg.deobf("mezz.jei:jei-${config.mc_version}:${config.jei_version}:api")
     runtimeOnly fg.deobf("mezz.jei:jei-${config.mc_version}:${config.jei_version}")
-*/
+
 }
 
 processResources {

diff --git a/build.properties b/build.properties
@@ -1,13 +1,13 @@
 #
-#Sun Jul 12 19:55:47 BST 2020
+#Wed Jul 15 22:25:11 BST 2020
 mod_name=Quark
-forge_version=32.0.47
+forge_version=32.0.70
 mapping_version=20200703-unofficial-1.16.1
 mapping_channel=snapshot
 mod_id=quark
-jei_version=6.0.0.2
+jei_version=7.0.0.6
 arl_version=1.6-42.81
 version=r2.2
 dir_output=../Build Output/Quark/
+build_number=252
 mc_version=1.16.1
-build_number=251
diff --git a/runClient.launch b/runClient.launch
@@ -2,7 +2,7 @@
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <mapAttribute key="org.eclipse.debug.core.environmentVariables">
 <mapEntry key="FORGE_GROUP" value="net.minecraftforge"/>
-<mapEntry key="FORGE_VERSION" value="32.0.47"/>
+<mapEntry key="FORGE_VERSION" value="32.0.70"/>
 <mapEntry key="MCP_MAPPINGS" value="snapshot_20200703-unofficial-1.16.1"/>
 <mapEntry key="MCP_VERSION" value="20200625.160719"/>
 <mapEntry key="MC_VERSION" value="1.16.1"/>

diff --git a/runServer.launch b/runServer.launch
@@ -2,7 +2,7 @@
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <mapAttribute key="org.eclipse.debug.core.environmentVariables">
 <mapEntry key="FORGE_GROUP" value="net.minecraftforge"/>
-<mapEntry key="FORGE_VERSION" value="32.0.47"/>
+<mapEntry key="FORGE_VERSION" value="32.0.70"/>
 <mapEntry key="MCP_MAPPINGS" value="snapshot_20200703-unofficial-1.16.1"/>
 <mapEntry key="MCP_VERSION" value="20200625.160719"/>
 <mapEntry key="MC_VERSION" value="1.16.1"/>