Merge branch 'master' into 1.15

# Conflicts:
#	src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java
#	src/main/java/carpet/script/CarpetExpression.java
#	src/main/resources/carpet.mixins.json
This commit is contained in:
gnembon committed 2019-12-27 11:26:49 -04:00
commit e9e36f64a3
14 files changed
+321 -16

No files matched your search

@@ -0,0 +1,6 @@
package carpet.fakes;
public interface StatTypeInterface<T>
{
boolean hasStatCreated(T key);
}