Commit Graph

393 Commits

Author SHA1 Message Date
sekwah
5a57d9fa96 Merge branch 'master' into spigot 2018-01-24 10:25:29 +00:00
sekwah
9a4fe0d49b Merge remote-tracking branch 'origin/master' 2018-01-24 10:25:00 +00:00
sekwah
63bcfc7a08 Fixed from changes 2018-01-24 10:24:28 +00:00
sekwah
eaa98480d1 Merge remote-tracking branch 'origin/master' into spigot
# Conflicts:
#	src/com/sekwah/advancedportals/coreconnector/container/PlayerContainer.java
2018-01-24 10:22:03 +00:00
sekwah41
f95713b855
Update CONTRIBUTING.md 2018-01-24 10:16:30 +00:00
sekwah41
c5ab7580af
Create CONTRIBUTING.md 2018-01-24 10:15:32 +00:00
sekwah41
bb3084ccb6
Create PULL_REQUEST_TEMPLATE.md 2018-01-24 10:10:49 +00:00
sekwah
6206d7c783 Started working on portal data saving 2018-01-24 10:05:46 +00:00
sekwah
9537be4c7a Made tab complete only show commands with permission 2018-01-23 18:40:39 +00:00
sekwah
cace833e75 Merge branch 'master' into spigot 2018-01-23 18:37:17 +00:00
sekwah
336919605e got the tab complete index wrong 2018-01-23 18:36:39 +00:00
sekwah
b5e6cdf947 updated wrong message 2018-01-23 18:09:16 +00:00
sekwah
c171dd756e Fixed another bracket issue 2018-01-23 18:04:34 +00:00
sekwah
c0efc0f0af Fixed bracket issue 2018-01-23 18:03:23 +00:00
sekwah
57b388c96e update commandsender 2018-01-23 18:02:30 +00:00
sekwah
fc32bb378a Merge branch 'master' into spigot 2018-01-23 18:00:08 +00:00
sekwah
14ddb769e6 Added more subcommands 2018-01-23 17:59:41 +00:00
sekwah
52f58aa3da Updating listeners 2018-01-23 17:44:06 +00:00
sekwah
aca96bb0e3 Merge branch 'master' into spigot 2018-01-23 16:54:14 +00:00
sekwah
ab0805deff updated color codes 2018-01-23 16:52:25 +00:00
sekwah
b6cc53dd6c Merge branch 'master' into spigot 2018-01-23 16:50:36 +00:00
sekwah
5f59e73cb5 Updated help menu 2018-01-23 16:47:46 +00:00
sekwah
4c717e9c9d Merge branch 'master' into spigot 2018-01-23 16:37:27 +00:00
sekwah
328ec6a51f Fixed a subcommand issue 2018-01-23 16:37:04 +00:00
sekwah
750a5348d3 Merge branch 'master' into spigot 2018-01-23 16:27:42 +00:00
sekwah
6ffa9ce979 Added a simple subcommand as a test 2018-01-23 16:26:53 +00:00
sekwah
1f5b474e19 Update to have a invalid sub command message 2018-01-23 06:28:17 +00:00
sekwah
e98d9901ff Merge branch 'master' into spigot 2018-01-23 06:24:33 +00:00
sekwah
8021480bff Fixed error going back a page 2018-01-23 06:24:09 +00:00
sekwah
472d748fa1 Removed unneeded println 2018-01-23 06:19:41 +00:00
sekwah
cf1126f71d changed data type 2018-01-23 06:15:51 +00:00
sekwah
697f764d06 work on the player container 2018-01-23 06:15:14 +00:00
sekwah
01af1faf91 removed unneeded system out 2018-01-23 06:08:51 +00:00
sekwah
84421bedbe Merge branch 'master' into spigot 2018-01-23 06:07:20 +00:00
sekwah
b50bd20531 Added another error catcher 2018-01-23 06:07:04 +00:00
sekwah
0ad9dcdebf Updated to pretty print the json 2018-01-23 06:04:33 +00:00
sekwah
9b286b7df1 Merge branch 'master' into spigot 2018-01-23 06:02:18 +00:00
sekwah
13ecfcea8a Test json writer 2018-01-23 06:01:30 +00:00
sekwah
5433baea0b Merge branch 'master' into spigot 2018-01-23 05:37:42 +00:00
sekwah
5c33600008 updated translation and config files 2018-01-23 05:37:16 +00:00
sekwah
cefae0db89 Added uppercase first letter on the help menu 2018-01-22 22:12:53 +00:00
sekwah
f9492a7f3b Merge branch 'master' into spigot 2018-01-22 22:05:02 +00:00
sekwah
d7b1818b12 Added copying of the default file if the file is missing 2018-01-22 22:04:21 +00:00
sekwah
96dba40e2e Merge branch 'master' into spigot 2018-01-22 21:57:52 +00:00
sekwah
a978325750 removed pointless system out info 2018-01-22 21:57:04 +00:00
sekwah
4b623e12d2 Merge branch 'master' into spigot 2018-01-22 21:56:30 +00:00
sekwah
83e9499f81 Forgot about dollar symbol in regex 2018-01-22 21:56:10 +00:00
sekwah
9cbe59b35b Merge branch 'master' into spigot 2018-01-22 21:51:13 +00:00
sekwah
e76697ddd6 Updated language translator 2018-01-22 21:50:22 +00:00
sekwah
5dabd0868e Merge branch 'master' into spigot 2018-01-22 21:45:16 +00:00