EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-10-31 09:33:43 +01:00
Code Issues Projects Releases Wiki Activity
5,684 Commits 282 Branches 82 Tags
fix/v7/admin-plot-context-deny-overried
Commit Graph

5684 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MattBDev
76bcb76905 Merge remote-tracking branch 'origin/master' 2016-06-10 13:31:41 -04:00
MattBDev
93deebf4ca 1.10 fixes 2016-06-10 13:31:28 -04:00
MattBDev
482f4d6815 Modify Setting and Storage class names. 2016-06-10 13:00:34 -04:00
Jesse Boyd
0d47e4599f Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 2016-06-09 18:06:08 +10:00
Jesse Boyd
f41c7dc1f6 Fix NPE 2016-06-09 18:06:00 +10:00
MattBDev
8fe381d098 Fix SpongeCommand 2016-06-08 19:06:07 -04:00
MattBDev
12c01760a6 Tweaks and small memory improvement. 2016-06-06 01:43:06 -04:00
Jesse Boyd
880e084006 Register expiry tasks 2016-06-06 12:47:54 +10:00
Jesse Boyd
f1f6b2781e Fix INSTABREAK flag 2016-06-06 06:34:05 +10:00
Jesse Boyd
237a0d8b6b Always cache * uuid 2016-06-05 20:11:02 +10:00
Jesse Boyd
a1c722aa9e Fix player location/current plot 2016-06-05 20:03:05 +10:00
Jesse Boyd
960ad50070 Use DBFunc instead of dbManager 2016-06-05 19:54:33 +10:00
Jesse Boyd
7d44850bb0 Mask getBlock 2016-06-05 19:46:52 +10:00
Jesse Boyd
7427d83ae2 final primitives are final 2016-06-05 19:39:51 +10:00
Jesse Boyd
48cf381ed6 * 2016-06-05 18:57:11 +10:00
Jesse Boyd
0114dd7558 Fix convert 2016-06-05 18:42:34 +10:00
Jesse Boyd
48382e0c4e Remove null version from storage 2016-06-05 18:23:24 +10:00
Jesse Boyd
ce23ad5615 Fix NPE 2016-06-05 18:07:41 +10:00
Jesse Boyd
0b1153da21 Include other config files in DebugPaste 2016-06-05 17:43:40 +10:00
Jesse Boyd
386157edc1 fix reserved flags 2016-06-05 17:35:44 +10:00
Jesse Boyd
b7a8c8ecd6 Don't need this 2016-06-05 17:33:06 +10:00
Jesse Boyd
951a6b82a2 simplify config / multiple expiry tasks / block cache fix 2016-06-05 17:28:43 +10:00
MattBDev
70aaa984e2 Documentation and Flag Changes. 2016-06-04 17:19:37 -04:00
Jesse Boyd
17ff6a7e1d Merge pull request #1157 from MisterErwin/master 
Fixed invalid condition
 2016-06-05 04:34:47 +10:00
Alex
281f60a4ef Fixed invalid condition 2016-06-04 20:26:32 +02:00
Jesse Boyd
ca5d3a818b PlotBlock cache / events / flags 2016-06-04 06:20:13 +10:00
Jesse Boyd
f84766074e Fixes #1145 2016-06-04 03:36:39 +10:00
MattBDev
7dba332455 Debug a player is added to the known list. 2016-06-03 11:17:08 -04:00
MattBDev
b4707c94c4 Fix #579 
Also tweaks to deprecation for development purposes.
 2016-06-03 10:57:25 -04:00
MattBDev
0147690eba Make Sponge compile 
It doesn't work but it allows the project to compile.
 2016-06-02 19:38:35 -04:00
MattBDev
cee970e3d9 Tweaked some things 2016-06-02 13:42:32 -04:00
MattBDev
da58c7b411 Beautify code 2016-06-02 11:38:47 -04:00
MattBDev
8e306a92e3 Condense HttpUtil 2016-06-02 09:59:54 -04:00
MattBDev
89c4ce24ef Merge branch 'fix/forcefieldflag' of https://github.com/manuelgu/PlotSquared into manuelgu-fix/forcefieldflag 2016-06-02 09:52:30 -04:00
MattBDev
e6433a24ab Fix grow flags 2016-06-02 00:33:50 -04:00
MattBDev
f21d159911 Various fixes and tweaks. 2016-06-01 16:50:35 -04:00
MattBDev
042d8950ee Fix #1139 2016-05-29 20:48:14 -04:00
manuelgu
8d6565c32c Fix NPE 2016-05-29 19:38:31 +02:00
manuelgu
def33bc9ad Fix IntellectualSites/PlotSquared#1140 2016-05-29 11:59:16 +02:00
MattBDev
53e4b728a6 Merge remote-tracking branch 'origin/master' 2016-05-28 22:38:10 -04:00
MattBDev
4af846967c Fix #958 2016-05-28 22:37:56 -04:00
manuelgu
9ae4f02205 Fix forcefield flag 2016-05-28 01:16:01 +02:00
Jesse Boyd
85055320c2 Merge pull request #1134 from manuelgu/feature/componentevent 
[WIP] Implement PlotComponentSetEvent
 2016-05-28 09:13:04 +10:00
manuelgu
d7b2881778 Don't * import 2016-05-28 01:12:05 +02:00
manuelgu
a7c965c6b0 Merge branch 'feature/componentevent' of https://github.com/manuelgu/PlotSquared into feature/componentevent 2016-05-28 01:09:25 +02:00
manuelgu
ec4839ec3f Move event calling to Plot class 2016-05-28 01:09:13 +02:00
Jesse Boyd
b5cc6eeb0c Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	Sponge/src/main/java/com/plotsquared/sponge/SpongeMain.java
 2016-05-28 08:45:35 +10:00
manuelgu
4078f0708b Proper javadoc for event 2016-05-28 00:29:27 +02:00
Jesse Boyd
28a5c9f597 Remove pre-init logging 2016-05-28 02:01:50 +10:00
Matt
604f62dbd3 Remove dumb log statement 2016-05-27 11:10:36 -04:00