EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-12-05 03:13:14 +01:00
Code Issues Projects Releases Wiki Activity
4,697 Commits 232 Branches 71 Tags 86 MiB
8f0ae7e51d
Commit Graph

4697 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Boyd
bc0c0abe7e Fix NPE 2016-08-19 12:16:13 +10:00
MattBDev
56907e4580 Version Bump 
3.4.6-SNAPSHOT
 2016-08-18 10:38:06 -04:00
Jesse Boyd
005e13a216 Maybe #1239 2016-08-17 18:30:58 +10:00
Jesse Boyd
3558105789 Fix default flags NPE 2016-08-17 15:08:01 +10:00
Jesse Boyd
f651607d2f Might work? 2016-08-17 12:22:45 +10:00
Jesse Boyd
6b95e57d9e Merge pull request #1313 from MinelinkNetwork/blocked-cmds 
Only show blocked-cmds message when event is cancelled
 2016-08-17 12:13:27 +10:00
Byteflux
98d0819383 Only show blocked-cmds message when event is cancelled 2016-08-16 19:09:02 -07:00
Jesse Boyd
30da060f83 Potential fix for schematic placement on clear 2016-08-16 15:53:26 +10:00
Jesse Boyd
e4408d56ec *And this 2016-08-16 14:32:31 +10:00
Jesse Boyd
f07ac646f3 Possible fix for greeting spam 2016-08-15 09:31:03 +10:00
MattBDev
ef3380dc0a Merge remote-tracking branch 'origin/master' 2016-08-12 15:04:18 -04:00
MattBDev
749ab83e5d Move permission check out of loop 
See #1307
 2016-08-12 15:04:11 -04:00
Jesse Boyd
daea9cf60d Allow teleportation for console 2016-08-10 12:33:18 +10:00
MattBDev
2f74368879 Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 2016-08-09 12:45:45 -04:00
MattBDev
63d4476d97 Fix #1181 2016-08-09 12:40:38 -04:00
Jesse Boyd
db69da5b07 *Wrong runnable 2016-08-09 08:52:31 +10:00
Alex
634802ef98 Got rid of that auto-optimize-imports option 2016-08-08 23:20:31 +02:00
Alex
37e4a652dd Now calling the respective events when a user is removed from a plot. 
And switched the event calling of adding Helpers and Trusted players. (Correct me if that was wrong)
 2016-08-08 22:45:08 +02:00
MattBDev
d22f7b8781 Merge remote-tracking branch 'origin/master' 2016-08-08 14:03:17 -04:00
MattBDev
112da17614 Squashed commit of the following: 
commit 91c78407cd
Author: Jesse Boyd <jessepaleg@gmail.com>
Date:   Sun Aug 7 11:29:59 2016 +1000

    Use a queue for expiry

commit 395d6364be
Author: Jesse Boyd <jessepaleg@gmail.com>
Date:   Sun Aug 7 04:43:41 2016 +1000

    Cache on fail as well

commit facd43700d
Author: Jesse Boyd <jessepaleg@gmail.com>
Date:   Sun Aug 7 04:00:50 2016 +1000

    Cache entity count every second

commit 1ae694ff5b
Author: Jesse Boyd <jessepaleg@gmail.com>
Date:   Sun Aug 7 03:52:37 2016 +1000

    Tweak entity counting

commit c99dd1e74a
Author: Jesse Boyd <jessepaleg@gmail.com>
Date:   Sat Aug 6 00:10:11 2016 +1000

    Needs sponge builds

commit f408ac82be
Author: Alexander Söderberg <Sauilitired@users.noreply.github.com>
Date:   Fri Aug 5 12:13:39 2016 +0200

    Update README.md

commit 9b95990ba6
Author: Alexander Söderberg <Sauilitired@users.noreply.github.com>
Date:   Thu Aug 4 16:50:37 2016 +0200

    Update this here as well
 2016-08-08 14:02:25 -04:00
