Merge branch 'master' into 1.17

This commit is contained in:
gnembon committed 2021-05-21 04:42:21 -03:00
commit 84dd972758
24 files changed
+2438 -16

No files matched your search

+13
View File
@@ -1,5 +1,6 @@
package carpet;
import carpet.script.utils.ScriptDownloader;
import carpet.settings.ParsedRule;
import carpet.settings.Rule;
import carpet.settings.SettingsManager;
@@ -456,6 +457,18 @@ public class CarpetSettings
)
public static boolean scriptsOptimization = true;
@Rule(
desc = "Location of the online repository of scarpet apps",
extra = {
"set to 'none' to disable.",
"Point to any github repo with scarpet apps",
"using <user>/<repo>/contents/<path...>"
},
category = SCARPET,
validate= ScriptDownloader.ScarpetAppStoreValidator.class
)
public static String scriptsAppStore = "gnembon/scarpet/contents/programs";
@Rule(desc = "Enables /player command to control/spawn players", category = COMMAND)
public static String commandPlayer = "ops";