Merge branch 'master' into 1.15
# Conflicts: # src/main/java/carpet/fakes/StructureFeatureInterface.java # src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java
This commit is contained in:
commit
c995716357
41 files changed
+122
-137
No files matched your search
@@ -34,7 +34,7 @@ public abstract class World_movableTEMixin implements WorldInterface
|
||||
private Profiler profiler;
|
||||
|
||||
@Shadow
|
||||
protected abstract WorldChunk getWorldChunk(BlockPos blockPos_1);
|
||||
public abstract WorldChunk getWorldChunk(BlockPos blockPos_1);
|
||||
|
||||
@Shadow
|
||||
public abstract BlockState getBlockState(BlockPos blockPos_1);
|
||||
|
||||
Reference in new issue
Block a user