Jesse Boyd
91c78407cd Use a queue for expiry 2016-08-07 11:29:59 +10:00
Jesse Boyd
395d6364be Cache on fail as well 2016-08-07 04:43:41 +10:00
Jesse Boyd
facd43700d Cache entity count every second 2016-08-07 04:00:50 +10:00
Jesse Boyd
1ae694ff5b Tweak entity counting 2016-08-07 03:52:37 +10:00
Jesse Boyd
c99dd1e74a Needs sponge builds 2016-08-06 00:10:11 +10:00
Alexander Söderberg
f408ac82be Update README.md 2016-08-05 12:13:39 +02:00
Alexander Söderberg
9b95990ba6 Update this here as well 2016-08-04 16:50:37 +02:00
MattBDev
77fb329c9e Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 2016-07-31 21:26:18 -04:00
Jesse Boyd
a13b9fb31b flag tix 2016-08-01 11:20:06 +10:00
MattBDev
ea3306d070 Fix #1034 2016-07-31 20:17:35 -04:00
Jesse Boyd
bcbcd6d916 Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 2016-07-31 18:14:12 +10:00
Jesse Boyd
415c6fb0d4 Fixes #1283 2016-07-31 18:14:06 +10:00
MattBDev
e801c6d7e8 Merge branch '3.4.5' 2016-07-31 00:16:37 -04:00
Jesse Boyd
409456e895 Minor sponge fix 2016-07-31 09:16:58 +10:00
MattBDev
e8f4eae6f7 Merge remote-tracking branch 'origin/3.4.5' into 3.4.5 
# Conflicts:
#	Sponge/build.gradle
#	Sponge/src/main/java/com/plotsquared/sponge/util/SpongeSetupUtils.java
 2016-07-29 21:45:34 -04:00
MattBDev
c8419f4a4a Added more Java 8 warnings 2016-07-29 21:40:23 -04:00
MattBDev
09994724db Fix #1277 2016-07-29 21:40:02 -04:00
MattBDev
610e204d12 Fix #1281 , Fix #1282 , and Sponge gradle 2016-07-29 12:47:42 -04:00
MattBDev
1f341e6ba9 Merge remote-tracking branch 'origin/master' into 3.4.5 
# Conflicts:
#	Sponge/src/main/java/com/plotsquared/sponge/SpongeMain.java
#	Sponge/src/main/java/com/plotsquared/sponge/generator/SpongeAugmentedGenerator.java
#	Sponge/src/main/java/com/plotsquared/sponge/util/SpongeSetupUtils.java
#	Sponge/src/main/java/com/plotsquared/sponge/util/SpongeUtil.java
#	Sponge/src/main/java/com/plotsquared/sponge/util/block/GenChunk.java
#	build.gradle
 2016-07-29 12:25:11 -04:00
Jesse Boyd
ffddf5c187 Fix sponge generator cast 2016-07-29 12:12:28 +10:00
MattBDev
b5ec6232f9 Sponge Fixes and minor changes. 2016-07-25 22:25:15 -04:00
MattBDev
34c2da55ca Change Sponge method behavior 2016-07-25 22:25:15 -04:00
MattBDev
33ec80c2cb Fix Sponge generation casting 2016-07-25 22:25:15 -04:00
MattBDev
48064da1ee Fixed deny-teleport flag 2016-07-25 22:25:15 -04:00
MattBDev
adc021109f Added Polar Bear where missing 2016-07-25 22:25:15 -04:00
Jesse Boyd
d23d8c2fd8 *should use this cause instead 2016-07-25 22:25:15 -04:00
Jesse Boyd
3498f309e8 Minor sponge fixes 2016-07-25 22:24:31 -04:00
Jesse Boyd
0b5177f192 Minor uuid cache changes 2016-07-25 22:23:49 -04:00
Jesse Boyd
07dc6a46fb Remove metrics depend 2016-07-25 22:23:19 -04:00
Jesse Boyd
0b19cc7d9d Possible fix + add guest-gamemode flag 2016-07-25 22:23:19 -04:00