Skip to content

Commit

Permalink
feat: update to 1.20.1
Browse files Browse the repository at this point in the history
  • Loading branch information
klikli-dev committed Jun 14, 2023
1 parent b35bf52 commit da77ba5
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build_and_publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
uses: stefanzweifel/git-auto-commit-action@v4
if: ${{ steps.get_release_type.outputs.result != 'test' }}
with:
branch: version/1.20.0
branch: version/1.20.1
commit_message: 'docs: update CHANGELOG.md for ${{ github.ref_name }} [skip ci]'
file_pattern: CHANGELOG.md
- name: Upload to Curseforge
Expand All @@ -92,7 +92,7 @@ jobs:
${{ steps.changelog.outputs.changes }}
Find changes for all versions at https://github.com/klikli-dev/occultism/releases
game_versions: Forge,Minecraft 1.20:${{ steps.get_mc_version.outputs.result }}
game_versions: Forge,Minecraft 1.20:1.20.1,Minecraft 1.20:${{ steps.get_mc_version.outputs.result }}
display_name: occultism-${{ steps.get_mc_version.outputs.result }}-${{ steps.get_version.outputs.result }}.jar
release_type: ${{ steps.get_release_type.outputs.result }}
relations: modonomicon:requiredDependency,curios:requiredDependency,geckolib:requiredDependency,smartbrainlib:requiredDependency,theurgy:optionalDependency,jei:optionalDependency,almost-unified:optionalDependency,perviaminvenire:optionalDependency
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,10 @@ dependencies {


//geckolib
implementation fg.deobf("software.bernie.geckolib:geckolib-forge-${minecraft_version}:${geckolib_version}")
implementation fg.deobf("software.bernie.geckolib:geckolib-forge-${geckolib_minecraft_version}:${geckolib_version}")

//smartbrainlib
implementation fg.deobf("net.tslat.smartbrainlib:SmartBrainLib-forge-${minecraft_version}:${smartbrainlib_version}")
implementation fg.deobf("net.tslat.smartbrainlib:SmartBrainLib-forge-${smartbrainlib_minecraft_version}:${smartbrainlib_version}")

//almostunified
//TODO: reenable once updated
Expand Down
16 changes: 10 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@ org.gradle.daemon=false
## Environment Properties

# The Minecraft version must agree with the Forge version to get a valid artifact
minecraft_version=1.20
minecraft_version=1.20.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.
minecraft_version_range=[1.20,1.21)
# The Forge version must agree with the Minecraft version to get a valid artifact
forge_version=1.20-46.0.1
forge_version=1.20.1-47.0.1
# The Forge version range can use any version of Forge as bounds or match the loader version range
forge_version_range=[46,)
# The loader version range can only use the major version of Forge/FML as bounds
loader_version_range=[46,)

mapping_channel=parchment
#postfix is target mc version, optional prefix is source parchment mc version
mapping_version=1.19.3-2023.03.12-1.20
mapping_version=1.19.3-2023.03.12-1.20.1

## Mod Properties

Expand All @@ -33,17 +33,21 @@ mod_authors=Kli Kli
mod_description=A magic mod inspired by the world of Jonathan Stroud's Bartimaeus. With the help of occult rituals players can summon entities from the "Other Side" to perform magic.

## Dependency Properties
jei_version=14.0.0.4
jei_version=15.0.0.12
jei_version_range=[14.0.0.4,)
curios_version=5.2.0-beta.2
curios_version=5.2.0-beta.3
curios_version_range=[5.2.0-beta.1,)
# geckolib currently names their files after 1.20
geckolib_minecraft_version=1.20
geckolib_version=4.2
geckolib_version_range=[4.2,)
# smartbrainlib currently names their files after 1.20
smartbrainlib_minecraft_version=1.20
smartbrainlib_version=1.11
smartbrainlib_version_range=[1.11,)
almostunified_version=XYZ
almostunified_version_range=[0,)
modonomicon_version=1.32.2
modonomicon_version=1.33.1
modonomicon_version_range=[1.32.2,)
theurgy_version=1.3.5
theurgy_version_range=[1.3.5,)
Expand Down

0 comments on commit da77ba5

Please sign in to comment.