From c04169556ef9638fe4862095de631189d15049fd Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Tue, 7 Jul 2015 17:52:28 +0100 Subject: [PATCH] Properly implement Garden of Glass as a separate jar. --- .gitignore | 1 + GardenOfGlass.jar | Bin 0 -> 8868 bytes src/main/java/vazkii/botania/common/Botania.java | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 GardenOfGlass.jar diff --git a/.gitignore b/.gitignore index 549145d3f..39370753e 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ Thumbs.db ## Jars *.jar !/gradle/wrapper/gradle-wrapper.jar +!GardenOfGlass.jar diff --git a/GardenOfGlass.jar b/GardenOfGlass.jar new file mode 100644 index 0000000000000000000000000000000000000000..9dad1c9f39ef30c4da3dfcb789464d958b975f43 GIT binary patch literal 8868 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 VAcKJTONIJ$9Y3WYgZ$U8{{dKr!mR)R literal 0 HcmV?d00001 diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 052b0c990..d7b5433f7 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -50,7 +50,7 @@ public class Botania { @EventHandler public void preInit(FMLPreInitializationEvent event) { - gardenOfGlassLoaded = true; //Loader.isModLoaded("GardenOfGlass"); TODO + gardenOfGlassLoaded = Loader.isModLoaded("GardenOfGlass"); thaumcraftLoaded = Loader.isModLoaded("Thaumcraft"); bcTriggersLoaded = ModAPIManager.INSTANCE.hasAPI("BuildCraftAPI|statements");