Anuken e853ed6419 Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	core/src/mindustry/logic/LCanvas.java

2020-11-02 16:47:33 -05:00

..

blocks

Texture Fix

2020-11-02 23:02:56 +03:00

editor

Fallback atlas / Bugfixes / Cleanup

2020-06-11 15:25:46 -04:00

effects

T4 air carrier unit (*unfinished*)

2020-09-20 19:34:12 -04:00

items

Item sprite cleanup

2020-10-24 19:06:05 -04:00

rubble

Fallback atlas / Bugfixes / Cleanup

2020-06-11 15:25:46 -04:00

shapes

Various fixes

2020-11-02 16:46:11 -05:00

ui

More contrast for specific colors

2020-10-01 14:22:48 -04:00

units

Fixed #2735

2020-09-26 09:46:16 -04:00

pack.json

Fallback atlas / Bugfixes / Cleanup

2020-06-11 15:25:46 -04:00