Ayutac e35e222fa6 Merge branch '1.18' into 1.18-Ayutac-datagen-6 ... # Conflicts: # src/main/java/techreborn/init/TRContent.java # src/main/resources/data/techreborn/recipes/compressor/chrome_plate.json # src/main/resources/data/techreborn/recipes/compressor/chrome_plate_from_block.json # src/main/resources/data/techreborn/recipes/grinder/chrome_dust.json		2022-02-26 12:14:11 +01:00
..
src/main	Merge branch '1.18' into 1.18-Ayutac-datagen-6	2022-02-26 12:14:11 +01:00
build.gradle	Fix curse mc version. Closes #2727	2022-01-08 00:42:13 +00:00