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:
commit
e3749343e7
178 changed files with 1220 additions and 65 deletions
|
@ -45,7 +45,7 @@ repositories {
|
|||
}
|
||||
}
|
||||
|
||||
version = "3.3.3"
|
||||
version = "3.3.5"
|
||||
|
||||
configurations {
|
||||
shade
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue