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

Merge branch 'master' into 1.15

Browse Source 
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
This commit is contained in:
gnembon committed 2019-12-25 03:18:15 -04:00
2 parents 425adf23a8 8a4ad0f353
commit 3e6f83905c
21 files changed
+1019 -296
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
@@ -132,6 +132,7 @@
"DamageTracker_scarpetEventMixin",
"ServerPlayerEntity_scarpetEventMixin",
"FallingBlockEntity_scarpetEventsMixin",
"ChunkTicketManager_scarpetMixin",
"ServerChunkManager_scarpetMixin",
"PistonBlock_movableTEMixin",