modmuss50 45c1e7412c Merge remote-tracking branch 'Ayutac/1.18-Ayutac-datagen-6' into 1.18 ... # Conflicts: # RebornCore/src/main/java/reborncore/common/misc/TagConvertible.java # src/datagen/groovy/techreborn/datagen/recipes/TechRebornRecipesProvider.groovy # src/datagen/groovy/techreborn/datagen/recipes/machine/compressor/CompressorRecipesProvider.groovy # src/main/java/techreborn/init/TRContent.java		2022-03-02 01:19:11 +00:00
..
src/main	Merge remote-tracking branch 'Ayutac/1.18-Ayutac-datagen-6' into 1.18	2022-03-02 01:19:11 +00:00
build.gradle	Fix curse mc version. Closes #2727	2022-01-08 00:42:13 +00:00