lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source 
Conflicts:
	src/main/resources/assets/alchemicalwizardry/lang/en_US.lang
This commit is contained in:
Arcaratus 2015-04-18 20:38:20 -04:00
commit 72b1904f6b
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/resources/assets/alchemicalwizardry/lang/en_US.lang
View file

@ -452,4 +452,4 @@ message.routerfocus.limit=Focus' Item Limit set to:
#Achievements
achievement.alchemicalwizardy:firstPrick=Your first prick!
achievement.alchemicalwizardy:firstPrick.desc=The first drop of life into the Altar...
achievement.alchemicalwizardy:firstPrick.desc=The first drop of life into the Altar...