Merge branch 'master' into 1.16
# Conflicts: # src/main/java/carpet/script/CarpetExpression.java # src/main/java/carpet/script/utils/ShapeDispatcher.java # src/main/java/carpet/script/utils/ShapesRenderer.java
This commit is contained in:
commit
9aa580cfa5
19 files changed
+1042
-265
No files matched your search
@@ -50,6 +50,7 @@ public class CarpetScriptServer
|
||||
add(new BundledModule("event_test", false));
|
||||
add(new BundledModule("stats_test", false));
|
||||
add(new BundledModule("math", true));
|
||||
add(new BundledModule("chunk_display", false));
|
||||
}};
|
||||
|
||||
public CarpetScriptServer(MinecraftServer server)
|
||||
|
||||
Reference in new issue
Block a user