Joshua Barretto b66957bf74 Merge branch 'AldanTanneo/smooth-layers-shader-fix' into 'master' ... Fixes a block noise issue at specific layers (z=434 among others) See merge request veloren/veloren!2494		2021-06-25 12:43:27 +00:00
..
common	Balance tweaks.	2021-06-23 22:38:37 -05:00
server	mining exp sct color and icon; add mining to skill_preset	2021-06-13 14:34:42 -04:00
voxygen	Merge branch 'AldanTanneo/smooth-layers-shader-fix' into 'master'	2021-06-25 12:43:27 +00:00
world	Merge branch 'aweinstock/lava' into 'master'	2021-06-21 20:49:44 +00:00