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

Merge branch 'master' into 1.16

Browse Source 
# Conflicts:
#	src/main/java/carpet/mixins/ServerPlayerInteractionManager_scarpetEventsMixin.java
This commit is contained in:
gnembon committed 2020-07-15 01:21:02 -03:00
2 parents 39a85976fd e8d6e16745
commit f500da08a0
7 files changed
+79 -45
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/resources/carpet.mixins.json
+1 -1
View File
@@ -163,7 +163,7 @@
"ArmorStandEntity_scarpetMarkerMixin",
"Entity_scarpetEventsMixin",
"LivingEntity_scarpetEventsMixin",
"DamageTracker_scarpetEventMixin",
"PlayerEntity_scarpetEventsMixin",
"ServerPlayerEntity_scarpetEventMixin",
"FallingBlockEntity_scarpetEventsMixin",
"BlockItem_scarpetEventMixin",