From 83d0bfa37c98cec134d3c3651e53eb4ffdbbe497 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Tue, 19 Jul 2016 23:56:36 +1000 Subject: % Bumped Versions and moved mcmod.info - Disabled the Skookum Choocher for now. :( $ Gave some thins placeholder textures. --- build.gradle | 2 +- src/Java/miscutil/core/lib/CORE.java | 2 +- src/Java/miscutil/core/mcmod.info | 74 --------------------- .../miscutil/core/xmod/gregtech/HANDLER_GT.java | 3 +- src/Java/miscutil/mcmod.info | 74 +++++++++++++++++++++ .../miscutils/textures/blocks/clear_flow.png | Bin 0 -> 3328 bytes .../miscutils/textures/blocks/clear_still.png | Bin 0 -> 3328 bytes .../assets/miscutils/textures/blocks/mash_flow.png | Bin 0 -> 3328 bytes .../miscutils/textures/blocks/mash_still.png | Bin 0 -> 3328 bytes .../miscutils/textures/blocks/rum_mature_flow.png | Bin 0 -> 3328 bytes .../miscutils/textures/blocks/rum_mature_still.png | Bin 0 -> 3328 bytes .../textures/blocks/rum_semi_mature_flow.png | Bin 0 -> 3328 bytes .../textures/blocks/rum_semi_mature_still.png | Bin 0 -> 3328 bytes .../miscutils/textures/items/drinkAgedWhisky.png | Bin 0 -> 645 bytes .../assets/miscutils/textures/items/drinkMash.png | Bin 0 -> 645 bytes .../miscutils/textures/items/drinkWhisky.png | Bin 0 -> 645 bytes 16 files changed, 77 insertions(+), 78 deletions(-) delete mode 100644 src/Java/miscutil/core/mcmod.info create mode 100644 src/Java/miscutil/mcmod.info create mode 100644 src/resources/assets/miscutils/textures/blocks/clear_flow.png create mode 100644 src/resources/assets/miscutils/textures/blocks/clear_still.png create mode 100644 src/resources/assets/miscutils/textures/blocks/mash_flow.png create mode 100644 src/resources/assets/miscutils/textures/blocks/mash_still.png create mode 100644 src/resources/assets/miscutils/textures/blocks/rum_mature_flow.png create mode 100644 src/resources/assets/miscutils/textures/blocks/rum_mature_still.png create mode 100644 src/resources/assets/miscutils/textures/blocks/rum_semi_mature_flow.png create mode 100644 src/resources/assets/miscutils/textures/blocks/rum_semi_mature_still.png create mode 100644 src/resources/assets/miscutils/textures/items/drinkAgedWhisky.png create mode 100644 src/resources/assets/miscutils/textures/items/drinkMash.png create mode 100644 src/resources/assets/miscutils/textures/items/drinkWhisky.png diff --git a/build.gradle b/build.gradle index 5075ddf498..4f98e2e0ab 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ sourceCompatibility = 1.7 targetCompatibility = 1.7 archivesBaseName = "MiscUtils" -version = "1.3.5-TestForGreg" +version = "1.4.0" minecraft.version = "1.7.10-10.13.4.1448-1.7.10" task sourceJar(type: Jar) { diff --git a/src/Java/miscutil/core/lib/CORE.java b/src/Java/miscutil/core/lib/CORE.java index 1a3a2d9b56..f5509fec34 100644 --- a/src/Java/miscutil/core/lib/CORE.java +++ b/src/Java/miscutil/core/lib/CORE.java @@ -15,7 +15,7 @@ public class CORE { public static final String name = "Misc. Utils"; public static final String MODID = "miscutils"; - public static final String VERSION = "1.3.4"; + public static final String VERSION = "1.4.0"; public static final boolean DEBUG = false; public static final boolean LOAD_ALL_CONTENT = false; public static final int GREG_FIRST_ID = 760; diff --git a/src/Java/miscutil/core/mcmod.info b/src/Java/miscutil/core/mcmod.info deleted file mode 100644 index eb193c183b..0000000000 --- a/src/Java/miscutil/core/mcmod.info +++ /dev/null @@ -1,74 +0,0 @@ -/** - * @version 1.3.4 - * @author Alkalus - * In-game info for project: MiscUtils. - */ -[ { "modid" : "miscutil" - , "name" : "Misc Utils." - , "description" : " - if (Loader.isModLoaded("gregtech") == true ){ - Gregtech = true; - } - if (Loader.isModLoaded("EnderIO") == true){ - EnderIO = true; - } - if (Loader.isModLoaded("BigReactors") == true){ - Big_Reactors = true; - } - if (Loader.isModLoaded("IC2") == true){ - IndustrialCraft2 = true; - } - if (Loader.isModLoaded("simplyjetpacks") == true){ - Simply_Jetpacks = true; - } - if (Loader.isModLoaded("rftools") == true){ - RFTools = true; - } - if (Loader.isModLoaded("Thaumcraft") == true){ - Thaumcraft = true; - } - if (Loader.isModLoaded("ExtraUtilities") == true){ - Extra_Utils = true; - } - if (Loader.isModLoaded("PneumaticCraft") == true){ - PneumaticCraft = true; - } - if (Loader.isModLoaded("MorePlanet") == true){ - MorePlanets = true; - } - if (Loader.isModLoaded("ForbiddenMagic") == true){ - ForbiddenMagic = true; - } - if (Loader.isModLoaded("CompactWindmills") == true){ - CompactWindmills = true; - } - if (Loader.isModLoaded("Railcraft") == true){ - Railcraft = true; - } - if (Loader.isModLoaded("Growthcraft") == true){ - Growthcraft = true; - } - if (Loader.isModLoaded("CoFHCore") == true){ - CoFHCore = true; - } - if (Loader.isModLoaded("Forestry") == true){ - Forestry = true; - } - if (Loader.isModLoaded("MagicBees") == true){ - MagicBees = true; - } - if (Loader.isModLoaded("psychedelicraft") == true){ - Psychedelicraft = true; - } - " - , "version" : "1.3.4" - , "mcversion" : "1.7.10" - , "url" : "" - , "updateUrl" : "" - , "authorList" : ["Alkalus"] - , "credits" : "" - , "logoFile" : "" - , "screenshots" : [] - , "dependencies" : ["Forge10.13.0.1448"] - } -] diff --git a/src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java b/src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java index be30c8e9b7..9ff608eca5 100644 --- a/src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java +++ b/src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java @@ -3,7 +3,6 @@ package miscutil.core.xmod.gregtech; import gregtech.api.util.GT_Config; import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import miscutil.core.xmod.gregtech.common.blocks.fluid.GregtechFluidHandler; -import miscutil.core.xmod.gregtech.common.items.MetaGeneratedGregtechTools; public class HANDLER_GT { @@ -13,7 +12,7 @@ public class HANDLER_GT { if (mMaterialProperties != null){ GT_Materials.init(mMaterialProperties); GregtechFluidHandler.run(); - new MetaGeneratedGregtechTools(); + //new MetaGeneratedGregtechTools(); //new Processing_Ingot1(); //new Processing_Plate1(); //new Processing_Block(); diff --git a/src/Java/miscutil/mcmod.info b/src/Java/miscutil/mcmod.info new file mode 100644 index 0000000000..20b634c24e --- /dev/null +++ b/src/Java/miscutil/mcmod.info @@ -0,0 +1,74 @@ +/** + * @version 1.4.0 + * @author Alkalus + * In-game info for project: MiscUtils. + */ +[ { "modid" : "miscutil" + , "name" : "Misc Utils." + , "description" : " + if (Loader.isModLoaded("gregtech") == true ){ + Gregtech = true; + } + if (Loader.isModLoaded("EnderIO") == true){ + EnderIO = true; + } + if (Loader.isModLoaded("BigReactors") == true){ + Big_Reactors = true; + } + if (Loader.isModLoaded("IC2") == true){ + IndustrialCraft2 = true; + } + if (Loader.isModLoaded("simplyjetpacks") == true){ + Simply_Jetpacks = true; + } + if (Loader.isModLoaded("rftools") == true){ + RFTools = true; + } + if (Loader.isModLoaded("Thaumcraft") == true){ + Thaumcraft = true; + } + if (Loader.isModLoaded("ExtraUtilities") == true){ + Extra_Utils = true; + } + if (Loader.isModLoaded("PneumaticCraft") == true){ + PneumaticCraft = true; + } + if (Loader.isModLoaded("MorePlanet") == true){ + MorePlanets = true; + } + if (Loader.isModLoaded("ForbiddenMagic") == true){ + ForbiddenMagic = true; + } + if (Loader.isModLoaded("CompactWindmills") == true){ + CompactWindmills = true; + } + if (Loader.isModLoaded("Railcraft") == true){ + Railcraft = true; + } + if (Loader.isModLoaded("Growthcraft") == true){ + Growthcraft = true; + } + if (Loader.isModLoaded("CoFHCore") == true){ + CoFHCore = true; + } + if (Loader.isModLoaded("Forestry") == true){ + Forestry = true; + } + if (Loader.isModLoaded("MagicBees") == true){ + MagicBees = true; + } + if (Loader.isModLoaded("psychedelicraft") == true){ + Psychedelicraft = true; + } + " + , "version" : "1.3.4" + , "mcversion" : "1.7.10" + , "url" : "" + , "updateUrl" : "" + , "authorList" : ["Alkalus"] + , "credits" : "" + , "logoFile" : "" + , "screenshots" : [] + , "dependencies" : ["Forge10.13.0.1448"] + } +] diff --git a/src/resources/assets/miscutils/textures/blocks/clear_flow.png b/src/resources/assets/miscutils/textures/blocks/clear_flow.png new file mode 100644 index 0000000000..f90f75723e Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/clear_flow.png differ diff --git a/src/resources/assets/miscutils/textures/blocks/clear_still.png b/src/resources/assets/miscutils/textures/blocks/clear_still.png new file mode 100644 index 0000000000..f90f75723e Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/clear_still.png differ diff --git a/src/resources/assets/miscutils/textures/blocks/mash_flow.png b/src/resources/assets/miscutils/textures/blocks/mash_flow.png new file mode 100644 index 0000000000..f90f75723e Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/mash_flow.png differ diff --git a/src/resources/assets/miscutils/textures/blocks/mash_still.png b/src/resources/assets/miscutils/textures/blocks/mash_still.png new file mode 100644 index 0000000000..f90f75723e Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/mash_still.png differ diff --git a/src/resources/assets/miscutils/textures/blocks/rum_mature_flow.png b/src/resources/assets/miscutils/textures/blocks/rum_mature_flow.png new file mode 100644 index 0000000000..f90f75723e Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/rum_mature_flow.png differ diff --git a/src/resources/assets/miscutils/textures/blocks/rum_mature_still.png b/src/resources/assets/miscutils/textures/blocks/rum_mature_still.png new file mode 100644 index 0000000000..f90f75723e Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/rum_mature_still.png differ diff --git a/src/resources/assets/miscutils/textures/blocks/rum_semi_mature_flow.png b/src/resources/assets/miscutils/textures/blocks/rum_semi_mature_flow.png new file mode 100644 index 0000000000..f90f75723e Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/rum_semi_mature_flow.png differ diff --git a/src/resources/assets/miscutils/textures/blocks/rum_semi_mature_still.png b/src/resources/assets/miscutils/textures/blocks/rum_semi_mature_still.png new file mode 100644 index 0000000000..f90f75723e Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/rum_semi_mature_still.png differ diff --git a/src/resources/assets/miscutils/textures/items/drinkAgedWhisky.png b/src/resources/assets/miscutils/textures/items/drinkAgedWhisky.png new file mode 100644 index 0000000000..3031e9e5a7 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/drinkAgedWhisky.png differ diff --git a/src/resources/assets/miscutils/textures/items/drinkMash.png b/src/resources/assets/miscutils/textures/items/drinkMash.png new file mode 100644 index 0000000000..3031e9e5a7 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/drinkMash.png differ diff --git a/src/resources/assets/miscutils/textures/items/drinkWhisky.png b/src/resources/assets/miscutils/textures/items/drinkWhisky.png new file mode 100644 index 0000000000..3031e9e5a7 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/drinkWhisky.png differ -- cgit