Commit graph

22 Commits

Autor SHA1 Nachricht Datum
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
Octavia Togami
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
MattBDev
2cc66b0d98 Minor upstream file changes 2020-01-29 16:13:28 -05:00
Jesse Boyd
5d8adbc10c
Merge remote-tracking branch 'upstream/master' into merge 2019-11-19 21:25:36 +00:00
Jesse Boyd
2c9f192baf
Merge remote-tracking branch 'upstream/master' into merge 2019-11-19 21:23:47 +00:00
Jesse Boyd
1556101a98
java based merging? 2019-11-19 15:10:36 +00:00
Jesse Boyd
82f5c4ebed
Fix compile 2019-11-07 10:28:17 +00:00
Kenzie Togami
445b7706fc
Restructure how Loom is included in build env 2019-09-22 13:42:26 -07:00
Jesse Boyd
4e49d16505
fix dependencies 2019-08-26 05:45:03 +01:00
Matthew Miller
ec5bc5a3b7 Bump to 7.1.0-SNAPSHOT for continued development 2019-08-12 21:48:15 +10:00
Matthew Miller
22cf93c31f Bump to 7.0.1 2019-08-12 21:35:09 +10:00
wizjany
11a532be74 Back to snapshot. 2019-08-05 23:43:58 -04:00
wizjany
bdaffff90a 7.0.1 release candidate 2 2019-08-05 23:43:58 -04:00
Matthew Miller
c3e3ae4956 Back to snapshots 2019-07-22 21:19:04 +10:00
Matthew Miller
5c2b9e4157 7.0.1 RC1 2019-07-22 21:18:52 +10:00
Kenzie Togami
19802e478c
Re-write root and libs to Kotlin DSL 2019-07-12 13:49:45 -07:00
Kenzie Togami
c5c6a091fd
Update to Gradle 5.5 2019-07-09 18:21:21 -07:00
wizjany
a2b3aabbbf Typo fixes and command clarifications/cleanup.
Also re-disable the gradle daemon. It doesn't always play nice with
ForgeGradle and hogs ram.
2019-07-04 19:28:42 -04:00
wizjany
2ef7cfd038 Update readme links. 2019-06-04 18:31:19 -04:00
Matthew Miller
de9798bf7e Further work on 1.13.2 WorldEdit for Forge. Forge still is missing too many features to finish this, and I need to work out how to port the command wrapper system over. 2019-02-19 18:16:28 +10:00
Matthew Miller
d079f06c31 Make it actually load into an IDE on latest FG 2019-02-19 18:16:28 +10:00