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

fix merge conflicts

Browse Source
This commit is contained in:
DeadlyMC committed 2019-06-02 22:53:33 +05:30
1 parent d0a1ac6b9a
commit a018f2a2ae
1 file changed
+2 -6
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/carpet.mixins.json
+2 -6
View File
@@ -48,14 +48,10 @@
"FossilFeatureMixin", "FossilFeatureMixin",
"BuriedTreasureGeneratorPieceMixin", "BuriedTreasureGeneratorPieceMixin",
"GravityStructureProcessorMixin", "GravityStructureProcessorMixin",
<<<<<<< HEAD
"EntityMixin",
"DirectionMixin",
=======
"ServerPlayNetworkHandler_scarpetEventsMixin", "ServerPlayNetworkHandler_scarpetEventsMixin",
"ServerPlayerInteractionManager_scarpetEventsMixin", "ServerPlayerInteractionManager_scarpetEventsMixin",
>>>>>>> master "EntityMixin",
"DirectionMixin",
"ServerChunkManagerMixin", "ServerChunkManagerMixin",
"SpawnHelperMixin", "SpawnHelperMixin",