Anuken 5f3cef251b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features ... Conflicts: core/assets/logicids.dat core/src/mindustry/content/Blocks.java gradle.properties		2021-09-28 18:45:09 -04:00
..
atmosphere.frag	Partial 7.0 merge - API preview	2021-06-02 11:08:08 -04:00
atmosphere.vert	Newlines	2020-10-27 22:08:53 +03:00
blockbuild.frag	Partial 7.0 merge - API preview	2021-06-02 11:08:08 -04:00
buildbeam.frag	Don't render weather in full map screenshots	2020-12-25 21:51:25 -05:00
caustics.frag	Partial 7.0 merge - API preview	2021-06-02 11:08:08 -04:00
clouds.vert	Serpulo clouds	2021-09-05 00:42:47 -04:00
cryofluid.frag	Remove unused variable (#6063)	2021-09-27 22:25:22 -04:00
cubemap.frag	Newlines	2020-10-27 22:08:53 +03:00
cubemap.vert	Newlines	2020-10-27 22:08:53 +03:00
darkness.frag
default.frag	Newlines	2020-10-27 22:08:53 +03:00
default.vert
light.frag
mesh.vert
mud.frag	Fixed crash caused by invalid NinePatch sprites	2021-07-06 15:23:37 -04:00
planet.frag
planet.vert	Arc compatibility	2021-09-17 11:46:52 -04:00
planetgrid.frag
planetgrid.vert
screenspace.frag
screenspace.vert
shield.frag
slag.frag	Fixed #6071	2021-09-28 11:28:53 -04:00
space.frag	Newlines	2020-10-27 22:08:53 +03:00
tar.frag	Newlines	2020-10-27 22:08:53 +03:00
unitbuild.frag
unlit.vert
water.frag	Partial 7.0 merge - API preview	2021-06-02 11:08:08 -04:00