19 Commits

Autor	SHA1	Nachricht	Datum
MattBDev	eeb02d3937	Update gradle and kotlin	2020-08-24 22:53:29 -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	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	5de7c31a8c	Update gradle	2020-03-03 15:36:21 -05:00
MattBDev	b7b11cc478	Gradle Upgrades and Clipboard Refactoring	2020-03-02 17:43:27 -05:00
MattBDev	75653087b9	Remove FAWE-Piston ... Disables a lot of previous functionality in FAWE until replacements can be made. This commit was untested and may cause major issues.	2020-02-05 00:37:42 -05:00
MattBDev	0d2fff2cd2	Upstream Merge	2020-01-10 22:32:12 -05:00
Jesse Boyd	59b8465493	Merge remote-tracking branch 'upstream/feature/translatable-text' int…	2019-11-21 13:50:28 +00:00
Jesse Boyd	66744bfaa4	Merge remote-tracking branch 'upstream/feature/translatable-text' into i18n-merge	2019-11-21 13:50:05 +00:00
Jesse Boyd	0e22d4718a	fix some merge issues	2019-11-19 22:07:30 +00:00
Jesse Boyd	5d8adbc10c	Merge remote-tracking branch 'upstream/master' into merge	2019-11-19 21:25:36 +00:00
Matthew Miller	96e56bdd0c	Rebase translation work for easier rebasing	2019-11-16 22:42:14 +10:00
wizjany	7f4166157e	Merge branch 'master' into feat/nested-fabric-api	2019-09-28 19:43:06 -04:00
Kenzie Togami	bb8c150ed3	Update ForgeGradle + Gradle	2019-09-22 14:12:34 -07:00
Kenzie Togami	445b7706fc	Restructure how Loom is included in build env	2019-09-22 13:42:26 -07:00
Kenzie Togami	fa364dd738	[Forge] Update FG + Forge	2019-09-07 21:59:13 -07:00
Kenzie Togami	ad5dcbea58	Attempt to fix ASM conflict	2019-07-15 09:14:02 -07:00
Kenzie Togami	eccbad92e8	Move away from deprecation, move dependencies towards buildSrc	2019-07-12 13:49:45 -07:00