KennyTV 5f46dcbab0 Merge remote-tracking branch 'upstream/master' into abstraction ... # Conflicts: # bukkit/pom.xml # bungee/pom.xml # common/pom.xml # common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/providers/blockentities/FlowerPotHandler.java # common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java # jar/pom.xml # pom.xml # sponge-legacy/pom.xml # sponge/pom.xml # velocity/pom.xml		2019-12-11 09:53:09 +01:00
..
src	Merge remote-tracking branch 'upstream/master' into abstraction	2019-12-11 09:53:09 +01:00
pom.xml	Back to SNAPSHOT	2019-12-10 15:34:42 +00:00