Merge remote-tracking branch 'origin/master'

This commit is contained in:
Ellpeck 2017-05-03 14:45:58 +02:00
commit 0ee0d47ae6

View file

@ -32,3 +32,5 @@ albrechtboucher=actuallyadditions:itemCrystalEmpowered@2
fobok=actuallyadditions:itemCrystal@4
dankfrog=actuallyadditions:itemCrystalEmpowered@2
deanwhufc=actuallyadditions:itemCrystalEmpowered@2
witsend66=actuallyadditions:itemCrystalEmpowered@1
broccoli_bob=actuallyadditions:itemCrystal@3