Merge branch 'master' of https://github.com/Anvilcraft/addonscript-java
Conflicts: src/main/java/ley/anvil/addonscript/v1/AddonscriptJSON.java
This commit is contained in:
commit
7507be1b20
Conflicts: src/main/java/ley/anvil/addonscript/v1/AddonscriptJSON.java