Commit Graph

4 Commits

Author SHA1 Message Date
Maddy Miller
5db6ebc9c5
Shade LinBus in -libs (#2172)
* Shade LinBus in -libs

* exclude linbus from -mod jar dupe
2022-08-28 18:01:29 +10:00
Octavia Togami
9e98e77a9c
Exclude examiner from -forge when merging 2022-06-04 10:40:58 -07:00
Madeline Miller
1e618e3a0d
Merge version/7.2.x into master 2022-06-04 18:12:56 +10:00
Octavia Togami
9534a9cfce
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-01-25 02:14:09 -08:00