Commit Graph

2609 Commits

Author SHA1 Message Date
Jesse Boyd
1f6ad47a79 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Bukkit/src/main/java/com/intellectualcrafters/plot/api/PlotAPI.java
2016-03-30 12:12:19 +11:00
Jesse Boyd
312ad4c48c fix index 2016-03-30 12:09:55 +11:00
MattBDev
31d346a587 Minor code cleanup
Plus an optimization
2016-03-29 17:00:07 -04:00
MattBDev
6007f040cd OCD 2016-03-29 15:47:59 -04:00
MattBDev
d0622eb87d PlotAPI doc and code cleaning 2016-03-29 14:35:40 -04:00
Jesse Boyd
6ebfd426c3 Just "height" would have made more sense 2016-03-30 05:14:51 +11:00
Jesse Boyd
bbe43f782c Fix nested command configuration 2016-03-30 04:47:47 +11:00
Jesse Boyd
560ebf412b Relight command 2016-03-30 04:34:48 +11:00
Jesse Boyd
df630f9be1 Remove outdated copyright notice at the top of each file
- No license is the same as all rights reserved
- There's already a license at the root of the project
- The message was not in most files. easier to remove it
- Support link isn't valid
- No longer just the bukkit API
2016-03-30 02:50:13 +11:00
Jesse Boyd
578e884be7 Merge pull request #1025 from manuelgu/master
Cleanup
2016-03-29 20:08:33 +11:00
manuelgu
22f56d4da6 Remove ChatColor
Sponge support
2016-03-29 10:57:27 +02:00
Jesse Boyd
745f9c4858 Buy 2016-03-29 19:52:57 +11:00
manuelgu
5f2856e0ea Cleanup
Consistent use of String[] instead of String...
Removed unused variables
2016-03-29 10:47:56 +02:00
Jesse Boyd
d9c6d04b46 Debug PlotMe conversion (temporary) 2016-03-29 19:13:48 +11:00
Jesse Boyd
8244086840 Merge pull request #1024 from dmodoomsirius/master
Revert "have clean help delete the output directory"
2016-03-29 19:13:00 +11:00
dmodoomsirius
e282998765 Revert "have clean help delete the output directory"
This reverts commit afa9935a7a.
2016-03-29 04:11:25 -04:00
Jesse Boyd
bd633c0150 Merge pull request #1023 from dmodoomsirius/master
Give the ability to clean the output directory
2016-03-29 19:00:57 +11:00
dmodoomsirius
5ec6bc62ca Merge branch 'master' of https://github.com/dmodoomsirius/PlotSquared 2016-03-29 03:59:42 -04:00
dmodoomsirius
afa9935a7a have clean help delete the output directory
to make things nice and clean
2016-03-29 03:59:12 -04:00
Jesse Boyd
512ae38392 Fix plot kick args 2016-03-29 18:57:35 +11:00
Jesse Boyd
19ef76de33 Oh, and this 2016-03-29 18:51:10 +11:00
Jesse Boyd
638f267498 Remove required args for visit 2016-03-29 18:48:07 +11:00
Jesse Boyd
bc8becae8e Check for null 2016-03-29 18:47:04 +11:00
Jesse Boyd
6f9af04274 Cleanup BukkitChunkManager 2016-03-29 18:44:04 +11:00
Jesse Boyd
75a70bcff4 Merge pull request #1022 from EvilOlaf/patch-1
Missing brackets
2016-03-29 18:11:12 +11:00
Very Evil Olaf
30043fd1c1 Missing brackets
very (VERY!) minor change ^^
2016-03-29 09:10:24 +02:00
Jesse Boyd
ef4438889b Fix plot move 2016-03-29 18:09:40 +11:00
Jesse Boyd
9bd3f2cbfd Fix plot list add 2016-03-29 17:56:48 +11:00
Jesse Boyd
eed8cbec5a Fixes #1015 2016-03-29 17:39:29 +11:00
Jesse Boyd
5f8a55568c Fix plot rate categories 2016-03-29 17:21:58 +11:00
Jesse Boyd
5275d4ec62 Fix "cleanup" breaking plugin again 2016-03-29 17:13:19 +11:00
Jesse Boyd
30dc20b3b3 Fix "Fixes #1015" not resetting the home location.
Resetting involves clearing the current value i.e. so it respects
whatever is set in the config, if that value is changed.
2016-03-29 17:06:58 +11:00
MattBDev
32ba55baf5 Code cleanup and Optimizations 2016-03-29 00:56:44 -04:00
MattBDev
49d18b9229 Code cleanup 2016-03-28 23:26:44 -04:00
MattBDev
a8fd6d00d0 Sorry for the versioning confusion 2016-03-28 23:23:56 -04:00
MattBDev
b1fa258688 Code cleanup 2016-03-28 19:30:55 -04:00
Matt
874da8c5bc Merge pull request #1019 from manuelgu/master
Fixes #1018
2016-03-28 18:17:45 -04:00
MattBDev
76e2b1f416 Code cleanup
maybe a bug fix or two
2016-03-28 17:31:40 -04:00
manuelgu
83fa310fbb Fix ArrayIndexOutOfBoundsExceptions
Occured for /plot trust and /plot add
2016-03-28 23:18:29 +02:00
MattBDev
8d4f042abc Cleanup of code 2016-03-28 13:28:21 -04:00
MattBDev
feee63b3af Fix DebugLoadTest 2016-03-28 13:02:20 -04:00
Matt
c4f5905252 Merge pull request #1016 from manuelgu/master
Fixes #1015
2016-03-28 11:25:33 -04:00
manuelgu
c2e48bb95b Fixes #1015 2016-03-28 16:27:32 +02:00
Jesse Boyd
d9c0ec27b0 Fixes #774 2016-03-28 23:04:08 +11:00
Jesse Boyd
dcd1a50a0c default tab completion + plot chat for merged plots 2016-03-28 22:52:29 +11:00
Matt
b6bdb02fa2 Merge pull request #1012 from manuelgu/master
Update Plugin command to show correct versions
2016-03-28 07:23:07 -04:00
manuelgu
8f0de80755 Update Plugin command to show correct version
Not using PS.get().update but rather reading from the GitHub releases. Can be changed if needed/wanted
2016-03-28 11:29:58 +02:00
MattBDev
978be89e52 Fix bug causing the Updater to not work. 2016-03-27 23:48:24 -04:00
MattBDev
93ef066d7b 3.3.3-SNAPSHOT Beginning
Sponge Gradle Changes
2016-03-27 18:55:57 -04:00
Jesse Boyd
ff1b7c66b1 What's snow-melt doing there? 2016-03-27 19:38:15 +11:00