Merge remote-tracking branch 'origin/master'

This commit is contained in:
Ellpeck 2017-03-10 23:47:31 +01:00
commit 47be03cd08

View file

@ -30,3 +30,4 @@ r33s3s=actuallyadditions:itemCrystalEmpowered@2
roadrunner116=actuallyadditions:itemCrystal@4
albrechtboucher=actuallyadditions:itemCrystalEmpowered@2
fobok=actuallyadditions:itemCrystal@4
dankfrog=actuallyadditions:itemCrystalEmpowered@2