modmuss50 71d88ae44a Merge remote-tracking branch 'remotes/origin/1.15' into 1.16 ... # Conflicts: # src/main/java/techreborn/events/ModRegistry.java		2020-04-26 00:28:17 +01:00
..
java/techreborn	Merge remote-tracking branch 'remotes/origin/1.15' into 1.16	2020-04-26 00:28:17 +01:00
resources	Merge remote-tracking branch 'remotes/origin/1.15' into 1.16	2020-04-26 00:28:17 +01:00