Merge branch 'master' into 1.16

This commit is contained in:
gnembon committed 2020-03-31 00:05:08 -03:00
commit 1d86b4a223
8 files changed
+79 -8

No files matched your search

+11 -2
View File
@@ -30,6 +30,7 @@ import static carpet.settings.RuleCategory.SURVIVAL;
import static carpet.settings.RuleCategory.TNT;
import static carpet.settings.RuleCategory.DISPENSER;
import static carpet.settings.RuleCategory.SCARPET;
import static carpet.settings.RuleCategory.CLIENT;
@SuppressWarnings("CanBeFinal")
public class CarpetSettings
@@ -172,7 +173,11 @@ public class CarpetSettings
@Rule(
desc = "Lag optimizations for redstone dust",
extra = "by Theosib",
extra = {
"by Theosib",
".. also fixes some locational behaviours or vanilla redstone MC-11193",
"so behaviour of locational vanilla contraptions is not guaranteed"
},
category = {EXPERIMENTAL, OPTIMIZATION}
)
public static boolean fastRedstoneDust = false;
@@ -363,7 +368,11 @@ public class CarpetSettings
@Rule(desc = "placing blocks cause block updates", category = CREATIVE)
public static boolean interactionUpdates = true;
@Rule(desc = "smooth client animations with low tps settings", extra = "works only in SP, and will slow down players", category = CREATIVE)
@Rule(
desc = "smooth client animations with low tps settings",
extra = "works only in SP, and will slow down players",
category = {CREATIVE, SURVIVAL, CLIENT}
)
public static boolean smoothClientAnimations;
//@Rule(