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

Merge branch 'master' into 1.17

Browse Source 
# Conflicts:
#	src/main/java/carpet/commands/PerimeterInfoCommand.java
#	src/main/resources/carpet.mixins.json
This commit is contained in:
gnembon committed 2021-04-04 22:34:38 -03:00
2 parents da2873de52 f0d044a49f
commit 0cce983092
14 files changed
+93 -21
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
@@ -196,6 +196,7 @@
"PlayerEntity_creativeNoClipMixin",
"PistonBlockEntity_playerHandlingMixin",
"BlockItem_creativeNoClipMixin",
"WallStandingBlockItem_creativeNoClipMixin",
"LivingEntity_creativeFlyMixin",
"BaseRangeDecorator_cleanLogsMixin"
],