Auxilor 901e364139 Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	gradle.properties

2021-05-22 17:06:59 +01:00

..

java/com/willfp/talismans

Merge remote-tracking branch 'origin/master'

2021-05-22 17:06:59 +01:00

resources

Fixed color of Flame Talisman III

2021-05-16 11:30:12 +01:00