Merged branch master into master

This commit is contained in:
Jared 2016-07-16 23:04:09 +02:00
commit 4504f48ac9

3
.gitmodules vendored
View file

@ -1,3 +0,0 @@
[submodule "src/api/java/thaumcraft"]
path = src/api/java/thaumcraft
url = git@github.com:Azanor/thaumcraft-api.git