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/mixins/ServerWorld_scarpetMixin.java
#	src/main/java/carpet/script/api/WorldAccess.java
This commit is contained in:
gnembon committed 2021-04-09 01:40:38 -03:00
2 parents 8903865faa e063748e83
commit 388a3de577
15 files changed
+326 -19
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
@@ -131,6 +131,7 @@
"TntBlockMixin",
"ExplosionMixin",
"ExplosionAccessor",
"Explosion_scarpetEventMixin",
"TntEntityMixin",
"ProjectileEntityMixin",