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-10-13 02:55:19 -03:00
2 parents f0f3d4a60e 701a717135
commit 7fae5c92cf
20 files changed
+553 -138
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
@@ -67,6 +67,7 @@
"PlayerEntity_parrotMixin",
"SaplingBlockMixin",
"EntityMixin",
"FlatChunkGeneratorMixin",
"BiomeArray_getBiomeArrayMixin",