modmuss50 8863ea30b3 Merge branch '1.18' into recipe_serde ... # Conflicts: # RebornCore/src/main/java/reborncore/common/crafting/RebornRecipeType.java # src/datagen/groovy/techreborn/datagen/recipes/smelting/SmeltingRecipesProvider.groovy		2022-01-20 18:51:48 +00:00
..
src/main	Merge branch '1.18' into recipe_serde	2022-01-20 18:51:48 +00:00
build.gradle	Fix curse mc version. Closes #2727	2022-01-08 00:42:13 +00:00