diff options
author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2022-10-07 20:10:17 +0200 |
---|---|---|
committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2022-10-07 20:10:17 +0200 |
commit | f51a6dd27548474d6152377595bf6dc2c9eac436 (patch) | |
tree | 1bfd32a3e99bf2443a3fb32de7aa885334f7ef52 /gradle.properties | |
parent | 199fccd3da24cf470f647f93d007dd4303107e19 (diff) | |
parent | 796f1a24d058ab49e9ef5e9fc3a30817c79950dd (diff) | |
download | NotEnoughUpdates-f51a6dd27548474d6152377595bf6dc2c9eac436.tar.gz NotEnoughUpdates-f51a6dd27548474d6152377595bf6dc2c9eac436.tar.bz2 NotEnoughUpdates-f51a6dd27548474d6152377595bf6dc2c9eac436.zip |
Merge branch 'master' into minion_helper_2
# Conflicts:
# src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/PetInfoOverlay.java
Diffstat (limited to 'gradle.properties')
0 files changed, 0 insertions, 0 deletions