KennyTV bbeabd20b8 Merge remote-tracking branch 'upstream/master' into abstraction ... # Conflicts: # bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaConfig.java # bungee/src/main/java/us/myles/ViaVersion/bungee/platform/BungeeViaConfig.java # common/src/main/java/us/myles/ViaVersion/api/ViaVersionConfig.java # common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/packets/InventoryPackets.java # common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14_1to1_14/Protocol1_14_1To1_14.java # common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14_1to1_14/packets/EntityPackets.java # common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/MetadataRewriter.java # common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/data/MappingData.java # common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/EntityPackets.java # common/src/main/resources/assets/viaversion/config.yml # velocity/src/main/java/us/myles/ViaVersion/velocity/platform/VelocityViaConfig.java		2019-10-02 09:31:42 +02:00
..
src	Merge remote-tracking branch 'upstream/master' into abstraction	2019-10-02 09:31:42 +02:00
pom.xml	Merge dev, update 1.15 to abstraction, reduce helper mapping (#1456)	2019-09-19 09:27:48 +01:00