aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2021-10-22 11:55:13 +0200
committerGitHub <noreply@github.com>2021-10-22 11:55:13 +0200
commit128ddd5029bd7500dd5a9c760a50d3bea1ab88d3 (patch)
tree246391680a7f5379f878568af8ed9ce4f3ef8abc /src/main/java/gregtech/api/enums
parentb838ad89bbcb90ef5479e5389bbb9ae895a9da5f (diff)
parent01beef5fba2baaa68ff5ce7ea6137a2791661964 (diff)
downloadGT5-Unofficial-128ddd5029bd7500dd5a9c760a50d3bea1ab88d3.tar.gz
GT5-Unofficial-128ddd5029bd7500dd5a9c760a50d3bea1ab88d3.tar.bz2
GT5-Unofficial-128ddd5029bd7500dd5a9c760a50d3bea1ab88d3.zip
Merge pull request #692 from KiloJoel/feature/for-research-multiblock
Research Completer - Added machine casing and assets
Diffstat (limited to 'src/main/java/gregtech/api/enums')
-rw-r--r--src/main/java/gregtech/api/enums/ItemList.java1
-rw-r--r--src/main/java/gregtech/api/enums/Textures.java5
2 files changed, 6 insertions, 0 deletions
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index a77a0de902..8dcf5fe129 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -843,6 +843,7 @@ public enum ItemList implements IItemContainer {
Casing_MiningBlackPlutonium,
Casing_Advanced_Rhodium_Palladium,
Casing_Advanced_Iridium,
+ Casing_Magical,
Hull_ULV,
Hull_LV,
diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java
index 49aac808d6..e4aa589955 100644
--- a/src/main/java/gregtech/api/enums/Textures.java
+++ b/src/main/java/gregtech/api/enums/Textures.java
@@ -246,6 +246,7 @@ public class Textures {
MACHINE_CASING_MINING_BLACKPLUTONIUM,
MACHINE_CASING_RHODIUM_PALLADIUM,
MACHINE_CASING_IRIDIUM,
+ MACHINE_CASING_MAGICAL,
MACHINE_CASING_FIREBOX_TITANIUM,
MACHINE_CASING_FUSION_COIL,
@@ -533,6 +534,10 @@ public class Textures {
OVERLAY_FRONT_IMPLOSION_COMPRESSOR_GLOW,
OVERLAY_FRONT_IMPLOSION_COMPRESSOR_ACTIVE,
OVERLAY_FRONT_IMPLOSION_COMPRESSOR_ACTIVE_GLOW,
+ OVERLAY_FRONT_RESEARCH_COMPLETER,
+ OVERLAY_FRONT_RESEARCH_COMPLETER_GLOW,
+ OVERLAY_FRONT_RESEARCH_COMPLETER_ACTIVE,
+ OVERLAY_FRONT_RESEARCH_COMPLETER_ACTIVE_GLOW,
OVERLAY_TOP_POTIONBREWER,
OVERLAY_TOP_POTIONBREWER_GLOW,