diff options
Diffstat (limited to 'src')
101 files changed, 8285 insertions, 95 deletions
diff --git a/src/main/java/com/elisis/gtnhlanth/common/item/PhotolithographicMask.java b/src/main/java/com/elisis/gtnhlanth/common/item/PhotolithographicMask.java index a6b34660f0..239231ad3c 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/item/PhotolithographicMask.java +++ b/src/main/java/com/elisis/gtnhlanth/common/item/PhotolithographicMask.java @@ -35,4 +35,8 @@ public class PhotolithographicMask extends Item implements ICanFocus { } + public String getDescSpectrum() { + return descSpectrum; + } + } diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java index b3dea32ca7..5b6ebe0a20 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java @@ -113,6 +113,7 @@ import static gregtech.api.util.GT_RecipeConstants.AssemblyLine; import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; import static gregtech.api.util.GT_RecipeConstants.DISSOLUTION_TANK_RATIO; import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; +import static gregtech.api.util.GT_RecipeConstants.WaferEngravingRecipes; import static gregtech.common.items.GT_MetaGenerated_Item_01.registerCauldronCleaningFor; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.simpleWasherRecipes; @@ -609,7 +610,7 @@ public class RecipeLoader { .duration(60 * GT_RecipeBuilder.SECONDS) .eut(1920) .requiresCleanRoom() - .addTo(laserEngraverRecipes); + .addTo(WaferEngravingRecipes); } @@ -748,7 +749,7 @@ public class RecipeLoader { .requiresCleanRoom() .duration(120 * SECONDS) .eut(1920) - .addTo(laserEngraverRecipes); + .addTo(WaferEngravingRecipes); } else if (mask == MaskList.NOR) { @@ -760,7 +761,7 @@ public class RecipeLoader { .requiresCleanRoom() .duration(120 * SECONDS) .eut(1920) - .addTo(laserEngraverRecipes); + .addTo(WaferEngravingRecipes); } @@ -778,7 +779,7 @@ public class RecipeLoader { .requiresCleanRoom() .duration(120 * SECONDS) .eut(1920) - .addTo(laserEngraverRecipes); + .addTo(WaferEngravingRecipes); } } diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java index f252a12965..e82c5952ee 100644 --- a/src/main/java/gregtech/api/GregTech_API.java +++ b/src/main/java/gregtech/api/GregTech_API.java @@ -297,6 +297,8 @@ public class GregTech_API { sBlockCasings8, sBlockCasings9, sBlockCasings10, sBlockCasings11, sSolenoidCoilCasings; public static Block sBlockLongDistancePipes; public static Block sDroneRender; + public static Block sBlockGlass1; + public static Block sBlockTintedGlass; public static Block sLaserRender; /** * Getting assigned by the Config diff --git a/src/main/java/gregtech/api/enums/GT_Values.java b/src/main/java/gregtech/api/enums/GT_Values.java index 74c392ce67..b0e48a46bb 100644 --- a/src/main/java/gregtech/api/enums/GT_Values.java +++ b/src/main/java/gregtech/api/enums/GT_Values.java @@ -678,6 +678,13 @@ public class GT_Values { + "Gold"; public static final String AuthorVolence = "Author: " + EnumChatFormatting.AQUA + "Volence"; + public static final String AuthorNotAPenguin = "Author: " + EnumChatFormatting.WHITE + + EnumChatFormatting.BOLD + + "Not" + + EnumChatFormatting.AQUA + + EnumChatFormatting.BOLD + + "APenguin"; + // 7.5F comes from GT_Tool_Turbine_Large#getBaseDamage() given huge turbines are the most efficient now. public static double getMaxPlasmaTurbineEfficiencyFromMaterial(Materials material) { return (5F + (7.5F + material.mToolQuality)) / 10.0; diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index d1c30a0935..1f5d223a6b 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -1152,7 +1152,1 |