diff options
| author | msg-programs <msgdoesstuff@gmail.com> | 2023-05-02 19:15:33 +0200 |
|---|---|---|
| committer | msg-programs <msgdoesstuff@gmail.com> | 2023-05-02 19:15:33 +0200 |
| commit | 8d0b1a040d97f66cb295c7b1022729498d22f6b8 (patch) | |
| tree | 6f68f297666e562ec391b1559b6f6d0424030159 /src/main/resources/skyblocker.mixins.json | |
| parent | 2938e28e06e33c29e79197b4f473760e3f9e32b7 (diff) | |
| parent | 872196f52ca49b81fa84d7a9665522c0f36ff03f (diff) | |
| download | Skyblocker-8d0b1a040d97f66cb295c7b1022729498d22f6b8.tar.gz Skyblocker-8d0b1a040d97f66cb295c7b1022729498d22f6b8.tar.bz2 Skyblocker-8d0b1a040d97f66cb295c7b1022729498d22f6b8.zip | |
Merge branch 'master' of https://github.com/SkyblockerMod/Skyblocker into tooltopfix
# Conflicts:
# src/main/resources/assets/skyblocker/lang/de_de.json
Conflicts resolved. d5b0357... had changed the indent from 2 to 4 spaces.
Diffstat (limited to 'src/main/resources/skyblocker.mixins.json')
0 files changed, 0 insertions, 0 deletions