Commit Graph

12 Commits

Author SHA1 Message Date
Madeline Miller
062653eda5
Merge branch 'version/7.2.x' 2024-01-24 21:12:34 +10:00
Octavia Togami
d533be42cf Extract task to explicitly merge manifests for -mod 2024-01-24 21:08:23 +10:00
Madeline Miller
75ab2d6499 Merge manifests for hybrid mod jar
See if this makes CI happy

Try this on CI

It seems to mistake the second arg as the wrong type, so split them up

Fix formatting

Switch to shadowJar as it's now miraculously working
2024-01-24 21:08:23 +10:00
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
wizjany
b8d42ac589
Defeat the duplication dilemma. 2022-03-17 13:18:46 -04:00
Madeline Miller
dd69617272
Make some improvements to the Forge side - still not fixed 2022-03-17 16:42:46 +10:00
wizjany
b8d096ba99
Un-mixup the mixins.
This properly separates the forge and fabric mixins in the merged -mod jar.
By some miracle Forge was 'working' with the Fabric mixins, but this is probably safer overall.
2022-03-17 16:42:45 +10:00
Octavia Togami
043c3315aa
Fix Scuffed POMs (#1779)
* Repair fabric POM

* Fix-up a ton of publishing errors

* Remove shadow jar from publishing

* Remove shadow application from platform/core
2021-06-13 11:32:38 -07:00
Octavia Togami
7676a2d54c
[Fabric] Update to 1.17 (#1772) 2021-06-08 19:18:24 -07: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