Alastair 305014c31c Merge branch 'master' into portals-rewrite ... # Conflicts: # Resources/config.yml # pom.xml # src/com/sekwah/advancedportals/AdvancedPortalsCommand.java # src/com/sekwah/advancedportals/AdvancedPortalsPlugin.java # src/com/sekwah/advancedportals/DestinationCommand.java # src/com/sekwah/advancedportals/WarpCommand.java # src/com/sekwah/advancedportals/listeners/FlowStopper.java # src/com/sekwah/advancedportals/listeners/Listeners.java # src/com/sekwah/advancedportals/listeners/PortalPlacer.java # src/com/sekwah/advancedportals/listeners/PortalProtect.java # src/com/sekwah/advancedportals/portals/AdvancedPortal.java # src/com/sekwah/advancedportals/portals/Portal.java		2016-08-04 01:43:58 +00:00
..
config.yml	trying to fix tracking for workspace	2016-07-31 16:26:04 +00:00
destinations.yml	renamed config file and other yml files	2016-03-03 19:45:31 +00:00
plugin.yml	awarp is now an alias of destination and destination permissions	2016-08-02 17:03:00 -07:00
portals.yml	renamed config file and other yml files	2016-03-03 19:45:31 +00:00