Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-06-03 17:11:43 +02:00
commit ddd94e25c4

@ -96,6 +96,14 @@ Copyright (C) 2014 Justin Aquadro (MIT):
textures/drawers_spruce_wood_front_2.png textures/drawers_spruce_wood_front_2.png
textures/drawers_spruce_wood_front_4.png textures/drawers_spruce_wood_front_4.png
textures/drawers_spruce_wood.png textures/drawers_spruce_wood.png
textures/drawers_upgrade_diamond.png
textures/drawers_upgrade_emerald.png
textures/drawers_upgrade_gold.png
textures/drawers_upgrade_iron.png
textures/drawers_upgrade_obsidian.png
textures/drawers_upgrade_slot_bg.png (edited by LNJ, 2017)
textures/drawers_upgrade_steel.png
drawers_upgrade_template.png
textures/drawers_wood_front_1.png textures/drawers_wood_front_1.png
textures/drawers_wood_front_2.png textures/drawers_wood_front_2.png
textures/drawers_wood_front_4.png textures/drawers_wood_front_4.png