Merge upstream

This commit is contained in:
Vincent Lee committed 2016-01-21 22:04:45 -06:00
commit 77cd24b58a
10 files changed
+228 -78

No files matched your search

@@ -1,4 +1,4 @@
@API(owner = "Botania", apiVersion = "75", provides = "BotaniaAPI")
@API(owner = "Botania", apiVersion = "76", provides = "BotaniaAPI")
package vazkii.botania.api;
import net.minecraftforge.fml.common.API;