diff options
| author | shedaniel <daniel@shedaniel.me> | 2024-04-16 01:51:34 +0900 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2024-04-16 01:51:34 +0900 |
| commit | 9358912411e2566cd00def93930ae94da5da6df0 (patch) | |
| tree | cb6d9f0c28eac5728b27e6b5a4f87e0c0565337d /runtime/src/main/resources/roughlyenoughitems.changes.json | |
| parent | 9034bf05f32fda2164190eacc7c6814503fbf611 (diff) | |
| parent | 5f61d89501a4eadd99c805c973b1ef49a3a3aaee (diff) | |
| download | RoughlyEnoughItems-9358912411e2566cd00def93930ae94da5da6df0.tar.gz RoughlyEnoughItems-9358912411e2566cd00def93930ae94da5da6df0.tar.bz2 RoughlyEnoughItems-9358912411e2566cd00def93930ae94da5da6df0.zip | |
Merge remote-tracking branch 'origin/feature/13.1' into feature/14.1
# Conflicts:
# gradle.properties
# runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/RecipeScreenTypeEntry.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/ReloadPluginsEntry.java
# runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/SearchFilterSyntaxHighlightingEntry.java
Diffstat (limited to 'runtime/src/main/resources/roughlyenoughitems.changes.json')
| -rw-r--r-- | runtime/src/main/resources/roughlyenoughitems.changes.json | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/runtime/src/main/resources/roughlyenoughitems.changes.json b/runtime/src/main/resources/roughlyenoughitems.changes.json deleted file mode 100644 index 0a3e2be7c..000000000 --- a/runtime/src/main/resources/roughlyenoughitems.changes.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "version": "2022.1" -}
\ No newline at end of file |