MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Resolve conflicts

Browse source
This commit is contained in:
Aleksey 2021-04-30 13:28:40 +03:00
parent f34774c54c
commit 086657198e
2 changed files with 5 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/ru/betterend/patterns/BlockPatterned.java
View file

@ -1,19 +1,3 @@
<<<<<<< Updated upstream
package ru.betterend.patterns;
import java.io.Reader;
import net.minecraft.resources.ResourceLocation;
public interface BlockPatterned extends Patterned {
default String getStatesPattern(Reader data) {
return null;
}
default ResourceLocation statePatternId() {
return null;
}
}
=======
package ru.betterend.patterns;
import java.io.Reader;
@ -30,5 +14,4 @@ public interface BlockPatterned extends Patterned {
default ResourceLocation statePatternId() {
return null;
}
}
>>>>>>> Stashed changes
}