Patrick 'Quezler' Mounier e5e4884448 Merge branch 'master' into crater ... # Conflicts: # core/assets/sprites/block_colors.png # core/assets/sprites/sprites.atlas # core/assets/sprites/sprites.png # core/assets/sprites/sprites3.png # core/assets/sprites/sprites5.png # core/src/mindustry/world/modules/ItemModule.java		2020-03-05 10:00:02 +01:00
..
alpha-bg.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
bar-top.9.png
bar.9.png	Various blocks added / Crater map updated / Fixed status effect bugs	2019-01-23 20:08:28 -05:00
button-disabled.9.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
button-down.9.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
button-edge-1.9.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
button-edge-2.9.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
button-edge-3.9.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
button-edge-4.9.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
button-edge-over-4.9.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
button-over.9.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
button-red.9.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
button-right-down.9.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
button-right-over.9.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
button-right.9.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
button-select.9.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
button-square-down.9.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
button-square-over.9.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
button-square.9.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
button-trans.9.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
button.9.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
check-disabled.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
check-off.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
check-on-disabled.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
check-on-over.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
check-on.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
check-over.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
clear.png
crater.png	Draw crater unto plastanium conveyor icon	2020-01-28 10:57:51 +01:00
cursor.png
discord-banner.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
flat-down-base.9.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
info-banner.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
inventory.9.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
logo.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
nomap.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
pack.json	Splitting UI atlas	2019-07-03 15:59:50 -04:00
pane-2.9.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
pane.9.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
scroll-horizontal.9.png	Various blocks added / Crater map updated / Fixed status effect bugs	2019-01-23 20:08:28 -05:00
scroll-knob-horizontal-black.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
scroll-knob-vertical-black.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
scroll-knob-vertical-thin.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
scroll.9.png	Various blocks added / Crater map updated / Fixed status effect bugs	2019-01-23 20:08:28 -05:00
selection.png
slider-knob-down.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
slider-knob-over.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
slider-knob.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
slider-vertical.png
slider.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
underline-2.9.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
underline-disabled.9.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
underline-red.9.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
underline.9.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
whiteui.png	Fixed performance regression / Removed useless fallback sprites	2019-07-03 17:07:22 -04:00
window-empty.9.png	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00