Commit Graph

69 Commits

Author SHA1 Message Date
9ff47d3404 Relocate zstd 2021-05-12 18:04:21 +02:00
dc51379e8f Update upstream
acf9c3b Change oak stair shape to straight in legacy.json.
c7da4c0 Swap out logback for log4j2
2021-04-05 23:14:20 +02:00
7b9e8a0d79 Update dependency com.plotsquared:PlotSquared-Core to v5.13.11 (#1010)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-04-04 13:31:14 +02:00
b96cea75b8 Update Upstream
609c7b8 Scrapped Logging Framework 4 Java

Closes #997
Closes #998
Closes #999
Closes #1000
Closes #1001
Closes #1002
2021-03-29 15:29:16 +02:00
6bd866bdf7 Making renovate happy
Closes #940
Closes #933
Closes #931
2021-02-27 15:52:50 +01:00
4af3cc6e4c Closes #929 2021-02-22 11:13:08 +01:00
0a721b18ce Implement methods 2021-02-14 19:56:05 +01:00
20304bf7ad Cherry-pick build-script changes from upstream 2021-02-11 12:00:28 -05:00
f3d4621589 Minor build script changes 2021-02-04 17:06:49 -05:00
818a75b809 Update dependency com.github.luben:zstd-jni to v1.4.8-2 2021-01-28 15:48:01 +01:00
487d817542 Merge branch 'main' into renovate/com.google.code.gson-gson-2.x 2021-01-21 16:59:18 +01:00
e9da3daf9e Update dependency it.unimi.dsi:fastutil to v8.4.4 2021-01-21 12:53:43 +00:00
692a844759 Update dependency com.google.code.gson:gson to v2.8.6 2021-01-21 12:53:35 +00:00
c35ebd7b53 Only scan used repositories 2021-01-21 13:07:17 +01:00
2ce493ae68 Miscellaneous improvements to build scripts. 2021-01-18 15:58:50 -05:00
6b3fe20c61 revert to upstream slf4j so it's present in IDE 2021-01-08 14:24:58 +00:00
7236f1d6fa Update zStandard jni 2020-12-22 11:57:12 +01:00
bbc0ea0f35 Update dependency com.github.luben:zstd-jni to v1.4.8-1 2020-12-21 20:06:43 +00:00
44f15da5a3 Update Paster 2020-12-21 15:57:57 +01:00
be05ae9230 Update dependency net.java.truevfs:truevfs-profile-default_2.13 to v0.12.2 (#796)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2020-12-21 11:40:00 +01:00
7928479046 Update dependency de.schlichtherle:truezip to v6.8.4 (#793)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2020-12-21 10:55:46 +01:00
2f23643635 Update dependency org.slf4j:slf4j-api to v1.7.30 (#803)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2020-12-21 10:47:07 +01:00
f6cbde6386 Update dependency org.yaml:snakeyaml to v1.27 (#804)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2020-12-21 10:44:31 +01:00
2eb4f14724 Update dependency com.plotsquared:PlotSquared-Core to v5.13.3 (#791)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2020-12-20 23:35:57 +01:00
7444c643a1 Switch to IncendoPaster "library" 2020-12-19 16:18:57 +00:00
2e73746abe Remove Kotlin (#625)
Shrinks the jar size since we no longer must bundle the Kotlin library. The downside is that some classes grew in size compared to their Kotlin versions.
Many contributors didn't care for Kotlin either.
2020-09-17 16:31:55 -04:00
2fcf4bdf7e Updated Gradle 2020-09-08 15:34:53 -04:00
eeb02d3937 Update gradle and kotlin 2020-08-24 22:53:29 -04:00
0a07599abf Update build files and NOTICE.txt 2020-08-14 15:29:15 -04:00
3bc692ff11 Part 1 of upstream merge and format 2020-07-13 22:50:59 -04:00
d3afc9c65d Update to p2 5.12.2 and implement clear pipeline 2020-07-02 14:34:05 +01:00
ac314fcedb Gradle update 2020-07-01 20:06:59 -04:00
b1b591f288 PlotSquared-Core again 2020-05-20 09:49:38 +01:00
9085365165 Override P2's /plot set 2020-05-20 09:44:59 +01:00
bdc129cf7b Update to latest p2 v5
(implement FAWE biome setting)
2020-05-14 16:20:17 +01:00
4307e3a671 Transpile using Babel
This is pretty slow right now, but works as a proof-of-concept.
2020-04-27 23:18:21 -04:00
77a2f1bc41 Remove unneeded repository
PlotSquared 4 and PlotSquared 5 are both on the same maven repo
2020-04-24 15:54:40 -04:00
8bde932354 Add p2 v4 compat.
Anyone that hasn't built FAWE before won't be able to build it again as the v4 repo doesn't exist - it relies on local gradle cache.
2020-04-22 08:10:17 +01:00
952aaf8b43 Fix p2 compatibility and replace empcraft.com/maven2 2020-04-21 11:39:42 +01:00
735a37ffd0 Use custom radix sort for ordering blocks (#1277)
* Use custom radix sort for ordering blocks

* Licenses :P

* Fix ordering, add test for it

* Grant Gradle more memory (thx Fabric)

* Increase (?) / Specify memory for core tests

* Many attempts at fixing OOM

(cherry picked from commit bb013aa89b8457c4649e2546eef0aa94b9fc4020)
2020-04-10 13:42:27 -04:00
5de7c31a8c Update gradle 2020-03-03 15:36:21 -05:00
b7b11cc478 Gradle Upgrades and Clipboard Refactoring 2020-03-02 17:43:27 -05:00
2d5a8ce573 Cleaned up a lot of code and introduced Kotlin to the project 2020-01-14 19:44:09 -05:00
0d2fff2cd2 Upstream Merge 2020-01-10 22:32:12 -05:00
0f1715ea9f Revert "Merge pull request #274 from IntellectualSites/api"
This reverts commit 79d9bda912, reversing
changes made to 0fcac39592.
2019-11-29 14:28:06 +01:00
38bdb929f4 Generate maven artifacts
I'm not a kotlin dsl expert, but that seems to work.
2019-11-27 23:33:42 +01:00
66744bfaa4 Merge remote-tracking branch 'upstream/feature/translatable-text' into i18n-merge 2019-11-21 13:50:05 +00:00
60759934a3 Fix some merge issues 2019-11-20 00:11:54 +00:00
0e22d4718a fix some merge issues 2019-11-19 22:07:30 +00:00
5d8adbc10c Merge remote-tracking branch 'upstream/master' into merge 2019-11-19 21:25:36 +00:00