Merge branch '1.21.5-multiloader' into 1.21-multiloader

# Conflicts:
#	gradle.properties

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.3.4] - 2025-06-19
+### Added
+- Added support for minecraft 1.21.6
+
 ## [2.3.3] - 2025-06-01
 ### Fixed
 - Fixed forge mixin crash (closes [#54](https://github.com/Suiranoil/SkinRestorer/issues/53))

CHANGELOG_LATEST.md

@@ -1,4 +1,2 @@
-### Fixed
-- Fixed forge mixin crash (closes [#54](https://github.com/Suiranoil/SkinRestorer/issues/53))
-### Removed
-- Removed minecraft 1.19 support
+### Added
+- Added support for minecraft 1.21.6

fabric/src/main/resources/fabric.mod.json

@@ -14,7 +14,7 @@
     },
     "icon": "assets/${mod_id}/icon.png",
     "license": "${license}",
-    "environment": "*",
+    "environment": "server",
     "entrypoints": {
         "main": [
             "net.lionarius.skinrestorer.fabric.SkinRestorerFabric"

forge/build.gradle

@@ -24,7 +24,7 @@ tasks.named('jarJar') {
 jar.finalizedBy('jarJar')
 
 minecraft {
-    mappings channel: 'parchment', version: "${parchment_version}-${parchment_minecraft}"
+    mappings channel: 'parchment', version: "${parchment_minecraft}-${parchment_version}-${minecraft_version}"
 
     copyIdeResources = true //Calls processResources when in dev
 

forge/src/main/resources/META-INF/mods.toml

@@ -17,11 +17,11 @@ modId = "forge"
 mandatory = true
 versionRange = "[${forge_version},)"
 ordering = "NONE"
-side = "BOTH"
+side = "SERVER"
 
 [[dependencies.${mod_id}]]
 modId = "minecraft"
 mandatory = true
 versionRange = "${minecraft_version_range}"
 ordering = "NONE"
-side = "BOTH"
+side = "SERVER"

gradle.properties

@@ -8,7 +8,7 @@ minecraft_version_list=1.21,1.21.1,1.21.2,1.21.3,1.21.4
 minecraft_version_range=[1.21, 1.21.4]
 mod_id=skinrestorer
 mod_name=SkinRestorer
-mod_version=2.3.3
+mod_version=2.3.4
 mod_author=Lionarius
 mod_homepage=https://modrinth.com/mod/skinrestorer
 mod_sources=https://github.com/Suiranoil/SkinRestorer

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -20,11 +20,11 @@ modId = "neoforge"
 type = "required"
 versionRange = "[${neoforge_version},)"
 ordering = "NONE"
-side = "BOTH"
+side = "SERVER"
 
 [[dependencies.${mod_id}]]
 modId = "minecraft"
 type = "required"
 versionRange = "${minecraft_version_range}"
 ordering = "NONE"
-side = "BOTH"
+side = "SERVER"