Commit Graph

5030 Commits

Author SHA1 Message Date
Jesse Boyd
c3e2421d51 Merge pull request #1492 from c7w/master
Update s_chinese.yml
2016-12-25 17:32:36 +11:00
c7w
f7793f027c Update s_chinese.yml 2016-12-25 14:30:32 +08:00
Jesse Boyd
6ec96870c0
Fix SO 2016-12-23 15:33:19 +11:00
Jesse Boyd
a843203ca3
Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java
2016-12-15 17:42:51 +11:00
Jesse Boyd
3240fc9559
Exit plot on unclaim
Fixes #1471
2016-12-15 17:37:26 +11:00
Jesse Boyd
5fd1486cec Merge pull request #1478 from EvilOlaf/patch-2
Update ISSUE_TEMPLATE.md
2016-12-13 01:44:37 +11:00
Very Evil Olaf
d648148f51 Update ISSUE_TEMPLATE.md 2016-12-12 15:42:00 +01:00
MattBDev
d554dab8c8 Fix potential NPE with claiming 2016-12-10 14:33:48 -05:00
MattBDev
9ad45750ee Unclaiming a plot should call plotExit() 2016-12-09 20:58:05 -05:00
MattBDev
a554ae5633 Potential fix for commands 2016-12-09 16:58:32 -05:00
Jesse Boyd
7b1c4a5042
Check border when claiming a plot
Also fixes #1467
2016-12-10 01:09:07 +11:00
Jesse Boyd
9fc464e896
Shorter border teleportation 2016-12-10 00:44:42 +11:00
Jesse Boyd
bec11b244e
Use the correct plot id 2016-12-10 00:26:40 +11:00
Jesse Boyd
dc94418b51
Only expand border to current plot. 2016-12-09 23:52:48 +11:00
Jesse Boyd
72ab10c079
remove debug 2016-12-03 23:08:10 +11:00
Jesse Boyd
f50d32f06b
* 2016-12-02 17:17:16 +11:00
Jesse Boyd
6cc744a2e6
Fixes #1444 2016-12-02 17:16:19 +11:00
MattBDev
e40dc37f89 Fix versioning messup. 2016-12-01 21:56:19 -05:00
Jesse Boyd
7e34d9e20a
Fix title logic 2016-11-30 21:26:52 +11:00
Jesse Boyd
c891abce09
Allow added players to use frost walker
Properly fixes #1438
2016-11-30 20:46:48 +11:00
Jesse Boyd
2b561f2efa
Rename to ice-form 2016-11-30 19:06:03 +11:00
Jesse Boyd
dea0a452df
Add fading 1.11 titles 2016-11-30 16:28:50 +11:00
Jesse Boyd
81418b07a8
Fixes #1438 (unless other things call this event) 2016-11-30 16:15:20 +11:00
Jesse Boyd
a3c1ad3ec8
Fixes #1449 2016-11-30 16:10:08 +11:00
Jesse Boyd
7c6c19ba63
Fixes #740 2016-11-30 16:07:16 +11:00
Jesse Boyd
2e23ae0811
Fixes #1243 2016-11-30 16:00:47 +11:00
Jesse Boyd
28e7f5bc08
Fixes #1349
Non standard plot managers/areas not supported
2016-11-30 15:57:24 +11:00
Jesse Boyd
7a1417dc56
Fixes #1415 2016-11-30 15:45:28 +11:00
Jesse Boyd
e7fa9e01be
Fixes #1419 2016-11-30 15:43:23 +11:00
Jesse Boyd
93414d54c1
Fixes #1453 2016-11-30 15:41:08 +11:00
Jesse Boyd
5642fd3899
Fixes #1359
plots.chat.color
and
PLOT_CHAT_SPY_FORMAT
2016-11-30 15:36:13 +11:00
Jesse Boyd
f3d950f6e1
Fix flame enchant damaging entities 2016-11-30 15:03:48 +11:00
Jesse Boyd
95f8aaa2fe
this could be here? 2016-11-30 13:10:36 +11:00
Jesse Boyd
878010255c
Java 9 2016-11-28 18:02:03 +11:00
MattBDev
8edc357d01 Fixed #1448 2016-11-27 01:26:06 -05:00
MattBDev
588639d9c2 3.5.1 Start 2016-11-27 01:08:35 -05:00
MattBDev
ff401b65c4 3.5.0 Release 2016-11-26 18:02:39 -05:00
MattBDev
11913bfbe5 Fix compile issue 2016-11-26 17:53:44 -05:00
MattBDev
62b353f82d Various Sponge changes
- many improvements
- inventory utilities broke when updating to Sponge API 6.0.0
2016-11-26 16:49:13 -05:00
MattBDev
8d442f58d4 Fixes #1445 2016-11-26 12:05:08 -05:00
MattBDev
5cbd2f44bd Update Sponge Gradle 2016-11-26 11:55:59 -05:00
MattBDev
dc673f9715 Fixed #1440 , Fixed #1446 2016-11-26 11:55:38 -05:00
Jesse Boyd
deb5441bcf
*Fix compile error 2016-11-24 11:05:28 +11:00
Jesse Boyd
8ebf71c87f
DB fix 2016-11-24 10:19:00 +11:00
Jesse Boyd
9fd53af483
Add world argument 2016-11-23 15:47:18 +11:00
Jesse Boyd
fb729df59e
Setting to sort plots by area 2016-11-23 15:36:25 +11:00
SupremeMortal
ce6e1be13e Fix maven dependencies (#1439)
* Fixes

* Fix wrong version
2016-11-21 09:59:11 -05:00
MattBDev
e126054053 Fixes #1429 Removes duplicate aliases. 2016-11-20 22:29:14 -05:00
MattBDev
77281017d4 Fixes #1428 , Fixes #1431 2016-11-20 22:24:27 -05:00
Jesse Boyd
e0208aa369
Fix plot help category pagination 2016-11-18 10:49:03 +11:00