Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev/1.21' into dev/1.21
Browse files Browse the repository at this point in the history 
# Conflicts:
#	src/main/resources/assets/anvilcraft/shaders/core/ring.fsh
  • Loading branch information
@MercuryGryph
MercuryGryph committed Dec 1, 2024
2 parents 1a1428f + 511b35b commit 47f874b
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 47f874b

Please sign in to comment.