Merge remote-tracking branch 'origin/1.12' into 1.12

This commit is contained in:
modmuss50 2017-12-31 16:37:57 +00:00
commit db9a14d619
No known key found for this signature in database
GPG key ID: 773D17BE8BF49C82

View file

@ -375,6 +375,7 @@ item.techreborn.dustsmall.diorite.name=小堆闪长岩粉
item.techreborn.dustsmall.granite.name=小堆花岗岩粉
item.techreborn.cell.name=空单元
item.techreborn.cell.fluid.name=$fluid$单元
item.techreborn.rebattery.name=充电电池
item.techreborn.lithiumBattery.name=锂电池
item.techreborn.energyCrystal.name=能量水晶