diff options
| author | Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> | 2022-07-05 06:40:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-05 12:40:33 +0700 |
| commit | 6ae126921b95a38acef23e6025371f032f5ae2f4 (patch) | |
| tree | 811c783e7638500a966754ea6a0ee87854f5a488 /src/main/java/gregtech/api/util | |
| parent | 864f4183d5f3e600e531e0d4afecdf4b265819b3 (diff) | |
| download | GT5-Unofficial-6ae126921b95a38acef23e6025371f032f5ae2f4.tar.gz GT5-Unofficial-6ae126921b95a38acef23e6025371f032f5ae2f4.tar.bz2 GT5-Unofficial-6ae126921b95a38acef23e6025371f032f5ae2f4.zip | |
DTPF Laser (#1100)
* DTPF Laser
* exotic
* Structure forms with TT laser, recipe broken. WIP.
* Format amps in PA correctly.
* Fix incorrect colouring on text.
* New DTPF controller textures.
* Update spacetime material.
* Update DTPF texture
* Update DTPF NEI page
* Add spacetime wires
* Tons of fixes/adjustments.
* Localise achievements.
* Typos
* More fixes + move plasmas to mixer.
* Spacetime adjustment
* Spacetime blocks.
* Spacetime wires.
* Localise coils
* Adjust DTPF fuels
* Adjust DTPF fuels.
* Stuff
* Fix optimiser
* DTPF
* Depreciated
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: Yang Xizhi <60341015+GlodBlock@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech/api/util')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_Recipe.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_Utility.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java index 7cdf16cedf..accf5fe09b 100644 --- a/src/main/java/gregtech/api/util/GT_Recipe.java +++ b/src/main/java/gregtech/api/util/GT_Recipe.java @@ -790,7 +790,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { public static final GT_Recipe_Map sCentrifugeRecipes = new GT_Recipe_Map(new HashSet<>(1200), "gt.recipe.centrifuge", "Centrifuge", null, RES_PATH_GUI + "basicmachines/Centrifuge", 2, 6, 0, 0, 1, E, 1, E, true, true); public static final GT_Recipe_Map sElectrolyzerRecipes = new GT_Recipe_Map(new HashSet<>(300), "gt.recipe.electrolyzer", "Electrolyzer", null, RES_PATH_GUI + "basicmachines/Electrolyzer", 2, 6, 0, 0, 1, E, 1, E, true, true); public static final GT_Recipe_Map sBlastRecipes = new GT_Recipe_Map(new HashSet<>(800), "gt.recipe.blastfurnace", "Blast Furnace", null, RES_PATH_GUI + "basicmachines/Default", 4, 4, 1, 0, 1, "Heat Capacity: ", 1, " K", false, true); - public static final GT_Recipe_Map sPlasmaForgeRecipes = new GT_Recipe_Map_PlasmaForge(new HashSet<>(20), "gt.recipe.plasmaforge", "Dimensionally Transcendent Plasma Forge", null, RES_PATH_GUI + "basicmachines/PlasmaForge", 1, 1, 0, 0, 1, "Heat Capacity: ", 1, " K", false, true); + public static final GT_Recipe_Map sPlasmaForgeRecipes = new GT_Recipe_Map_PlasmaForge(new HashSet<>(20), "gt.recipe.plasmaforge", "DTPF", null, RES_PATH_GUI + "basicmachines/PlasmaForge", 1, 1, 0, 0, 1, "Heat Capacity: ", 1, " K", false, true); public static final GT_Recipe_Map sPrimitiveBlastRecipes = new GT_Recipe_Map(new HashSet<>(200), "gt.recipe.primitiveblastfurnace", "Primitive Blast Furnace", null, RES_PATH_GUI + "basicmachines/Default", 3, 3, 1, 0, 1, E, 1, E, false, true); public static final GT_Recipe_Map sImplosionRecipes = new GT_Recipe_Map(new HashSet<>(900), "gt.recipe.implosioncompressor", "Implosion Compressor", null, RES_PATH_GUI + "basicmachines/Default", 2, 2, 2, 0, 1, E, 1, E, true, true); public static final GT_Recipe_Map sVacuumRecipes = new GT_Recipe_Map(new HashSet<>(305), "gt.recipe.vacuumfreezer", "Vacuum Freezer", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, E, 1, E, false, true); diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index ef0b194ace..52e45f6742 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -2281,10 +2281,10 @@ public class GT_Utility { try { if (tTileEntity instanceof IMachineProgress) { if (((IMachineProgress) tTileEntity).isAllowedToWork()) { - tList.add("Disabled." + EnumChatFormatting.RED + EnumChatFormatting.RESET); + tList.add(EnumChatFormatting.RED + "Disabled." + EnumChatFormatting.RESET); } if (((IMachineProgress) tTileEntity).wasShutdown()) { - tList.add("Shut down due to power loss." + EnumChatFormatting.RED + EnumChatFormatting.RESET); + tList.add(EnumChatFormatting.RED + "Shut down due to power loss." + EnumChatFormatting.RESET); } rEUAmount += 400; int tValue = 0; |