Merge branch 'master' into tracing_functions
This commit is contained in:
commit
2b4be7d0b8
2 files changed
+3
-3
No files matched your search
+2
-2
@@ -4,8 +4,8 @@ org.gradle.jvmargs=-Xmx1G
|
||||
# Fabric Properties
|
||||
# check these on https://fabricmc.net/use
|
||||
# or better: https://modmuss50.me/fabric.html
|
||||
minecraft_version=1.14.4-pre7
|
||||
yarn_mappings=1.14.4-pre7+build.1
|
||||
minecraft_version=1.14.4
|
||||
yarn_mappings=1.14.4+build.1
|
||||
loader_version=0.4.8+build.155
|
||||
|
||||
# Mod Properties
|
||||
|
||||
@@ -208,7 +208,7 @@ public class CarpetSettings
|
||||
@Rule(desc = "Enables /script command", extra = "An in-game scripting API for Scarpet programming language", category = COMMAND)
|
||||
public static boolean commandScript = true;
|
||||
|
||||
@Rule(desc = "Enables /player command to control/spawn players", category = COMMAND, validate = Validator.WIP.class)
|
||||
@Rule(desc = "Enables /player command to control/spawn players", category = COMMAND)
|
||||
public static boolean commandPlayer = true;
|
||||
|
||||
@Rule(desc = "Placing carpets may issue carpet commands for non-op players", category = SURVIVAL)
|
||||
|
||||
Reference in new issue
Block a user