Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-09-19 03:01:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,441 Commits 12 Branches 67 Tags 87 MiB
1918000668
Commit Graph

2441 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Boyd
04c011164a Add near cmd 2016-09-25 18:06:20 +10:00
Jesse Boyd
86b776f742 Nukkit perms 2016-09-25 16:49:51 +10:00
Jesse Boyd
61022b717a Fixes #1360 2016-09-21 13:42:59 +10:00
Jesse Boyd
9e5af7a642 Possible fix for redstone in merged plots 2016-09-20 23:49:22 +10:00
Jesse Boyd
364b4347d1 Fix area id parsing 2016-09-19 14:18:47 +10:00
Jesse Boyd
d89274ce09 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java
 2016-09-17 16:03:57 +10:00
Jesse Boyd
264114332b Let generator be up to the implementation 2016-09-17 16:02:05 +10:00
MattBDev
a4363bdb27 Fix #1355 
There is the possibility this will cause issues with sponge

Signed-off-by: MattBDev <mattbdev@outlook.com>
 2016-09-14 19:27:30 -04:00
MattBDev
8e7e5dcb25 Cleanup 
Signed-off-by: MattBDev <mattbdev@outlook.com>
 2016-09-14 12:16:22 -04:00
Jesse Boyd
56227a6d7d Fixes #1351 2016-09-14 10:21:14 +10:00
Jesse Boyd
63259ec269 Merge pull request #1352 from MisterErwin/master 
A (possible) fix to #1351
 2016-09-14 10:17:11 +10:00
Jesse Boyd
0286a7b046 Fixes #1131 2016-09-14 10:12:53 +10:00
MattBDev
b6dac54677 Code cleaning and Gradle Update 
Updated gradle wrapper to 3.0
Updated Gradle files for Nukkit
Added/cleaned minor Nukkit code
Removed duplicate TitleManagement code

Signed-off-by: MattBDev <mattbdev@outlook.com>
 2016-09-13 18:10:01 -04:00
Alexander Lüpges/MisterErwin
bf1d487508 A (possible) fix to #1351 2016-09-12 17:05:13 +02:00
Jesse Boyd
a95b68b73c Add villager-interact flag 2016-09-09 15:17:37 +10:00
Jesse Boyd
85ff8bf639 Minor tweaks 2016-09-07 00:28:01 +10:00
Jesse Boyd
0557671b80 Recover from third party generator error 2016-09-04 14:22:01 +10:00
Jesse Boyd
d75ab130da Sponge fixes 2016-09-02 15:58:24 +10:00
Jesse Boyd
6a12a6ba64 print chat to console 
Fixes #1339
 2016-09-02 15:47:19 +10:00
Jesse Boyd
22901bf9f2 Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 2016-09-01 16:57:52 +10:00
Jesse Boyd
07ee19b4bb Fixes #1337 2016-08-31 19:09:17 +10:00
MattBDev
27c21b9ab6 Fix #1321 2016-08-30 21:50:52 -04:00
Jesse Boyd
da7a12bc00 Fixes #1234 2016-08-29 16:21:14 +10:00
Jesse Boyd
3b73b2e9d8 Fix grant check 2016-08-29 15:33:26 +10:00
Jesse Boyd
970c80cb15 Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 2016-08-29 15:01:27 +10:00
Jesse Boyd
dd665ed9ce Fence rotation 2016-08-29 15:01:19 +10:00
Jesse Boyd
572da7d436 Merge pull request #1332 from manuelgu/patch-2 
Might resolve #1331
 2016-08-29 14:41:48 +10:00
Jesse Boyd
ab05b026e9 Merge pull request #1335 from Herocraft/fix/vault-repo 
Switch Vault repository to the real one
 2016-08-29 12:19:48 +10:00
kashike
2fcb59f8cf Switch Vault repository to the real one 2016-08-28 18:26:11 -07:00
manuelgu
20250bc989 Might resolve #1331 
Wasn't able to reproduce the issue
 2016-08-28 20:14:58 +02:00
Jesse Boyd
5e4798165b Merge pull request #1330 from MinelinkNetwork/fix-pom 
Fix Spigot artifact in POM
 2016-08-28 18:26:57 +10:00
Byteflux
7fc3fb097e Fix Spigot artifact in POM 
Use the correct groupId, artifactId and version of Spigot dependency
installed by BuildTools
 2016-08-28 01:13:21 -07:00
Jesse Boyd
3a08e5c091 Merge pull request #1326 from SupremeMortal/SupremeMortal-patch-1 
Update Non-existent Repo
 2016-08-28 00:52:04 +10:00
SupremeMortal
50770a78d7 Fixed mistake 2016-08-27 14:09:03 +01:00
SupremeMortal
1266eed86a Add Replacement Repo For Vault 2016-08-27 14:08:35 +01:00
SupremeMortal
c0996299b4 Remove non-existent Repo 
"nexus.theyeticave.net" does not exist anymore.
 2016-08-27 14:03:41 +01:00
Jesse Boyd
90d48b2cd0 Fixes #1289 2016-08-26 13:54:22 +10:00
Jesse Boyd
a95d18499e Fixes #1285 2016-08-26 13:19:42 +10:00
Jesse Boyd
61d00e51ef Fixes #1303 2016-08-26 03:02:50 +10:00
Jesse Boyd
b5349e16f0 Fixes #1305 
Just teleports the player further back
Combine move/tp since tp extends move
 2016-08-26 02:31:50 +10:00
Jesse Boyd
a801127036 Merge pull request #1301 from MisterErwin/master 
Calling events when players are removed from plots & correct calling of Member & Trusted events
 2016-08-26 02:02:40 +10:00
Jesse Boyd
2806f8b20c Fixes #1307 2016-08-26 01:36:35 +10:00
Jesse Boyd
7d11147836 Add Lazzy "Offline -> Offline Lowercase" conversion 2016-08-20 21:40:54 +10:00
Matt
74a6df1fa7 Update README.md 2016-08-20 00:26:53 -04:00
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