mirror of
https://github.com/Anuken/Mindustry.git
synced 2025-01-22 02:07:20 +07:00
e6bd259c0e
Conflicts: core/assets/icons/icons.properties core/assets/logicids.dat core/src/mindustry/ui/dialogs/PlanetDialog.java core/src/mindustry/world/blocks/distribution/ItemBridge.java core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java core/src/mindustry/world/blocks/storage/StorageBlock.java gradle.properties |
||
---|---|---|
.. | ||
bullet-back.png | ||
bullet.png | ||
casing.png | ||
circle-bullet-back.png | ||
circle-bullet.png | ||
circle-end.png | ||
circle-mid.png | ||
circle-shadow.png | ||
clear-effect.png | ||
drill-laser-end.png | ||
drill-laser.png | ||
error.png | ||
large-bomb-back.png | ||
large-bomb.png | ||
laser-end.png | ||
laser-top-end.png | ||
laser-top.png | ||
laser-white-end.png | ||
laser-white.png | ||
laser.png | ||
launch-arrow.png | ||
mine-bullet-back.png | ||
mine-bullet.png | ||
minelaser-end.png | ||
minelaser.png | ||
missile-back.png | ||
missile-large-back.png | ||
missile-large.png | ||
missile.png | ||
parallax-laser-end.png | ||
parallax-laser.png | ||
particle.png | ||
scale_marker.png | ||
select-arrow.png | ||
shell-back.png | ||
shell.png | ||
transfer-arrow.png | ||
transfer.png | ||
white.png |