Anuken d3ec50825e Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 ... # Conflicts: # core/assets/sprites/sprites.atlas # core/assets/sprites/sprites.png # core/assets/version.properties # core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java		2018-02-27 19:58:34 -05:00
..
icons	Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0	2018-02-27 19:58:34 -05:00
border.9.png
button-down.9.png
button-map-down.9.png
button-map-over.9.png
button-map.9.png
button-over.9.png
button-select.9.png
button.9.png
check-off.png
check-on-over.png	Finished most of new save system, added new localized strings	2017-12-29 15:54:59 -05:00
check-on.png	Finished most of new save system, added new localized strings	2017-12-29 15:54:59 -05:00
check-over.png	Finished most of new save system, added new localized strings	2017-12-29 15:54:59 -05:00
clear.png
cursor.png
logotext.png
pane-button.9.png
pane.9.png
scroll-horizontal.9.png
scroll-knob-horizontal.9.png
scroll-knob-vertical-black.9.png	Finished most of new save system, added new localized strings	2017-12-29 15:54:59 -05:00
scroll-knob-vertical.9.png	Finished most of new save system, added new localized strings	2017-12-29 15:54:59 -05:00
scroll.9.png
selection.png
slider-knob-down.png
slider-knob-over.png
slider-knob.png
slider-vertical.png
slider.png
text-sides-down.png	Fixed zoom/web save export/liquid crafter/menu button scale bugs	2018-01-26 14:01:16 -05:00
text-sides-over.png	Added language select menu	2018-01-18 22:13:45 -05:00
text-sides.png	Fixed zoom/web save export/liquid crafter/menu button scale bugs	2018-01-26 14:01:16 -05:00
textfield-over.9.png
textfield.9.png
white.png
window-empty.9.png
window.9.png