diff --git a/.github/workflows/build_and_publish.yaml b/.github/workflows/build_and_publish.yaml index 95f24d57..edeb8d71 100644 --- a/.github/workflows/build_and_publish.yaml +++ b/.github/workflows/build_and_publish.yaml @@ -74,7 +74,7 @@ jobs: uses: stefanzweifel/git-auto-commit-action@v5 if: ${{ steps.get_release_type.outputs.result != 'test' }} with: - branch: version/1.21 + branch: version/1.21.1 commit_message: 'docs: update CHANGELOG.md for ${{ github.ref_name }} [skip ci]' file_pattern: CHANGELOG.md - name: Upload to Mod Platforms @@ -96,7 +96,7 @@ jobs: neoforge game-versions: | ${{ steps.get_mc_version.outputs.result }} - 1.21.1 + 1.21 changelog: |- ${{ steps.changelog.outputs.changes }} diff --git a/build.gradle b/build.gradle index 5c58378f..a0bf8b84 100644 --- a/build.gradle +++ b/build.gradle @@ -154,26 +154,21 @@ dependencies { // implementation "com.almostreliable.mods:almostunified-forge:${minecraft_version}-${almost_unified_version}" //Geckolib - implementation "software.bernie.geckolib:geckolib-neoforge-${geckolib_minecraft_version}:${geckolib_version}" + implementation "software.bernie.geckolib:geckolib-neoforge-${minecraft_version_major}:${geckolib_version}" //modonomicon implementation "com.klikli_dev:modonomicon-${minecraft_version}-neoforge:${modonomicon_version}" //occultism - compileOnly "com.klikli_dev:occultism-${minecraft_version}-neoforge:${occultism_version}" - runtimeOnly "com.klikli_dev:occultism-${minecraft_version}-neoforge:${occultism_version}" + compileOnly "com.klikli_dev:occultism-${minecraft_version_major}-neoforge:${occultism_version}" + runtimeOnly "com.klikli_dev:occultism-${minecraft_version_major}-neoforge:${occultism_version}" //Jade (Hwyla/Waila) implementation "maven.modrinth:jade:${jade_version}+neoforge" //EMI - compileOnly "dev.emi:emi-neoforge:${emi_version}+${minecraft_version}:api" - runtimeOnly "dev.emi:emi-neoforge:${emi_version}+${minecraft_version}" - - //REI (if jei is not available, for convenience) -// runtimeOnly "maven.modrinth:rei:${rei_version}+neoforge" -// runtimeOnly "maven.modrinth:architectury-api:${architectury_version}+neoforge" -// runtimeOnly "maven.modrinth:cloth-config:${cloth_config_version}+neoforge" + compileOnly "dev.emi:emi-neoforge:${emi_version}+${minecraft_version_major}:api" + runtimeOnly "dev.emi:emi-neoforge:${emi_version}+${minecraft_version_major}" } processResources { diff --git a/gradle.properties b/gradle.properties index 81851267..49808b55 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,8 @@ systemProp.net.minecraftforge.gradle.check.certs=false ## Environment Properties # The Minecraft version must agree with the Forge version to get a valid artifact -minecraft_version=1.21 +minecraft_version_major=1.21 +minecraft_version=1.21.1 # The Minecraft version range can use any release version of Minecraft as bounds. # Snapshots, pre-releases, and release candidates are not guaranteed to sort properly # as they do not follow standard versioning conventions. @@ -15,7 +16,7 @@ minecraft_version_range=[1.21,1.22) ## Neo # The neo version must agree with the Minecraft version to get a valid artifact -neo_version=21.0.146 +neo_version=21.1.13 # The neo version range can use any version of neo as bounds or match the loader version range neo_version_range=[21.0.110-beta,) # The loader version range can only use the major version of Neo/FML as bounds @@ -39,9 +40,9 @@ mod_description=An open-source magic mod built around classical alchemy to repli ## Dependency Properties -jei_version=19.3.1.24 +jei_version=19.8.5.118 jei_version_range=[19.3.1.0,) -modonomicon_version=1.95.1 +modonomicon_version=1.99.0 modonomicon_version_range=[1.95.0,) occultism_version=1.144.0 occultism_version_range=[1.144.0,) @@ -49,11 +50,8 @@ almost_unified_version=0.5.0 almost_unified_version_range=[0.5.0,) # geckolib currently names their files after 1.20 geckolib_minecraft_version=1.21 -geckolib_version=4.5.5 +geckolib_version=4.5.8 geckolib_version_range=[4.5.5,) -jade_version=15.1.3 +jade_version=15.1.6 jade_version_range=[15.0.4,) -emi_version=1.1.10 -rei_version=16.0.729 -architectury_version=13.0.1 -cloth_config_version=15.0.127 \ No newline at end of file +emi_version=1.1.12 \ No newline at end of file