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

159 Commits

Author SHA1 Message Date
Alexander Söderberg
ba40a56c32
Add GPLv3 License headers to all source files. 2020-04-16 04:52:39 +02:00
dependabot-preview[bot]
a8619fe2ad
Bump asm from 7.3.1 to 8.0.1 
Bumps asm from 7.3.1 to 8.0.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-14 18:23:48 +00:00
dependabot-preview[bot]
c812bb1295
Bump annotations from 18.0.0 to 19.0.0 
Bumps [annotations](https://github.com/JetBrains/java-annotations) from 18.0.0 to 19.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/18.0.0...19.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-04-14 17:50:27 +00:00
Alexander Söderberg
7931390ae4 Fix json relocation issue. Make plot areas dump their default flags and add progress output for flag conversion. 2020-04-11 17:58:08 +02:00
Alexander Söderberg
9c3c42c3e6 Rename published maven artifacts 
# Conflicts:
#	Bukkit/build.gradle
#	Core/build.gradle
 2020-04-11 02:54:34 +02:00
Alexander Söderberg
c196ced0e2 Move org.json into core 2020-04-11 02:28:15 +02:00
Alexander Söderberg
280ced7904 Add GPLv3 License headers to all source files. 
Reason: "            How to Apply These Terms to Your New Programs

           If you develop a new program, and you want it to be of the greatest
         possible use to the public, the best way to achieve this is to make it
         free software which everyone can redistribute and change under these terms.

           To do so, attach the following notices to the program.  It is safest
         to attach them to the start of each source file to most effectively
         state the exclusion of warranty; and each file should have at least
         the "copyright" line and a pointer to where the full notice is found."
 2020-04-10 18:09:01 +02:00
Alexander Söderberg
dada7dbb86 Use relocated org.json instead of including the source files 2020-04-09 17:41:55 +02:00
NotMyFault
6953187cac Add current + new version to update notification 
And fix a little typo alongside bumping versioning to v5
 2020-02-16 14:37:07 +01:00
NotMyFault
f32cb0c16e Merge remote-tracking branch 'origin/dependabot/gradle/v4/org.projectlombok-lombok-1.18.12' into v4 2020-02-10 17:18:02 +01:00
NotMyFault
4a03cb0701 Merge remote-tracking branch 'origin/dependabot/gradle/v4/org.ow2.asm-asm-7.3.1' into v4 2020-02-10 17:17:39 +01:00
dependabot-preview[bot]
76e25953b1 Bump lombok from 1.18.10 to 1.18.12 
Bumps [lombok](https://github.com/rzwitserloot/lombok) from 1.18.10 to 1.18.12.
- [Release notes](https://github.com/rzwitserloot/lombok/releases)
- [Changelog](https://github.com/rzwitserloot/lombok/blob/master/doc/changelog.markdown)
- [Commits](https://github.com/rzwitserloot/lombok/compare/v1.18.10...v1.18.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-10 08:03:18 +00:00
NotMyFault
0ba31ed56b
Update dependencies fitting https pattern 2020-01-21 18:25:46 +01:00
dependabot-preview[bot]
2efe604b9b
Bump asm from 7.2 to 7.3.1 
Bumps asm from 7.2 to 7.3.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-13 08:01:49 +00:00
dependabot-preview[bot]
66a2e5427e
Bump junit from 4.12 to 4.13 
Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/master/doc/ReleaseNotes4.12.md)
- [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-06 07:40:34 +00:00
dependabot-preview[bot]
fad835c029
Bump org.ajoberstar.grgit from 4.0.0 to 4.0.1 
Bumps org.ajoberstar.grgit from 4.0.0 to 4.0.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-30 14:32:48 +00:00
dependabot-preview[bot]
4ba5b6da1d Bump annotations from 17.0.0 to 18.0.0 
Bumps [annotations](https://github.com/JetBrains/java-annotations) from 17.0.0 to 18.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Commits](https://github.com/JetBrains/java-annotations/compare/17.0.0...18.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-07 18:37:56 +01:00
dependabot-preview[bot]
c1a7844f4a Bump lombok from 1.18.8 to 1.18.10 
Bumps [lombok](https://github.com/rzwitserloot/lombok) from 1.18.8 to 1.18.10.
- [Release notes](https://github.com/rzwitserloot/lombok/releases)
- [Changelog](https://github.com/rzwitserloot/lombok/blob/master/doc/changelog.markdown)
- [Commits](https://github.com/rzwitserloot/lombok/compare/v1.18.8...v1.18.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-07 18:36:45 +01:00
dependabot-preview[bot]
781a4d8d78 Bump org.ajoberstar.grgit from 3.1.1 to 4.0.0 
Bumps org.ajoberstar.grgit from 3.1.1 to 4.0.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-07 18:35:23 +01:00
Alexander Söderberg
1a923063b5
Merge branch 'breaking' into we 2019-11-10 13:18:16 +01:00
Jesse Boyd
37f608258f
Remove PlotBlock 2019-11-04 19:55:55 +00:00
MattBDev
17e784c283 Revert dependency upgrades 2019-11-01 21:45:06 -04:00
dependabot-preview[bot]
4a3c015524
Bump asm from 7.1 to 7.2 
Bumps asm from 7.1 to 7.2.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-14 15:17:55 +00:00
dependabot-preview[bot]
ec6c9dac49
Bump lombok from 1.18.8 to 1.18.10 
Bumps [lombok](https://github.com/rzwitserloot/lombok) from 1.18.8 to 1.18.10.
- [Release notes](https://github.com/rzwitserloot/lombok/releases)
- [Changelog](https://github.com/rzwitserloot/lombok/blob/master/doc/changelog.markdown)
- [Commits](https://github.com/rzwitserloot/lombok/compare/v1.18.8...v1.18.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-07 15:16:57 +00:00
NotMyFault
20b0fa31d0 Update gradle and deprecated methods 2019-09-07 22:46:13 +02:00
NotMyFault
4d0bd8a3a3 Upgrade build files 2019-09-04 03:04:51 +02:00
MattBDev
5ddbf3def4 Update gradle 2019-08-07 19:16:44 -04:00
MattBDev
5b8f6e466a Minor gradle edit 2019-08-06 15:05:04 -04:00
NotMyFault
9e8a6c702d Fix gradle script 2019-08-05 14:03:08 -04:00
dordsor21
246845607f Let's first test against Material.matchMaterial for material matching (: 
Also update some dependencies
 2019-06-27 15:18:54 +01:00
MattBDev
fe471c3571 new library in gradle and another change I can't remember. 2019-05-21 18:32:26 -04:00
NotMyFault
5796db51a7 Update links 2019-05-02 20:51:52 +02:00
dordsor21
e156d58769 Generate javadoc with aggregatedJavadocs option 2019-05-02 15:54:14 +01:00
MattBDev
237b10a2a2 Tidying up the code 2019-04-29 10:49:58 -04:00
dordsor21
1e97392244 Update to gradle 5.4 2019-04-23 22:27:32 +01:00
dordsor21
bb44c2ea92 parsable build number 2019-04-20 16:26:31 +01:00
dordsor21
0c46df65e6
Not sure why that last commit was a thing locally 2019-04-12 17:42:35 +01:00
dordsor21
d571f54c65
Update offset to match ci 2019-04-09 15:48:25 +01:00
dordsor21
0c00eb2061 Add clean task back properly 2019-04-05 17:39:16 +01:00
dordsor21
69b05932eb Update to gradle 5. gradlew clean assemble build actually WORKS 2019-04-03 17:15:09 +01:00
dordsor21
ac2d43db68
Update offset to match CI 2019-04-03 14:41:54 +01:00
dordsor21
3a761b3b5f
Update offset to match CI 2019-03-20 12:20:09 +00:00
Sauilitired
0b77b863ba
Update notifications. 2019-03-18 19:49:22 +01:00
dordsor21
e146b6a88d
Update offset to match CI 2019-03-13 13:21:09 +00:00
dordsor21
f93cfb9f8b
Update build offset 2019-02-22 16:53:11 +00:00
dordsor21
72b031e3e5
Update offset to match CI 2019-02-20 11:59:39 +00:00
dordsor21
2e22dfe056
Update offset to match CI 2019-02-16 22:06:31 +00:00
dordsor21
745fd58e2e
* 2019-02-13 21:54:13 +00:00
dordsor21
57981a870e
Update version offset to match ci 2019-02-13 21:53:11 +00:00
dordsor21
cae95343ca
Update build offset 2019-02-10 22:51:21 +00:00
matt
6ec6c26a10 Guava needs to be in sync with Minecraft 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-06 12:02:20 -05:00
dordsor21
e41060ad65
And again 
Because the ci built, but using a specific commit (to split Matt's previous commits into separate builds)
 2019-02-06 14:12:50 +00:00
dordsor21
7e7f14a66b
Update build ci offset 2019-02-06 14:10:34 +00:00
Sauilitired
4e79a3aa16
Fix broken group ID 2019-01-17 15:31:18 +01:00
dordsor21
77ddeabca2 Fix NPE with plot version (update to new versioning within code) 
Also add date and commit to plugin.properties file.
 2019-01-03 17:32:21 +00:00
dordsor21
00a5d5ff64 Nicer versioning and match CI build number 2019-01-02 13:01:37 +00:00
dordsor21
886081e27f The local build was a fluke, and I couldn't work it out in the last 3 hours, so here are some basic updates/cleanup to a few things, and an updated bui;d command in README.md 2018-12-21 16:26:19 +00:00
dordsor21
aaed3f622a Fix build for gradlew clean assemble build 2018-12-21 13:38:28 +00:00
dordsor21
2596f37f66
Merge branch 'breaking' into master 2018-12-20 00:58:28 +00:00
dordsor21
fa2dbb2b89 Update to WorldEdit 7 (and WE7-compatible schematics, *hopefully keeping legacy*) 2018-12-19 23:18:57 +00:00
sauilitired
fb7bcef05f 1.13 shizzle 2018-12-17 20:57:21 +01:00
dordsor21
b9482fe5b4 Possible fix for FAWE build failures 2018-12-17 13:16:53 +00:00
sauilitired
152e9e0e90 Make it build. 2018-12-06 16:59:10 +01:00
sauilitired
3fc7fb0a7a Bump version (PlotSquared 4 will be new release) 2018-12-06 16:53:21 +01:00
sauilitired
18e969227c Update lombok version build. Disable Sponge and Nukkit builds. 2018-12-06 16:49:49 +01:00
sauilitired
724fb34b1f Prettify BukkitMain 2018-08-10 20:46:38 +02:00
sauilitired
b0348cfc34 Update packages. This will not be appreciated 🐱 2018-08-10 17:53:15 +02:00
sauilitired
1646cd0f5a Reformat code 2018-08-10 17:01:11 +02:00
Jesse Boyd
c5778137f6
Update asm 2018-01-25 17:46:41 +11:00
Jesse Boyd
ac9042bbe4
Various minor 
New plugin updater and versioning
In game changelog
fix login teleporting
 2017-08-09 15:05:13 +10:00
Jesse Boyd
022372e9b7
Fixes #1534 + various 
Auto world loading/unloading
Auto player teleporting on login
 2017-04-04 07:59:36 +10:00
MattBDev
e40dc37f89 Fix versioning messup. 2016-12-01 21:56:19 -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
Jesse Boyd
12f8861d07 Various 
externalize strings
plotme conversion fixes
 2016-09-26 18:31:08 +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
Jesse Boyd
85ff8bf639 Minor tweaks 2016-09-07 00:28:01 +10:00
MattBDev
56907e4580 Version Bump 
3.4.6-SNAPSHOT
 2016-08-18 10:38:06 -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
ca8b82dcbe Version Bump 2016-07-05 23:39:38 -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
MattBDev
5b9dc59abf Updates to docs, code style tweaks, and some code optimizations 2016-06-23 20:12:17 -04:00
MattBDev
7dc7714261 Update Gradle to 2.14 2016-06-22 12:31:25 -04:00
Jesse Boyd
0888940307 bump version 2016-06-20 01:37:27 +10:00
Jesse Boyd
3ce225c044 Bump version 2016-06-19 15:51:46 +10:00
Jesse Boyd
951a6b82a2 simplify config / multiple expiry tasks / block cache fix 2016-06-05 17:28:43 +10:00
MattBDev
f21d159911 Various fixes and tweaks. 2016-06-01 16:50:35 -04:00
Jesse Boyd
b125ef6668 Add git revision hash to version 2016-05-20 03:32:35 +10:00
MattBDev
a4647b05e2 Fix #1011 2016-05-10 14:24:02 -04:00
MattBDev
8243e0118a Optionals introduced, code cleaned, potential purge fix 2016-04-01 19:14:46 -04:00
MattBDev
3edfd39af9 Bump Version 2016-04-01 09:30:13 -04:00
MattBDev
b7ebde874f Clean gradle target directory 2016-03-31 21:27:29 -04:00
Jesse Boyd
4a7112a0a5 Various 
Add some 1.9 blocks to chest content with schematic paste
Restructure tileentity placement from schematic (will soon add signs
etc)
Prepare for release 3.3.3
 2016-04-01 04:23:26 +11:00
dmodoomsirius
e282998765 Revert "have clean help delete the output directory" 
This reverts commit afa9935a7a.
 2016-03-29 04:11:25 -04:00
dmodoomsirius
afa9935a7a have clean help delete the output directory 
to make things nice and clean
 2016-03-29 03:59:12 -04:00
MattBDev
a8fd6d00d0 Sorry for the versioning confusion 2016-03-28 23:23:56 -04:00