Matsv f881f3d484 Merge branches '1.11-DEV' and 'modular' of https://github.com/MylesIsCool/ViaVersion into modular ... # Conflicts: # pom.xml		2016-09-30 17:19:51 +02:00
..
src/main	Merge branches '1.11-DEV' and 'modular' of https://github.com/MylesIsCool/ViaVersion into modular	2016-09-30 17:19:51 +02:00
pom.xml	Full config api for all platforms using snakeyaml + comments	2016-09-30 00:34:16 +01:00