Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-18 11:16:16 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,550 Commits 14 Branches 68 Tags 88 MiB
aae350c1b3
Commit Graph

67 Commits

Author SHA1 Message Date
NotMyFault
ffe298710d
Lazy merge v5/v6 2021-04-28 20:17:10 +02:00
NotMyFault
9503b0bfc4
Merge branch 'v5' into v6 2021-04-27 11:52:44 +02:00
NotMyFault
fee1ffa2e9
Switch to vanity url 2021-02-17 00:50:50 +01:00
dordsor21
e8e116312a
Merge branch 'v5' into v6 
# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java
#	Core/src/main/java/com/plotsquared/core/command/Deny.java
#	Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java
 2020-12-14 15:15:27 +00:00
NotMyFault
c85ff7ddda
Update README.md 2020-12-12 17:52:24 +01:00
N0tMyFaultOG
191666a2f2 Fix logo 2020-10-11 13:03:22 +02:00
NotMyFault
808bddbfbb
Apply scaling to image 2020-08-12 10:30:05 +02:00
N0tMyFaultOG
a1b10a2900 Remove dead files 2020-08-11 17:49:04 +02:00
EinDev
f8bd844c6c
Update link for contributing 2020-08-09 13:18:35 +02:00
N0tMyFaultOG
6090c7ccac Link issues to new issue tracker for legacy reasons 2020-05-23 01:25:18 +02:00
Alexander Söderberg
5e6b27e21f
Update README.md 2020-05-23 00:33:30 +02:00
Hannes Greule
2d6a5a3804
Update download link 2020-05-12 15:16:51 +02:00
N0tMyFaultOG
841dd5e189 Update wiki links 2020-05-11 20:27:06 +02:00
Alexander Söderberg
ab6fd06657
Link to bStats 2020-04-18 23:22:05 +02:00
Alexander Söderberg
3bb32a5630
Add bStats stats to README 2020-04-18 23:21:01 +02:00
NotMyFault
4bcd926543 Update discord links 2020-03-09 23:50:22 +01:00
NotMyFault
86ea69b65e
Update README.md 2020-02-21 00:53:52 +01:00
NotMyFault
7797e33ec5
Update sponsors 2020-01-20 01:24:08 +01:00
NotMyFault
0b470f8e01
Update links 2019-12-04 20:11:05 +01:00
Jesse Boyd
a26ede4dae
Typo 2019-11-14 12:54:02 -08:00
Jesse Boyd
7591770c40
Update README.md 2019-11-14 12:48:41 -08:00
Alexander Söderberg
7e21107120
Update README.md 
Include information about what the project is. The previous README assumed that the reader would already be familiar with the concept, which isn't really ideal for a project description. The added text is taken from the Spigot resource page.
 2019-11-12 10:20:46 +01:00
NotMyFault
a3905c68cf
Fix links 2019-10-07 19:20:48 +02:00
NotMyFault
3d1cd46053
Update Sponsors 2019-10-07 19:09:41 +02:00
NotMyFault
ec0281768d
Update README.md 2019-09-07 12:50:12 +02:00
NotMyFault
59a1d619d3 Add sponsors 2019-08-18 14:29:37 +02:00
NotMyFault
cdc01a5bc4 Reformat debugpaste 
And upgrade from IC -> IS
 2019-08-05 14:03:07 -04:00
NotMyFault
5796db51a7 Update links 2019-05-02 20:51:52 +02:00
dordsor21
2998f45b27
Update JavaDoc link 2019-05-02 16:14:53 +01:00
Alexander Söderberg
832d60ce87
Update README.md 2019-03-17 12:34:33 +01:00
Alexander Söderberg
f863dfee42
Update README.md 2019-03-17 12:32:09 +01:00
Alexander Söderberg
c44d180352
Update README.md 2019-03-17 12:31:23 +01:00
Alexander Söderberg
a17cb735b7
Update README.md 2019-03-17 12:30:14 +01:00
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