EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-30 00:56:45 +01:00
Code Issues Projects Releases Wiki Activity
2,679 Commits 232 Branches 71 Tags 86 MiB
3fc7fb0a7a
Commit Graph

2679 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jesse Boyd
4e019ab796 UUID cache changes 2016-07-25 22:23:19 -04:00
MattBDev
b2fdcad317 Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared into 3.4.5 
# Conflicts:
#	Sponge/src/main/java/com/plotsquared/sponge/util/SpongeUtil.java
#	Sponge/src/main/java/com/plotsquared/sponge/util/block/GenChunk.java
 2016-07-25 22:08:54 -04:00
MattBDev
80ea3e9ce7 Sponge Fixes and minor changes. 2016-07-25 20:00:59 -04:00
MattBDev
5f8c77a6cd Change Sponge method behavior 2016-07-25 18:43:11 -04:00
MattBDev
290e5c68dc Fix Sponge generation casting 2016-07-25 18:42:31 -04:00
MattBDev
5d92701100 Fixed deny-teleport flag 2016-07-25 18:04:17 -04:00
MattBDev
1a86d5fb9e Added Polar Bear where missing 2016-07-25 01:19:29 -04:00
Jesse Boyd
30d18c917d *should use this cause instead 2016-07-25 09:54:35 +10:00
Jesse Boyd
b91eab2f0c Minor sponge fixes 2016-07-25 09:47:49 +10:00
Jesse Boyd
770b9be160 Minor uuid cache changes 2016-07-25 09:23:20 +10:00
Jesse Boyd
14b2b11bf3 Remove metrics depend 2016-07-25 08:09:57 +10:00
Jesse Boyd
975a5765c1 Possible fix + add guest-gamemode flag 2016-07-25 08:02:17 +10:00
MattBDev
2b9c2959cf Merge branch '3.4.5' of https://github.com/IntellectualSites/PlotSquared into 3.5.0 2016-07-24 17:45:34 -04:00
Jesse Boyd
07977ac2ce UUID cache changes 2016-07-25 07:44:47 +10:00
MattBDev
9e5ac80435 Merge remote-tracking branch 'origin/3.4.5' into 3.4.5 2016-07-24 17:42:21 -04:00
MattBDev
dda6849412 Fix sponge compile 2016-07-24 17:42:03 -04:00
MattBDev
85d6e42462 Merge branch '3.4.5' of https://github.com/IntellectualSites/PlotSquared into 3.5.0 2016-07-24 17:27:41 -04:00
Alexander Söderberg
b1ee223b0a Merge pull request #1271 from manuelgu/patch-1 
Make debug output useful
 2016-07-24 07:51:45 +02:00