EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-25 22:56:45 +01:00
Code Issues Projects Releases Wiki Activity
2,300 Commits 232 Branches 71 Tags 87 MiB
6074fc8033
Commit Graph

253 Commits

Author SHA1 Message Date
Jesse Boyd
6074fc8033 Nukkit generator fixes 2016-09-30 14:26:20 +10:00
Jesse Boyd
e4d7270c28 Fix some merged plot events 2016-09-30 03:30:34 +10:00
Jesse Boyd
b6df07f723 Add snow-form flag 2016-09-27 01:38:59 +10:00
Jesse Boyd
177b33154f Multiple 
Fixes #1362
Fixes border id for PlotMe converter
 2016-09-27 00:56:39 +10:00
Jesse Boyd
12f8861d07 Various 
externalize strings
plotme conversion fixes
 2016-09-26 18:31:08 +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
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
8e7e5dcb25 Cleanup 
Signed-off-by: MattBDev <mattbdev@outlook.com>
 2016-09-14 12:16:22 -04: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
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
manuelgu
20250bc989 Might resolve #1331 
Wasn't able to reproduce the issue
 2016-08-28 20:14:58 +02:00
Jesse Boyd
90d48b2cd0 Fixes #1289 2016-08-26 13:54:22 +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
Byteflux
98d0819383 Only show blocked-cmds message when event is cancelled 2016-08-16 19:09:02 -07: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
63d4476d97 Fix #1181 2016-08-09 12:40:38 -04: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
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
MattBDev
ea3306d070 Fix #1034 2016-07-31 20:17:35 -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
adc021109f Added Polar Bear where missing 2016-07-25 22:25:15 -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
4e019ab796 UUID cache changes 2016-07-25 22:23:19 -04: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
07977ac2ce UUID cache changes 2016-07-25 07:44:47 +10: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
manuelgu
98e865cdf0 Make debug output useful 2016-07-23 12:50:39 +02:00
MattBDev
c1d4c481fb Fix #1244 2016-07-17 23:20:31 -04:00
MattBDev
8538170cba Metrics 2016-07-16 22:51:49 -04:00
Jesse Boyd
e2c57cea52 . 2016-07-12 23:56:59 +10:00
MattBDev
8b0e59209c Remove getServerName() 2016-07-05 23:43:08 -04: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