Commit Graph

19 Commits

Author SHA1 Message Date
Octavia Togami 8b1f043dc5 Update so many dependencies, merge Forge/Fabric for final jar (#1651)
* Update so many dependencies, merge Forge/Fabric for final

* Clean up contrib docs for Gradle change

* Fix setting compat flags while using toolchain

* Fix deprecation in doc printer

* Restore proper forge JAR name

* Add dist classifier for mod jar

* Properly relocate new bStats

* Fix jar used from fabric

* Fix fabric bom

* Dup the shaded classes for consistency

* Sync Forge/Fabric log4j versions, de-dup

* Downgrade both log4j. This will work

* Update some plugins as well

* Drop the fabric force stuff

* Use duplicate strategy to directly merge jar
2021-02-04 17:45:49 -05:00
N0tMyFaultOG c35ebd7b53
Only scan used repositories 2021-01-21 13:07:17 +01:00
N0tMyFaultOG acc8a79e8e
Leave a note about unsupported versions 2021-01-19 20:23:37 +01:00
MattBDev 2ce493ae68 Miscellaneous improvements to build scripts. 2021-01-18 15:58:50 -05:00
Matt 96dcb95b7c
Javadoc and Formatting fixes. (#619)
Javadoc and Formatting fixes.

Also, extremely minor code changes which have been tested.
This commit is only part one of two commits that aim to fix problems with formatting in our project. In part two I will modify the Google Java Style Guide (since it closely matches our code style) for our project so there is guidance on how to format and document. 

* Updated PlotSquared URL
* Removed plugin acronyms
* Fixed a typo
* Fixed grammar
* Use modern block id's
* Update YouTube video URL
2020-10-05 13:41:41 -04:00
Matt 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
MattBDev 0a07599abf Update build files and NOTICE.txt 2020-08-14 15:29:15 -04:00
MattBDev 3bc692ff11 Part 1 of upstream merge and format 2020-07-13 22:50:59 -04:00
Octavia Togami ff47e6f717 Cherry-pick to fix EntryMaker issue 2020-04-16 20:26:55 -04:00
Octavia Togami 692caeea8a Read WE version from manifest ourselves
(cherry picked from commit 947775b5e54aa9dd89d68ee0b382939796301902)
2020-03-23 19:31:56 -04:00
MattBDev b7b11cc478 Gradle Upgrades and Clipboard Refactoring 2020-03-02 17:43:27 -05:00
MattBDev 728b36cd8c Remove dead code and minor changes to existing code 2020-02-18 13:18:43 -05:00
MattBDev 0d2fff2cd2 Upstream Merge 2020-01-10 22:32:12 -05:00
NotMyFault 1414859773 Expand javadocs
Expanding javadocs task a bit makint it easier to visualize using jenkins
2020-01-07 22:11:47 +01:00
MattBDev f3e0109be2 A lot of small changes 2020-01-03 15:38:30 -05:00
Jesse Boyd 5d8adbc10c
Merge remote-tracking branch 'upstream/master' into merge 2019-11-19 21:25:36 +00:00
MattBDev da3019ae3d More compile fixes and upstream mergesa 2019-10-09 16:15:26 -04:00
NotMyFault 714f8583f3 Update gradle 2019-09-14 01:54:39 +02:00
Jesse Boyd 4e49d16505
fix dependencies 2019-08-26 05:45:03 +01:00