EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-27 07:36:45 +01:00
Code Issues Projects Releases Wiki Activity
2,975 Commits 232 Branches 71 Tags 87 MiB
8ac23b92d8
Commit Graph

2975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jesse Boyd
3fb6ccbbb6 Fix TNT explosions for sponge 2016-03-27 19:10:08 +11:00
Jesse Boyd
357400c5ac Fix block break road (sponge) 2016-03-27 17:01:49 +11:00
Jesse Boyd
32e10fbff6 Fix permission caching (sponge) 2016-03-27 16:19:56 +11:00
Jesse Boyd
1bf05df706 Try this coolty 2016-03-27 16:01:53 +11:00
Jesse Boyd
e3f5842299 Recover from invalid db entry 2016-03-27 07:31:35 +11:00
Jesse Boyd
53e56a6414 Fix required args 2016-03-27 07:11:09 +11:00
Jesse Boyd
46d3dc609e Update sponge port 2016-03-27 06:47:34 +11:00
Jesse Boyd
056f77a3ba 3.3.2 2016-03-27 03:34:55 +11:00
Jesse Boyd
d4d9a9e148 Change to SubCommand 2016-03-26 20:28:45 +11:00
Jesse Boyd
6a7cf0d56f forgot to push this 2016-03-26 16:44:38 +11:00
Jesse Boyd
1252e004a0 Cancel chat event 2016-03-25 15:56:11 +11:00
Jesse Boyd
2816ceae72 Change chat priority 2016-03-25 15:07:35 +11:00
Jesse Boyd
f74e7bb4cb Fixes #997 for 1.8 2016-03-25 14:50:57 +11:00
Jesse Boyd
30d57d8642 Fixes #997 for 1.9 (TODO fix for 1.8 as well) 2016-03-25 14:25:06 +11:00
Matt
ce9ec20b59 Merge pull request #1000 from manuelgu/patch-1 
Rename PlotGamemode to PlotGameMode
 2016-03-24 23:09:51 -04:00
manuelgu
65d428a989 Rename PlotGamemode to PlotGameMode 
@MattBDev I think you just forgot renaming the class
 2016-03-24 23:06:45 +01:00
Jesse Boyd
7ab8d22325 Move confirmation to commands.yml 2016-03-25 02:03:36 +11:00
Jesse Boyd
ed62ed2487 Fixes #983 2016-03-24 22:08:07 +11:00
Jesse Boyd
8a42eecc11 Command changes 
Legacy commands still need to be cleaned up (after which economy /
confirmation can be centralized)
All command names / usage / description is configurable
Simplifies creating commands
Deeper tab completion / command help
 2016-03-24 20:57:59 +11:00
MattBDev
a62b9a334d Cleaning 2016-03-24 00:50:25 -04:00
MattBDev
48f22eaed4 More cleaning 2016-03-23 13:13:09 -04:00
MattBDev
bb4700aa5a More cleaning 2016-03-23 13:09:13 -04:00
MattBDev
9e2c6f2182 Major code reformatting 2016-03-22 21:41:39 -04:00
Matt
e18e1d4816 Merge pull request #995 from manuelgu/master 
Cleanup
 2016-03-22 14:36:41 -04:00
manuelgu
35c7c20874 Track renamed Music.java file 2016-03-22 18:53:56 +01:00
manuelgu
84188f6557 Cleanup 2016-03-22 18:53:17 +01:00
Matt
09ee7f3048 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	Core/src/main/java/com/intellectualcrafters/plot/commands/Area.java
#	Core/src/main/java/com/intellectualcrafters/plot/commands/Auto.java
#	Core/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java
#	Core/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java
#	Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java
#	Core/src/main/java/com/intellectualcrafters/plot/object/PlotAnalysis.java
 2016-03-20 23:03:31 -04:00
Matt
029241912b Code Style Cleanup 2016-03-20 22:52:16 -04:00
MattBDev
0e49dd6f62 Merge branch 'manuelgu-feature/rm-redundant-methods' 2016-03-20 19:54:46 -04:00
MattBDev
cb0b59fdb4 Merge branch 'feature/rm-redundant-methods' of https://github.com/manuelgu/PlotSquared into manuelgu-feature/rm-redundant-methods 2016-03-20 19:52:11 -04:00
MattBDev
bb4ecb94a1 Cleanup 2016-03-20 19:35:40 -04:00
manuelgu
df12e53d40 Remove redundant .s() methods 2016-03-20 23:19:37 +01:00
MattBDev
274d819f8c Use Metrics as dependency in Sponge 
Unlike Bukkit, we can support Sponge Metrics as a dependency.
 2016-03-20 14:00:39 -04:00
Jesse Boyd
2e4f4d0064 Merge pull request #986 from SynergyMC/testing 
A small change to /p weanywhere's behavior
 2016-03-20 21:50:17 +11:00