diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-05-28 21:32:59 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-05-28 21:34:16 +0800 |
| commit | f644c84c664c9bc64e08d100e799caee6750e796 (patch) | |
| tree | ce49adc1884259899dddae338449b1582476ddcb /settings.gradle | |
| parent | e82ab958bc7d13e556d7426b7a1862ec76e23eba (diff) | |
| parent | c16a70a0f43a96b6dd2afa86b4fe35f501530aa2 (diff) | |
| download | RoughlyEnoughItems-f644c84c664c9bc64e08d100e799caee6750e796.tar.gz RoughlyEnoughItems-f644c84c664c9bc64e08d100e799caee6750e796.tar.bz2 RoughlyEnoughItems-f644c84c664c9bc64e08d100e799caee6750e796.zip | |
Merge remote-tracking branch 'origin/6.x' into 6.x-1.17
# Conflicts:
# runtime/src/main/java/me/shedaniel/rei/impl/client/ClientHelperImpl.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigObjectImpl.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/DelegateScreen.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/TransformingScreen.java
# settings.gradle
Diffstat (limited to 'settings.gradle')
| -rwxr-xr-x | settings.gradle | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/settings.gradle b/settings.gradle index b608898c7..d74265742 100755 --- a/settings.gradle +++ b/settings.gradle @@ -16,3 +16,4 @@ include "fabric" //include "forge" //include "jei-compatibility-layer" +//include "jei-internals-workaround" |