Merge branch 'master' into 1.17

# Conflicts:
#	src/main/java/carpet/script/api/Entities.java
This commit is contained in:
gnembon committed 2020-12-07 01:14:12 -04:00
commit 02a25c0c99
16 files changed
+189 -33

No files matched your search

+1 -1
View File
@@ -431,7 +431,7 @@ public class CarpetSettings
extra = "if /script is enabled",
category = SCARPET
)
public static boolean scriptsAutoload = false;
public static boolean scriptsAutoload = true;
@Rule(desc = "Enables /player command to control/spawn players", category = COMMAND)
public static String commandPlayer = "ops";