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/network/ServerNetworkHandler.java
#	src/main/java/carpet/script/CarpetExpression.java
This commit is contained in:
gnembon committed 2020-06-14 01:25:58 -03:00
2 parents 9414502eb4 d098087e05
commit 80ca80fe24
22 files changed
+528 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/resources/carpet.mixins.json
+3
View File
@@ -160,6 +160,9 @@
"ServerWorld_scarpetEventMixin",
"HungerManagerMixin_scarpetEventsMixin",
"RecipeManager_scarpetMixin",
"Ingredient_scarpetMixin",
"PistonBlock_movableTEMixin",
"PistonBlockEntity_movableTEMixin",
"World_movableTEMixin",