Anuken 78f146fbcf Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 ... # 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/io/anuke/mindustry/graphics/Shaders.java # gradle.properties		2019-12-01 17:42:56 -05:00
..
blockbuild.fragment.glsl
default.vertex.glsl
fog.fragment.glsl
light.fragment.glsl	Lighting improvements	2019-11-10 16:18:47 -05:00
menu.fragment.glsl
shadow.fragment.glsl
shield.fragment.glsl
slag.fragment.glsl	Begin work on 6.0	2019-11-10 14:05:29 -05:00
tar.fragment.glsl
unitbuild.fragment.glsl	More drone changes	2019-06-14 21:06:58 -04:00
water.fragment.glsl