Merge remote-tracking branch 'origin/master'

This commit is contained in:
Ellpeck 2017-06-29 13:00:20 +02:00
commit 107a9c1091

View file

@ -37,3 +37,4 @@ broccoli_bob=actuallyadditions:itemCrystal@3
dolinmyster=actuallyadditions:itemCrystalEmpowered@4
savos_darkran=actuallyadditions:itemCrystal@4
flanks255=actuallyadditions:itemCrystalEmpowered@3
spectacular101=actuallyadditions:itemCrystal@5