diff --git a/build.gradle b/build.gradle index d5b139ae..a5f0c897 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ compileJava { sourceCompatibility = targetCompatibility = '1.8' } -version = "v414.20" +version = "v414.23" group = "gregtechmod" archivesBaseName = "gregtechmod" diff --git a/src/main/java/gregtechmod/GT_Mod.java b/src/main/java/gregtechmod/GT_Mod.java index 006df87a..03ce0534 100644 --- a/src/main/java/gregtechmod/GT_Mod.java +++ b/src/main/java/gregtechmod/GT_Mod.java @@ -147,7 +147,7 @@ /** * @author Gregorius Techneticies */ -@Mod(modid = "gregtech_addon", name="GregTech-Addon", version="4.14.20", useMetadata=false, dependencies="required-after:IC2; after:Railcraft; after:ThermalExpansion; after:ThermalExpansion|Transport; after:ThermalExpansion|Energy; after:ThermalExpansion|Factory; before:RedPowerCore; before:RedPowerBase; before:RedPowerMachine; before:RedPowerCompat; before:RedPowerWiring; before:RedPowerLogic; before:RedPowerLighting; before:RedPowerWorld; before:RedPowerControl;") +@Mod(modid = "gregtech_addon", name="GregTech-Addon", version="4.14.23", useMetadata=false, dependencies="required-after:IC2; after:Railcraft; after:ThermalExpansion; after:ThermalExpansion|Transport; after:ThermalExpansion|Energy; after:ThermalExpansion|Factory; before:RedPowerCore; before:RedPowerBase; before:RedPowerMachine; before:RedPowerCompat; before:RedPowerWiring; before:RedPowerLogic; before:RedPowerLighting; before:RedPowerWorld; before:RedPowerControl;") public class GT_Mod implements IGT_Mod { @Instance public static GT_Mod instance; diff --git a/src/main/java/gregtechmod/api/enums/Materials.java b/src/main/java/gregtechmod/api/enums/Materials.java index 5fc60a0f..180d3439 100644 --- a/src/main/java/gregtechmod/api/enums/Materials.java +++ b/src/main/java/gregtechmod/api/enums/Materials.java @@ -228,6 +228,7 @@ public enum Materials { NetherQuartz ( 522, GT_ItemTextures.SET_QUARTZ , 1 |4|8 , 230, 210, 210, 0, 0, 0, 0, 0, 0, 0, false, false, 2, 1, 1, Dyes.dyeWhite ), NetherStar ( 506, GT_ItemTextures.SET_NETHERSTAR , 1 |4 , 255, 255, 255, 0, 5, 50000, 0, 0, 0, 0, false, false, 15, 1, 1, Dyes.dyeWhite ), Nikolite ( 812, GT_ItemTextures.SET_SHINY , 1 |8 , 60, 180, 200, 0, 0, 0, 5000, 0, 0, 0, false, false, 3, 1, 1, Dyes.dyeCyan ), + Electrotine ( 819, GT_ItemTextures.SET_SHINY , 1 |8 , 60, 180, 200, 0, 0, 0, 5000, 0, 0, 0, false, false, 3, 1, 1, Dyes.dyeCyan ), ObsidianFlux ( -1, GT_ItemTextures.SET_DULL , 1|2 , 80, 50, 100, 0, 0, 0, 0, 0, 0, 0, false, false, 1, 1, 1, Dyes.dyePurple ), Oilsands ( -1, GT_ItemTextures.SET_NONE , 1 |8 , 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, false, false, 1, 1, 1, Dyes._NULL ), Onyx ( -1, GT_ItemTextures.SET_NONE , 1 , 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, false, false, 3, 1, 1, Dyes._NULL ), @@ -455,6 +456,7 @@ public enum Materials { Mithril ( 331, GT_ItemTextures.SET_SHINY , 1|2 |8 |64 , 255, 255, 210, 0, 0, 0, 0, 0, 0, 0, false, false, 4, 3, 2, Dyes.dyeLightBlue , 2, Arrays.asList(new MaterialStack(Platinum, 2), new MaterialStack(Magic, 1))), BlueAlloy ( 309, GT_ItemTextures.SET_DULL , 1|2 , 100, 180, 255, 0, 0, 0, 0, 0, 0, 0, false, false, 3, 5, 1, Dyes.dyeLightBlue , 2, Arrays.asList(new MaterialStack(Silver, 1), new MaterialStack(Nikolite, 4))), RedAlloy ( 308, GT_ItemTextures.SET_DULL , 1|2 , 200, 0, 0, 0, 0, 0, 0, 0, 0, 0, false, false, 3, 5, 1, Dyes.dyeRed , 2, Arrays.asList(new MaterialStack(Metal, 1), new MaterialStack(Redstone, 4))), + ElectrotineAlloy ( 345, GT_ItemTextures.SET_DULL , 1|2 , 90, 160, 255, 0, 0, 0, 0, 0, 0, 0, false, false, 3, 5, 1, Dyes.dyeLightBlue , 2, Arrays.asList(new MaterialStack(Iron, 1), new MaterialStack(Electrotine, 8))), CobaltBrass ( 343, GT_ItemTextures.SET_METALLIC , 1|2 |64|128 , 180, 180, 160, 0, 0, 0, 0, 0, 0, 0, false, false, 3, 1, 1, Dyes.dyeOrange , 2, Arrays.asList(new MaterialStack(Brass, 7), new MaterialStack(Aluminium, 1), new MaterialStack(Cobalt, 1))), Phosphorus ( 534, GT_ItemTextures.SET_FLINT , 1 |4|8|16 , 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, false, false, 3, 1, 1, Dyes.dyeYellow , 2, Arrays.asList(new MaterialStack(Calcium, 3), new MaterialStack(Phosphate, 2))), Basalt ( 844, GT_ItemTextures.SET_ROUGH , 1 , 30, 20, 20, 0, 0, 0, 0, 0, 0, 0, false, false, 2, 1, 1, Dyes.dyeBlack , 2, Arrays.asList(new MaterialStack(Olivine, 1), new MaterialStack(Calcite, 3), new MaterialStack(Flint, 8), new MaterialStack(DarkAsh, 4))), @@ -623,6 +625,7 @@ public enum Materials { Saltpeter .setOreMultiplier( 4).setSmeltingMultiplier( 4); Apatite .setOreMultiplier( 4).setSmeltingMultiplier( 4).setByProductMultiplier(2); Nikolite .setOreMultiplier( 5).setSmeltingMultiplier( 5); + Electrotine .setOreMultiplier( 5).setSmeltingMultiplier( 5); Redstone .setOreMultiplier( 5).setSmeltingMultiplier( 5); Glowstone .setOreMultiplier( 5).setSmeltingMultiplier( 5); Lapis .setOreMultiplier( 6).setSmeltingMultiplier( 6).setByProductMultiplier(4); @@ -777,6 +780,7 @@ public enum Materials { Apatite .addOreByProduct(Phosphorus ); Zinc .addOreByProduct(Tin ); Nikolite .addOreByProduct(Diamond ); + Electrotine .addOreByProduct(Diamond ); Magnesite .addOreByProduct(Magnesium ); NetherQuartz .addOreByProduct(Netherrack ); PigIron .addOreByProduct(Iron ); diff --git a/src/main/java/gregtechmod/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtechmod/common/items/GT_MetaGenerated_Item_01.java index 579c37ef..4fbf27e1 100644 --- a/src/main/java/gregtechmod/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtechmod/common/items/GT_MetaGenerated_Item_01.java @@ -85,7 +85,7 @@ public boolean doesMaterialAllowGeneration(OrePrefixes aPrefix, Materials aMater case ingotHot: return (aMaterial.mTypes & 2) != 0 && aMaterial.mBlastFurnaceTemp > 1750; case plate: - return (aMaterial.mTypes & 6) != 0 || aMaterial == Materials.Paper || aMaterial == Materials.Redstone || aMaterial == Materials.GraniteRed || aMaterial == Materials.GraniteBlack || aMaterial == Materials.Glowstone || aMaterial == Materials.Nikolite || aMaterial == Materials.Obsidian || aMaterial == Materials.Wood; + return (aMaterial.mTypes & 6) != 0 || aMaterial == Materials.Paper || aMaterial == Materials.Redstone || aMaterial == Materials.GraniteRed || aMaterial == Materials.GraniteBlack || aMaterial == Materials.Glowstone || aMaterial == Materials.Nikolite || aMaterial == Materials.Electrotine || aMaterial == Materials.Obsidian || aMaterial == Materials.Wood; case plateDouble: return aMaterial == Materials.Paper; case plateTriple: diff --git a/src/main/java/gregtechmod/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtechmod/loaders/postload/GT_MachineRecipeLoader.java index 50a2c7d2..562bf088 100644 --- a/src/main/java/gregtechmod/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtechmod/loaders/postload/GT_MachineRecipeLoader.java @@ -23,7 +23,7 @@ public class GT_MachineRecipeLoader implements Runnable private final MaterialStack[][] mAlloySmelterList; public GT_MachineRecipeLoader() { - this.mAlloySmelterList = new MaterialStack[][] { { new MaterialStack(Materials.Tetrahedrite, 3L), new MaterialStack(Materials.Tin, 1L), new MaterialStack(Materials.Bronze, 3L) }, { new MaterialStack(Materials.Tetrahedrite, 3L), new MaterialStack(Materials.Zinc, 1L), new MaterialStack(Materials.Brass, 3L) }, { new MaterialStack(Materials.Copper, 3L), new MaterialStack(Materials.Tin, 1L), new MaterialStack(Materials.Bronze, 4L) }, { new MaterialStack(Materials.Copper, 3L), new MaterialStack(Materials.Zinc, 1L), new MaterialStack(Materials.Brass, 4L) }, { new MaterialStack(Materials.Copper, 1L), new MaterialStack(Materials.Nickel, 1L), new MaterialStack(Materials.Cupronickel, 2L) }, { new MaterialStack(Materials.Iron, 2L), new MaterialStack(Materials.Nickel, 1L), new MaterialStack(Materials.Invar, 3L) }, { new MaterialStack(Materials.Chrome, 1L), new MaterialStack(Materials.Nickel, 4L), new MaterialStack(Materials.Nichrome, 5L) }, { new MaterialStack(Materials.Tin, 9L), new MaterialStack(Materials.Antimony, 1L), new MaterialStack(Materials.SolderingAlloy, 10L) }, { new MaterialStack(Materials.Lead, 4L), new MaterialStack(Materials.Antimony, 1L), new MaterialStack(Materials.BatteryAlloy, 5L) }, { new MaterialStack(Materials.Gold, 1L), new MaterialStack(Materials.Silver, 1L), new MaterialStack(Materials.Electrum, 2L) }, { new MaterialStack(Materials.Magnesium, 1L), new MaterialStack(Materials.Aluminium, 2L), new MaterialStack(Materials.Magnalium, 3L) }, { new MaterialStack(Materials.Copper, 1L), new MaterialStack(Materials.Redstone, 4L), new MaterialStack(Materials.RedAlloy, 1L) }, { new MaterialStack(Materials.Silver, 1L), new MaterialStack(Materials.Nikolite, 4L), new MaterialStack(Materials.BlueAlloy, 1L) } }; + this.mAlloySmelterList = new MaterialStack[][] { { new MaterialStack(Materials.Tetrahedrite, 3L), new MaterialStack(Materials.Tin, 1L), new MaterialStack(Materials.Bronze, 3L) }, { new MaterialStack(Materials.Tetrahedrite, 3L), new MaterialStack(Materials.Zinc, 1L), new MaterialStack(Materials.Brass, 3L) }, { new MaterialStack(Materials.Copper, 3L), new MaterialStack(Materials.Tin, 1L), new MaterialStack(Materials.Bronze, 4L) }, { new MaterialStack(Materials.Copper, 3L), new MaterialStack(Materials.Zinc, 1L), new MaterialStack(Materials.Brass, 4L) }, { new MaterialStack(Materials.Copper, 1L), new MaterialStack(Materials.Nickel, 1L), new MaterialStack(Materials.Cupronickel, 2L) }, { new MaterialStack(Materials.Iron, 2L), new MaterialStack(Materials.Nickel, 1L), new MaterialStack(Materials.Invar, 3L) }, { new MaterialStack(Materials.Chrome, 1L), new MaterialStack(Materials.Nickel, 4L), new MaterialStack(Materials.Nichrome, 5L) }, { new MaterialStack(Materials.Tin, 9L), new MaterialStack(Materials.Antimony, 1L), new MaterialStack(Materials.SolderingAlloy, 10L) }, { new MaterialStack(Materials.Lead, 4L), new MaterialStack(Materials.Antimony, 1L), new MaterialStack(Materials.BatteryAlloy, 5L) }, { new MaterialStack(Materials.Gold, 1L), new MaterialStack(Materials.Silver, 1L), new MaterialStack(Materials.Electrum, 2L) }, { new MaterialStack(Materials.Magnesium, 1L), new MaterialStack(Materials.Aluminium, 2L), new MaterialStack(Materials.Magnalium, 3L) }, { new MaterialStack(Materials.Copper, 1L), new MaterialStack(Materials.Redstone, 4L), new MaterialStack(Materials.RedAlloy, 1L) }, { new MaterialStack(Materials.Silver, 1L), new MaterialStack(Materials.Nikolite, 4L), new MaterialStack(Materials.BlueAlloy, 1L) }, { new MaterialStack(Materials.Iron, 1L), new MaterialStack(Materials.Electrotine, 8L), new MaterialStack(Materials.ElectrotineAlloy, 1L) } }; } @Override diff --git a/src/main/resources/assets/gregtech_addon/lang/en_US.lang b/src/main/resources/assets/gregtech_addon/lang/en_US.lang index 901e2e3a..f6adef10 100644 --- a/src/main/resources/assets/gregtech_addon/lang/en_US.lang +++ b/src/main/resources/assets/gregtech_addon/lang/en_US.lang @@ -1326,6 +1326,7 @@ materials.NetherBrick=Nether Brick materials.NetherQuartz=Nether Quartz materials.NetherStar=Nether Star materials.Nikolite=Nikolite +materials.Electrotine=Electrotine materials.ObsidianFlux=Fluxed Obsidian materials.Oilsands=Oilsands materials.Onyx=Onyx @@ -1541,6 +1542,7 @@ materials.AstralSilver=Astral Silver materials.Midasium=Midasium materials.Mithril=Mithril materials.BlueAlloy=Blue Alloy +materials.ElectrotineAlloy=Electrotine Alloy materials.RedAlloy=Red Alloy materials.CobaltBrass=Cobalt Brass materials.Phosphorus=Phosphorus diff --git a/src/main/resources/assets/gregtech_addon/lang/ru_RU.lang b/src/main/resources/assets/gregtech_addon/lang/ru_RU.lang index 66a1ae81..5b6de083 100644 --- a/src/main/resources/assets/gregtech_addon/lang/ru_RU.lang +++ b/src/main/resources/assets/gregtech_addon/lang/ru_RU.lang @@ -1717,6 +1717,7 @@ materials.NetherBrick=Кирпичи Нижнего мира materials.NetherQuartz=Кварц Нижнего мира materials.NetherStar=Звезда Нижнего мира materials.Nikolite=Николит +materials.Electrotine=Электротин materials.ObsidianFlux=Обсидиан прокрытый флюсом materials.Oilsands=Битуминозные пески materials.Onyx=Оникс @@ -1932,6 +1933,7 @@ materials.AstralSilver=Астральное серебро materials.Midasium=Мидасиум materials.Mithril=Митрил materials.BlueAlloy=Синий сплав +materials.ElectrotineAlloy=Электротиновый сплав materials.RedAlloy=Красный сплав materials.CobaltBrass=Кобальт латунь materials.Phosphorus=Фосфор diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index aeddf897..850a8107 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "name": "GregTech-Addon", "description": "This Addon adds the awesome Technology of GregTech-Intergalactical to your World! Fusionreactors, Lightningrods and many other Technologies and convenient Recipes are added by this Addon, if you let them enabled in the allmighty Config, of course", "mcversion": "1.7.10", - "version": "4.14.20", + "version": "4.14.23", "logoFile": "/assets/gregtech_addon/textures/LogoGTI_Long.png", "url": "https://github.com/Nukepowered/GregTech4", "updateUrl": "",