Merge remote-tracking branch 'remotes/origin/1.15' into 1.16

# Conflicts:
#	build.gradle
#	src/main/java/techreborn/compat/rei/MachineRecipeCategory.java
#	src/main/java/techreborn/compat/rei/fluidgenerator/FluidGeneratorRecipeCategory.java
#	src/main/java/techreborn/compat/rei/fluidreplicator/FluidReplicatorRecipeCategory.java
This commit is contained in:
modmuss50 2020-03-12 20:33:54 +00:00
commit e3749343e7
178 changed files with 1220 additions and 65 deletions

View file

@ -45,7 +45,7 @@ repositories {
}
}
version = "3.3.3"
version = "3.3.5"
configurations {
shade