Merge branch 'master' into 1.17

# Conflicts:
#	src/main/java/carpet/script/utils/AppStoreManager.java
This commit is contained in:
gnembon committed 2021-06-30 13:33:10 -03:00
commit 4f77327b6c
7 files changed
+194 -83

No files matched your search

+2
View File
@@ -845,6 +845,7 @@ public class CarpetSettings
"but this also means it will work on vanilla servers as well"
},
category = {CREATIVE, CLIENT},
strict = false,
validate = Validator.NONNEGATIVE_NUMBER.class
)
public static double creativeFlySpeed = 1.0;
@@ -860,6 +861,7 @@ public class CarpetSettings
"but this also means it will work on vanilla servers as well"
},
category = {CREATIVE, CLIENT},
strict = false,
validate = Validator.PROBABILITY.class
)
public static double creativeFlyDrag = 0.09;