Merge branch '1.18/dev' into 1.18/batching

This commit is contained in:
Jozufozu 2021-12-23 23:23:04 -08:00
commit 5f7b17a200
2 changed files with 3 additions and 3 deletions

View file

@ -35,7 +35,7 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(17)
println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch')) println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
minecraft { minecraft {
mappings channel: 'official', version: "${minecraft_version}" // TODO: waiting for parchment 1.18 mappings channel: 'parchment', version: "${parchment_version}-${minecraft_version}"
runs { runs {
client { client {

View file

@ -5,7 +5,7 @@ org.gradle.daemon = false
mod_version = 0.5.0 mod_version = 0.5.0
mc_update_version = 1.18 mc_update_version = 1.18
minecraft_version = 1.18.1 minecraft_version = 1.18.1
forge_version = 39.0.5 forge_version = 39.0.8
# build dependency versions # build dependency versions
forgegradle_version = 5.1.+ forgegradle_version = 5.1.+
@ -13,7 +13,7 @@ mixingradle_version = 0.7-SNAPSHOT
mixin_version = 0.8.5 mixin_version = 0.8.5
librarian_version = 1.+ librarian_version = 1.+
cursegradle_version = 1.4.0 cursegradle_version = 1.4.0
parchment_version = 2021.10.31 parchment_version = 2021.12.19
# curseforge info # curseforge info
projectId = 486392 projectId = 486392