diff options
author | DreamMasterXXL <dream-master@gmx.net> | 2020-04-19 15:14:08 +0200 |
---|---|---|
committer | DreamMasterXXL <dream-master@gmx.net> | 2020-04-19 15:14:08 +0200 |
commit | 7f71acdb24ec8032298bbd44e781b0b756e13fbd (patch) | |
tree | 993687d138203bfb4914edae384f5e47aee5dfef /src | |
parent | ba716f655fe2e8d5b45abeb24a625dab2628e32b (diff) | |
parent | 4c7d369505d0f2f6d53e00c6035f9623ec87f4c9 (diff) | |
download | GT5-Unofficial-7f71acdb24ec8032298bbd44e781b0b756e13fbd.tar.gz GT5-Unofficial-7f71acdb24ec8032298bbd44e781b0b756e13fbd.tar.bz2 GT5-Unofficial-7f71acdb24ec8032298bbd44e781b0b756e13fbd.zip |
Merge branch 'advanced-smd-chips' into test
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/gregtech/api/enums/ItemList.java | 4 | ||||
-rw-r--r-- | src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java | 5 | ||||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/24.png | bin | 0 -> 3996 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/25.png | bin | 0 -> 3881 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/26.png | bin | 0 -> 4043 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/27.png | bin | 0 -> 4084 bytes |
6 files changed, 8 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 9e415b17dc..9b9c03f365 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -1604,6 +1604,7 @@ public enum ItemList implements IItemContainer { Circuit_Parts_Resistor, Circuit_Parts_ResistorSMD, + Circuit_Parts_ResistorASMD, Circuit_Parts_Glass_Tube, Circuit_Parts_Reinforced_Glass_Tube, Circuit_Parts_Vacuum_Tube, @@ -1611,10 +1612,13 @@ public enum ItemList implements IItemContainer { Circuit_Parts_Coil, Circuit_Parts_Diode, Circuit_Parts_DiodeSMD, + Circuit_Parts_DiodeASMD, Circuit_Parts_Transistor, Circuit_Parts_TransistorSMD, + Circuit_Parts_TransistorASMD, Circuit_Parts_Capacitor, Circuit_Parts_CapacitorSMD, + Circuit_Parts_CapacitorASMD, Circuit_Parts_GlassFiber, Circuit_Parts_PetriDish, diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java index 682f04bf57..f0cb4024d5 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java @@ -58,7 +58,10 @@ public class GT_MetaGenerated_Item_03 ItemList.Circuit_Parts_GlassFiber.set(addItem(tLastID = 21, "Glass Fiber", Materials.BorosilicateGlass.mChemicalFormula, o)); ItemList.Circuit_Parts_PetriDish.set(addItem(tLastID = 22, "Petri Dish", "For cultivating cells", o)); ItemList.Circuit_Parts_Reinforced_Glass_Tube.set(addItem(tLastID = 23, "Reinforced Glass Tube", "", o)); -// + ItemList.Circuit_Parts_ResistorASMD.set(addItem(tLastID = 24, "Advanced SMD Resistor", "Advanced Electronic Component", o)); + ItemList.Circuit_Parts_DiodeASMD.set(addItem(tLastID = 25, "Advanced SMD Diode", "Advanced Electronic Component", o)); + ItemList.Circuit_Parts_TransistorASMD.set(addItem(tLastID = 26, "Advanced SMD Transistor", "Advanced Electronic Component", o)); + ItemList.Circuit_Parts_CapacitorASMD.set(addItem(tLastID = 27, "Advanced SMD Capacitor", "Advanced Electronic Component", o)); /** * ICs diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/24.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/24.png Binary files differnew file mode 100644 index 0000000000..cf6e98f0e0 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/24.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/25.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/25.png Binary files differnew file mode 100644 index 0000000000..fadaf89d62 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/25.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/26.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/26.png Binary files differnew file mode 100644 index 0000000000..6c1b5bcb8d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/26.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/27.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/27.png Binary files differnew file mode 100644 index 0000000000..c5dedac4b5 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/27.png |