aboutsummaryrefslogtreecommitdiff
path: root/default-plugin/src
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2024-07-22 22:20:36 +0900
committershedaniel <daniel@shedaniel.me>2024-07-22 22:20:36 +0900
commitd0a69811215c779229e9227264f5b79839c471af (patch)
treeede07440e733fa72c9f7b8f256abb797916089f1 /default-plugin/src
parent667c7993dcea8b09bdffcad9956b353f054ad6e2 (diff)
parentc5a04154d45e58893ae14ee3daa52c61562079e9 (diff)
downloadRoughlyEnoughItems-d0a69811215c779229e9227264f5b79839c471af.tar.gz
RoughlyEnoughItems-d0a69811215c779229e9227264f5b79839c471af.tar.bz2
RoughlyEnoughItems-d0a69811215c779229e9227264f5b79839c471af.zip
Merge remote-tracking branch 'refs/remotes/origin/15.x-1.20.5' into 16.x-1.21
# Conflicts: # gradle.properties
Diffstat (limited to 'default-plugin/src')
0 files changed, 0 insertions, 0 deletions