Merge branch 'master' into spigot

# Conflicts:
#	pom.xml

Resources/lang/en_GB.lang

@@ -0,0 +1,20 @@
+# Same as default minecraft lang files but can handle comments if a # is the first character
+# Anything not set in translations will be defaulted back to the en_GB file.
+# The default en_GB will always be loaded before any other file, even if you make a new en_GB so that new strings
+# do not have blank values possibly making new features unusable.
+#
+# The format of included strings is %(number of argument)$s  (starts at 1 not 0)
+# So the order of variables being inserted into the string is not a set order. Just like minecraft
+#
+# For colors use \u00A7 or § (can be entered by holding alt and pressing 2 then 1 on the numpad)
+# http://minecraft.gamepedia.com/Formatting_codes
+#
+# Also note that some debug messages may not be listed here for translation.
+#
+
+messageprefix.positive=\u00Aa[\u00AeAdvancedPortals\u00Aa]
+messageprefix.negative=\u00Ac[\u00A7AdvancedPortals\u00Ac]
+
+logger.pluginenable=\u00A7aAdvanced portals have been successfully enabled!
+logger.plugindisable=\u00A7cAdvanced portals are being disabled!
+logger.plugincrafterr=This version of craftbukkit is not yet supported or something went wrong, please post this message with the version number and the above stacktrace in an issue on GitHub v:%1$s

TODO.md

@@ -0,0 +1,20 @@
+TODO
+================
+Main Tasks (Generally should be done in order)
+
+Tag registration system (Mostly done, just needs to be tested and implemented)
+
+Portal loading system
+
+Configs for language files to allow all messages to change
+
+Destination Command
+
+Portal Command
+
+Bungee Support Set Locations
+
+Keept the data storage for destinations and portals generally the same
+but modify it a little to be nicer for the tag registry.
+
+Recode for spongepowered or find a way to make it work easier for them.