59 Commits

Autor	SHA1	Nachricht	Datum
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