diff options
| author | shedaniel <daniel@shedaniel.me> | 2024-04-16 01:42:49 +0900 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2024-04-16 01:42:49 +0900 |
| commit | 9bdb9cb7c0a03accb6f86bcedff4b22f38f1346f (patch) | |
| tree | bc7557eeebd32609fc8b26db28f613e5fd576366 /runtime/src | |
| parent | f59653ff2a7c3641624928478a3622e6ffd32889 (diff) | |
| parent | 8981a2f730942e169ba5efa2f25ad3066dc0f797 (diff) | |
| download | RoughlyEnoughItems-9bdb9cb7c0a03accb6f86bcedff4b22f38f1346f.tar.gz RoughlyEnoughItems-9bdb9cb7c0a03accb6f86bcedff4b22f38f1346f.tar.bz2 RoughlyEnoughItems-9bdb9cb7c0a03accb6f86bcedff4b22f38f1346f.zip | |
Merge branch 'feature/12.1' into feature/13.1
# Conflicts:
# gradle.properties
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/changelog/ChangelogLoader.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/UncertainDisplayViewingScreen.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/OverflowWidget.java
Diffstat (limited to 'runtime/src')