Skip to content

Commit

Permalink
Merge branch 'refs/heads/1.21' into 1.21-neo
Browse files Browse the repository at this point in the history 
# Conflicts:
#	build.gradle
#	src/main/resources/fabric.mod.json
  • Loading branch information
@sisby-folk
sisby-folk committed Jul 26, 2024
2 parents 492f20a + 1b4bc79 commit d1fc3e7
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit d1fc3e7

Please sign in to comment.