EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-26 07:06:44 +01:00
Code Issues Projects Releases Wiki Activity
2,191 Commits 232 Branches 71 Tags 87 MiB
b2fdcad317
Commit Graph

2191 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Alexander Söderberg
b1ee223b0a Merge pull request #1271 from manuelgu/patch-1 
Make debug output useful
 2016-07-24 07:51:45 +02:00
manuelgu
98e865cdf0 Make debug output useful 2016-07-23 12:50:39 +02:00
MattBDev
8b084839fd Fix #1261 2016-07-19 10:22:50 -04:00
MattBDev
c1d4c481fb Fix #1244 2016-07-17 23:20:31 -04:00
MattBDev
269e409e3e Version Bump 2016-07-17 23:19:37 -04:00
Jesse Boyd
76bce7c0ef Catch CommandException 2016-07-14 20:29:11 +10:00
Jesse Boyd
ba568a3f60 Recover from invalid flag value 2016-07-14 00:28:46 +10:00
Jesse Boyd
a43430b722 Fix NPE for null arg 2016-07-13 00:14:26 +10:00
Jesse Boyd
e2c57cea52 . 2016-07-12 23:56:59 +10:00
Jesse Boyd
ca776b2912 Fixes #1226 2016-07-12 22:12:14 +10:00
Jesse Boyd
e859a7f56c Change to interact perm, not build 2016-07-11 20:27:25 +10:00
Jesse Boyd
ad2db9b836 Merge pull request #1245 from manuelgu/fix/CentreCenterName 
Add additional alias for /p middle
 2016-07-10 22:58:54 +10:00
manuelgu
279084b043 Add additional alias for /p middle 
http://grammarist.com/spelling/center-centre/
 2016-07-09 09:18:55 +02:00
MattBDev
cf5d2a5e86 Entity Fix and Gradle changes 2016-07-01 17:13:49 -04:00
Jesse Boyd
b9ad75ad84 Add teleport flag 2016-06-29 21:22:55 +10:00
Jesse Boyd
185352d3cf Fixes #1229 2016-06-29 15:23:10 +10:00
Jesse Boyd
f4fe762135 * 2016-06-28 20:21:50 +10:00
Jesse Boyd
06682b18a5 Fix compile 
Recover on unknown command error
Fixes #1224
Close #1213 (fixed elsewhere)
Fixes #1212
 2016-06-28 19:55:51 +10:00
Jesse Boyd
f8e97f14d6 Fix end crystal spawn cap 2016-06-28 02:03:23 +10:00
MattBDev
a579df00db Merge remote-tracking branch 'origin/master' 2016-06-27 10:14:28 -04:00
Jesse Boyd
29a0b68dcb Fix currently online for seen info. 2016-06-27 23:59:38 +10:00
MattBDev
d2581bf38b Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 2016-06-27 09:58:17 -04:00
Jesse Boyd
817a5bc16e Various 
Fix compatibility with bukkit 1.5
Recover on failed fancy message initialization
Fix /2 remove *
 2016-06-27 18:38:14 +10:00
Jesse Boyd
047f9a75b9 Fix #1222 2016-06-27 17:45:19 +10:00
Jesse Boyd
96d0bb0e5e bump pom version 2016-06-26 17:08:54 +10:00
Jesse Boyd
7da0b9877f Fixes #1221 (the NPE at least) 2016-06-26 17:07:46 +10:00
Jesse Boyd
f20ef15774 Revert creature spawn message + change expire to seen 2016-06-26 04:30:12 +10:00
MattBDev
3a973342ae Merge remote-tracking branch 'origin/master' 2016-06-24 10:59:18 -04:00
MattBDev
6e25aab51f Cleanup some docs. 2016-06-24 10:56:38 -04:00
Jesse Boyd
a49492aae3 Fix roadregen 2016-06-24 16:16:22 +10:00
Jesse Boyd
dbe965e901 init script engine on get 2016-06-24 15:41:34 +10:00
MattBDev
2c82d1106a Fixed kick message 2016-06-23 23:19:02 -04:00
MattBDev
5b9dc59abf Updates to docs, code style tweaks, and some code optimizations 2016-06-23 20:12:17 -04:00
Jesse Boyd
b587b430b8 #1211 2016-06-24 05:30:26 +10:00
Jesse Boyd
8fd2599686 Fixes #1211 2016-06-24 02:20:21 +10:00
Jesse Boyd
56000d60e7 Just in case 2016-06-23 13:14:29 +10:00