Merge branch 'master' into 1.15

This commit is contained in:
gnembon committed 2020-01-27 14:50:11 -04:00
commit e94dd23402
6 files changed
+147 -82

No files matched your search

+1 -1
View File
@@ -131,7 +131,7 @@ public class CarpetSettings
@Rule( desc = "Sets the horizontal random angle on TNT for debugging of TNT contraptions", category = TNT, options = "-1", strict = false,
validate = TNTAngleValidator.class, extra = "Set to -1 for default behavior")
public static double hardcodeTNTangle;
public static double hardcodeTNTangle = -1.0D;
private static class TNTAngleValidator extends Validator<Double> {
@Override