Merge branch 'master' into future

# Conflicts:
#	src/main/java/carpet/fakes/ClientSettingsC2SPacketInterface.java
#	src/main/java/carpet/mixins/ClientSettingsC2SPacket_scarpetMixin.java
#	src/main/java/carpet/mixins/ServerPlayerEntity_scarpetEventMixin.java
This commit is contained in:
gnembon committed 2021-11-27 18:55:05 +01:00
commit 9750dd9e78
9 files changed
+9 -231

No files matched your search

@@ -1,5 +0,0 @@
package carpet.fakes;
public interface ClientSettingsC2SPacketInterface {
//public String getLanguage();
}