dordsor21 cbc2b70336 Merge commit 'be485075993f8dc807595c524f58c3bb58156a0c' into breaking ... # Conflicts: # README.md		2018-12-20 00:55:44 +00:00
..
automerge.js	Reformat code	2018-08-10 17:01:11 +02:00
base.yml	Updated Gradle	2016-02-22 23:11:40 -05:00
bridge.template	Bridge template from the spigot page	2018-09-03 00:02:07 +02:00
de-DE.yml	Updated Simplified Chinese translation and formalized language codes.	2018-08-03 20:35:36 +08:00
es-ES.yml	Translation update and fixing wrong lines	2018-11-05 16:00:44 +01:00
fr-FR.yml	Adding French translation	2018-12-12 16:12:40 +01:00
it-IT.yml	Translation update and fixing wrong lines	2018-11-05 16:00:44 +01:00
ko-KR.yml	Translation update and fixing wrong lines	2018-11-05 16:00:44 +01:00
LICENSE	Updated Gradle	2016-02-22 23:11:40 -05:00
plugin.properties	Various	2016-09-26 18:31:08 +10:00
skyblock.template	Updated Gradle	2016-02-22 23:11:40 -05:00
town.template	Updated Gradle	2016-02-22 23:11:40 -05:00
zh-CN.yml	Rename zh_CN.yml to zh-CN.yml	2018-10-10 16:51:43 +02:00