Skip to content

Commit

Permalink
Merge branch 'master' into Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dream-Master
Dream-Master authored Sep 10, 2024
2 parents 56d889a + 2d57926 commit 19f695e
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion dependencies.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ dependencies {

api('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')

compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.46.05:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.56:dev') {transitive = false}
}
46 changes: 23 additions & 23 deletions src/main/java/com/kentington/thaumichorizons/common/ThaumicHorizons.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@
import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GTOreDictUnificator;
import thaumcraft.api.ThaumcraftApi;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
Expand Down Expand Up @@ -2070,17 +2070,17 @@ public void postInit(FMLPostInitializationEvent event) {
.add(Aspect.AURA, 32).add(Aspect.MIND, 16).add(Aspect.ELDRITCH, 64),
new ItemStack(itemPlanarConduit),
new ItemStack[] { new ItemStack(ConfigItems.itemShard, 1, 6),
GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Glass, 1L),
GT_OreDictUnificator.get(OrePrefixes.lens, Materials.InfusedOrder, 1L),
GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Glass, 1L),
GTOreDictUnificator.get(OrePrefixes.lens, Materials.InfusedOrder, 1L),
new ItemStack(ConfigItems.itemShard, 1, 6),
GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Glass, 1L),
GT_OreDictUnificator.get(OrePrefixes.lens, Materials.InfusedOrder, 1L),
GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Glass, 1L),
GTOreDictUnificator.get(OrePrefixes.lens, Materials.InfusedOrder, 1L),
new ItemStack(ConfigItems.itemShard, 1, 6),
GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Glass, 1L),
GT_OreDictUnificator.get(OrePrefixes.lens, Materials.InfusedOrder, 1L),
GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Glass, 1L),
GTOreDictUnificator.get(OrePrefixes.lens, Materials.InfusedOrder, 1L),
new ItemStack(ConfigItems.itemShard, 1, 6),
GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Glass, 1L),
GT_OreDictUnificator.get(OrePrefixes.lens, Materials.InfusedOrder, 1L) });
GTOreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Glass, 1L),
GTOreDictUnificator.get(OrePrefixes.lens, Materials.InfusedOrder, 1L) });
recipeKeystone1 = ThaumcraftApi.addInfusionCraftingRecipe(
"planarKeystone",
new ItemStack(itemKeystone),
Expand All @@ -2090,11 +2090,11 @@ public void postInit(FMLPostInitializationEvent event) {
new ItemStack(Items.ender_eye),
new ItemStack[] { new ItemStack(ConfigItems.itemShard, 1, 6),
new ItemStack(ConfigItems.itemResource, 1, 3),
GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Glass, 1L),
GTOreDictUnificator.get(OrePrefixes.lens, Materials.Glass, 1L),
new ItemStack(ConfigItems.itemResource, 1, 3),
new ItemStack(ConfigItems.itemShard, 1, 6),
new ItemStack(ConfigItems.itemResource, 1, 3),
GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Glass, 1L),
GTOreDictUnificator.get(OrePrefixes.lens, Materials.Glass, 1L),
new ItemStack(ConfigItems.itemResource, 1, 3) });
recipeSlot = ThaumcraftApi.addInfusionCraftingRecipe(
"planarKeystone",
Expand All @@ -2103,18 +2103,18 @@ public void postInit(FMLPostInitializationEvent event) {
(new AspectList()).add(Aspect.VOID, 48).add(Aspect.TRAVEL, 64).add(Aspect.AIR, 64)
.add(Aspect.MECHANISM, 32).add(Aspect.ELDRITCH, 64).add(Aspect.MAGIC, 16),
new ItemStack(itemPlanarConduit),
new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Void, 1L),
GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1L),
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Enderium, 1L),
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Void, 1L),
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.InfusedGold, 1L),
GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1L),
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Void, 1L),
GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1L),
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.InfusedGold, 1L),
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Void, 1L),
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Enderium, 1L),
GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1L) });
new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Void, 1L),
GTOreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1L),
GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Enderium, 1L),
GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Void, 1L),
GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.InfusedGold, 1L),
GTOreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1L),
GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Void, 1L),
GTOreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1L),
GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.InfusedGold, 1L),
GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Void, 1L),
GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Enderium, 1L),
GTOreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1L) });
} else {
recipeKeystone = ThaumcraftApi.addInfusionCraftingRecipe(
"pocketPlane",
Expand Down

0 comments on commit 19f695e

Please sign in to comment.