Patrick 'Quezler' Mounier 5c28985ee6 Merge branch '6.0' into crater ... # Conflicts: # core/assets/icons/icons.properties # 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/content/Blocks.java # core/src/mindustry/ui/fragments/PlayerListFragment.java # core/src/mindustry/world/BlockStorage.java		2020-04-16 12:39:52 +02:00
..
blocks	Merge branch '6.0' into crater	2020-04-16 12:39:52 +02:00
editor	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
effects	Cleaned up weather class	2020-03-11 10:08:27 -04:00
items	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
rubble	Merge	2020-02-11 19:55:02 -05:00
shapes	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
ui	Merge branch 'master' into crater	2020-03-05 10:00:02 +01:00
units	Cleanup	2020-04-13 18:07:00 -04:00
weapons	Merge	2020-02-11 19:55:02 -05:00
zones	Improved battery brightness display / Palette tweak / Diffgen buff	2020-02-11 17:27:33 -05:00
pack.json