diff options
| author | Tec <daniel112092@gmail.com> | 2022-01-30 19:44:59 +0100 |
|---|---|---|
| committer | Tec <daniel112092@gmail.com> | 2022-01-30 19:44:59 +0100 |
| commit | f45f36a47d911383b2604e14dcc4638076b0329f (patch) | |
| tree | f861010611925a17c1dc646e609f244e6f9916ad | |
| parent | 42dc775365a620194ad07d6ab06a8f767e0d9cd3 (diff) | |
| download | GT5-Unofficial-f45f36a47d911383b2604e14dcc4638076b0329f.tar.gz GT5-Unofficial-f45f36a47d911383b2604e14dcc4638076b0329f.tar.bz2 GT5-Unofficial-f45f36a47d911383b2604e14dcc4638076b0329f.zip | |
Merge branch 'GTNH/Upstream'
# Conflicts:
# build.gradle.kts
109 files changed, 2012 insertions, 5561 deletions
diff --git a/.gitignore b/.gitignore index 3d66b81105..40fb5e4a7d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,44 +1,29 @@ -.gradle/ -run/ -.settings/ +.gradle +.settings +/.idea/ +/run/ +/build/ +/eclipse/ .classpath .project -bin/ -out/ -libs/gregtech* -CREDITS-fml.txt -LICENSE-fml.txt -MinecraftForge-Credits.txt -MinecraftForge-License.txt -CoreMod.iml -CoreMod.ipr -CoreMod.iws -Idea.bat -SetupDevWorkspaces.bat +/bin/ +/config/ +/crash-reports/ +/logs/ +options.txt +/saves/ +usernamecache.json +banned-ips.json +banned-players.json +eula.txt +ops.json +server.properties +servers.dat |