Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-06 09:33:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,739 Commits 14 Branches 68 Tags 88 MiB
5c678e86bb
Commit Graph

34 Commits

Author SHA1 Message Date
dordsor21
2596f37f66
Merge branch 'breaking' into master 2018-12-20 00:58:28 +00:00
dordsor21
cbc2b70336 Merge commit 'be485075993f8dc807595c524f58c3bb58156a0c' into breaking 
# Conflicts:
#	README.md
 2018-12-20 00:55:44 +00:00
NotMyFault
3be23a3d37 Switching from IRC to Discord 
To offer us a better possibility to help you regarding issues or bugs, join us on discord https://discord.gg/ngZCzbU
 2018-12-18 21:27:30 +01:00
NotMyFault
0252cf724a
Adding JavaDocs, Maven Repo and API Documentation 2018-11-15 14:02:31 +01:00
dordsor21
8cd54929e7 Merge branch 'master' into breaking 
# Conflicts:
#	Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotRateEvent.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEventUtil.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Delete.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Load.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Music.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Reload.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SchematicCmd.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/GameModeFlag.java
#	Core/src/main/java/com/intellectualcrafters/plot/commands/Clear.java
#	Core/src/main/java/com/intellectualcrafters/plot/commands/PluginCmd.java
#	Core/src/main/java/com/intellectualcrafters/plot/commands/Relight.java
#	Core/src/main/java/com/intellectualcrafters/plot/commands/SetHome.java
#	Core/src/main/java/com/intellectualcrafters/plot/config/C.java
#	Core/src/main/java/com/intellectualcrafters/plot/config/Configuration.java
#	Core/src/main/java/com/intellectualcrafters/plot/config/Settings.java
#	Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java
#	Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitEventUtil.java
#	README.md
#	Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotRateEvent.java
#	Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeSchematicHandler.java
#	Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/block/SpongeLocalQueue.java
#	Sponge/src/main/java/com/plotsquared/sponge/util/SpongeEventUtil.java
 2018-11-14 14:44:07 +00:00
NotMyFault
302051a6ca Minor cleanup 2018-10-20 14:03:21 +02:00
Alexander Söderberg
b1246adac2
Update README.md 2018-08-11 15:29:31 +02:00
sauilitired
af461e1fc2 Add alternative maven link and re-enable gradle daemon 2018-08-10 23:41:31 +02:00
sauilitired
d9bc1fcfe7 Disable daemon (temporarily) to allow for CI builds to not run out of memory. 2018-08-10 23:38:28 +02:00
sauilitired
1646cd0f5a Reformat code 2018-08-10 17:01:11 +02:00
sauilitired
02ee1e8fa1 Update README.md and commit code style 2018-08-10 16:52:35 +02:00
The Gitter Badger
e8672df760 Add Gitter badge (#1565) 2017-03-27 12:03:33 -04:00
Matt
74a6df1fa7 Update README.md 2016-08-20 00:26:53 -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
Matt
edc43bd53b Update README.md 2016-03-11 09:05:42 -05:00
Alexander Söderberg
692ad5db81 Update README.md 2016-01-24 10:50:53 +01:00
manuelgu
df27b1ddd8 Update README.md 2016-01-23 20:18:48 +01:00
Gabriele C
a872bd0f61 Shade libs 2016-01-20 13:30:03 +01:00
Jesse Boyd
af79100f7d Update README / pom / merge with 8629c4a6f5 
closes #809
 2016-01-11 07:00:56 +11:00
Alexander Söderberg
cc10c52230 Update README.md 2015-11-25 22:04:16 +01:00
sauilitired
6b52ce941d Update README.md 2015-07-26 14:22:42 +02:00
Alexander Söderberg
cebc5c1df3 Update README.md 2015-07-17 14:47:10 +02:00
Sauilitired
2e528073fd Update readme. 2015-07-16 16:31:53 +02:00
Alexander Söderberg
cf93cfc4c1 Update README.md 2015-07-15 22:01:58 +02:00
Sauilitired
35fa448252 Update README 2015-07-14 16:56:35 +02:00
boy0001
66e9b0ec9e update url 2015-05-15 14:00:39 +10:00
boy0001
cf33fe69a8 Update ReadMe.md 2015-03-13 17:16:50 +11:00
Jesse Boyd
3f92b43ccf update README.md 2015-01-19 20:34:38 -08:00
Alexander Söderberg
9775ad3dd2 Update README.md 2014-12-19 01:46:52 +01:00
Sauilitired
ea7e771cae Updated documentation 2014-11-19 18:48:20 +01:00
Alexander Söderberg
aaa5d54085 Update README.md 2014-11-04 14:44:53 +01:00
root
cf6bacfb0b Cleanup... 2014-10-27 15:58:30 +01:00
Sauilitired
dc91fb1630 Stuff... 2014-09-22 13:20:02 +02:00
Citymonstret
e616c3b418 Init commit 2014-09-22 06:32:58 -04:00