Fixed merge

This commit is contained in:
lukasabbe
2024-10-19 22:28:57 +02:00
parent cbbd1fc429
commit 408cdc287d
2 changed files with 6 additions and 5 deletions
+5 -4
View File
@@ -2,13 +2,14 @@
org.gradle.jvmargs=-Xmx1G org.gradle.jvmargs=-Xmx1G
# Fabric Properties # Fabric Properties
# check these on https://modmuss50.me/fabric.html # check these on https://modmuss50.me/fabric.html
minecraft_version=1.21 minecraft_version=24w38a
yarn_mappings=1.21+build.9 yarn_mappings=24w38a+build.5
loader_version=0.16.5 loader_version=0.16.5
# Mod Properties # Mod Properties
mod_version=1.4+1.21 mod_version=1.4+1.21.2-SNAPSHOT.1
maven_group=me.lukasabbe maven_group=me.lukasabbe
archives_base_name=Bookshelfinspector archives_base_name=Bookshelfinspector
fabric_version=0.104.0+1.21.1 fabric_version=0.104.2+1.21.2
+1 -1
View File
@@ -22,7 +22,7 @@
], ],
"depends": { "depends": {
"fabricloader": ">=${loader_version}", "fabricloader": ">=${loader_version}",
"minecraft": ">=${minecraft_version}", "minecraft": ">=1.21.2-alpha.24.38.a",
"fabric-api-base": "*", "fabric-api-base": "*",
"fabric-networking-api-v1": "*", "fabric-networking-api-v1": "*",
"fabric-lifecycle-events-v1": "*" "fabric-lifecycle-events-v1": "*"