Merge branch 'master' into 1.16

# Conflicts:
#	src/main/java/carpet/network/ClientNetworkHandler.java
#	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:
gnembon committed 2020-06-01 03:05:23 -03:00
commit d5cb99d7f9
6 files changed
+463 -188

No files matched your search

@@ -56,6 +56,10 @@ public class NumericValue extends Value
{
return value;
}
public float getFloat()
{
return value.floatValue();
}
public static long floor(double double_1) {
long int_1 = (long)double_1;