Merge branch '1.21' into 1.21-DEV

build.gradle

@@ -7,17 +7,9 @@ sourceCompatibility = JavaVersion.VERSION_21
 targetCompatibility = JavaVersion.VERSION_21
 
 repositories {
-	// maven { url 'https://masa.dy.fi/maven' }
-	maven {
-		url 'https://masa.dy.fi/maven'
-		//mavenLocal()
-	}
-	maven {
-		url 'https://maven.terraformersmc.com/releases/'
-		//mavenLocal()
-	}
+	maven { url 'https://masa.dy.fi/maven' }
+	maven { url 'https://maven.terraformersmc.com/releases/' }
 	// maven { url 'https://maven.quiltmc.org/repository/release/' }
-	//flatDir { dirs 'libs' }
 	maven { url 'https://jitpack.io' }
 }
 
@@ -33,7 +25,6 @@ dependencies {
 
 	//modImplementation "curse.maven:litematica-${project.minecraft_version_out}-308892:${project.litematica_fileid}"
 	//modImplementation "curse.maven:malilib-${project.minecraft_version_out}-303119:${project.malilib_fileid}"
-
 	//modImplementation "fi.dy.masa.malilib:malilib-fabric-${project.minecraft_version_out}:${project.malilib_version}"
 	//modImplementation "fi.dy.masa.litematica:litematica-fabric-${project.minecraft_version_out}:${project.litematica_version}"
 	modImplementation "com.github.sakura-ryoko:malilib:${project.malilib_id}"
@@ -45,6 +36,10 @@ dependencies {
 	modCompileOnly "com.terraformersmc:modmenu:${project.mod_menu_version}"
 }
 
+group = project.maven_group + "." + project.mod_id
+archivesBaseName = project.mod_file_name + '-' + project.minecraft_version_out
+version = project.mod_version
+
 processResources {
 	exclude '**/*.xcf'
 	exclude '**/xcf'