Patrick 'Quezler' Mounier 05ccdfd51b 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-02-05 10:26:34 +01:00

..

blocks

Merge branch 'master' into crater

2020-02-05 10:26:34 +01:00

editor

Cleanup

2019-06-04 23:30:07 -04:00

effects

Lighting improvements

2019-11-10 16:18:47 -05:00

items

Register crater emoji via ui folder

2020-01-27 19:33:36 +01:00

mechs

Bugfixes

2019-07-10 09:55:31 -04:00

shapes

Fixed performance regression / Removed useless fallback sprites

2019-07-03 17:07:22 -04:00

ui

Draw crater unto plastanium conveyor icon

2020-01-28 10:57:51 +01:00

units

Bruteforce crater emoji

2020-01-27 18:40:40 +01:00

weapons

Updated sprites/UI colors

2019-07-07 14:11:57 -04:00

zones

Fixed map loading bugs

2019-09-01 10:46:44 -04:00

pack.json

Cleanup

2019-06-04 23:30:07 -04:00