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
..
defense	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
distribution	Merge branch 'master' into crater	2020-03-05 10:00:02 +01:00
drills	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
environment	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
extra	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
liquid	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
mechs	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
power	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
production	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
storage	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
turrets	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
units	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
walls	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00