Merge branch '3.7'

This commit is contained in:
Dylan K. Taylor 2019-03-21 19:02:55 +00:00
commit 9ad7f74501

View File

@ -104,7 +104,7 @@ class Flat extends Generator{
$split = array_map('\trim', explode(',', $layers));
$y = 0;
foreach($split as $line){
preg_match('#^(?:(\d+)x)?(.+)$#', $line, $matches);
preg_match('#^(?:(\d+)[x|*])?(.+)$#', $line, $matches);
if(count($matches) !== 3){
throw new InvalidGeneratorOptionsException("Invalid preset layer \"$line\"");
}