Gerrygames 9174ad854c Merge branch 'dev' into abstraction ... # Conflicts: # bukkit/pom.xml # bungee/pom.xml # common/pom.xml # common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/Protocol1_15To1_14_4.java # common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java # common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/types/Chunk1_15Type.java # jar/pom.xml # pom.xml # sponge-legacy/pom.xml # sponge/pom.xml # velocity/pom.xml		2019-12-09 11:52:23 +01:00
..
src	Merge branch 'dev' into abstraction	2019-12-09 11:52:23 +01:00
pom.xml	1.15-pre6	2019-12-07 10:05:29 +01:00