Merge upstream

This commit is contained in:
Vincent Lee committed 2015-11-26 02:27:25 -06:00
commit a40a443607
92 files changed
+837 -47

No files matched your search

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