Merge branch 'master' into 1.17

This commit is contained in:
gnembon committed 2020-12-03 22:25:51 -04:00
commit 9d08c54324
13 files changed
+230 -128

No files matched your search

@@ -1,6 +1,7 @@
package carpet.script.utils;
import carpet.CarpetServer;
import carpet.CarpetSettings;
import carpet.script.CarpetContext;
import carpet.script.CarpetScriptHost;
import carpet.script.value.ListValue;
@@ -123,14 +124,7 @@ public class SystemInfo {
});
return carpetRules;
});
put("scarpet_version", c -> StringValue.of(CarpetSettings.carpetVersion));
}};
public static Value get(String what, CarpetContext cc)