icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into future

Browse Source 
# 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
2 parents 5daad2d832 d8c10c6e4a
commit 9750dd9e78
9 files changed
+9 -231
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/resources/carpet.mixins.json
-1
View File
@@ -71,7 +71,6 @@
"Memory_scarpetMixin",
"PlayerEntity_fakePlayersMixin",
"ServerWorld_fakePlayersMixin",
"ThrownEnderpearlEntity_fakePlayersMixin",
"ServerPlayNetworkHandler_coreMixin",