diff options
| author | Technus <daniel112092@gmail.com> | 2017-06-15 23:01:39 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-06-15 23:01:39 +0200 |
| commit | e0c3e6a3418d9f9cb0f55692430331e6c7e0720b (patch) | |
| tree | da5d00bd3a6ba99ae493ec95ff47890382b95b67 /src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler.png | |
| parent | 58c5e2719d63426cef9be6a540848d6a0ea69c34 (diff) | |
| parent | 8d2d3d2f35dd341f25a7e719c3ca82338b69f8c8 (diff) | |
| download | GT5-Unofficial-e0c3e6a3418d9f9cb0f55692430331e6c7e0720b.tar.gz GT5-Unofficial-e0c3e6a3418d9f9cb0f55692430331e6c7e0720b.tar.bz2 GT5-Unofficial-e0c3e6a3418d9f9cb0f55692430331e6c7e0720b.zip | |
Merge branch 'experimental' into reMerge
# Conflicts:
# build.properties
# src/main/java/gregtech/api/enums/ItemList.java
# src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
# src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java
# src/main/java/gregtech/common/GT_Proxy.java
# src/main/java/gregtech/common/GT_RecipeAdder.java
# src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
# src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
# src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
# src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
# src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
# src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/90.png
# src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/96.png
Diffstat (limited to 'src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler.png')
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler.png | bin | 2387 -> 3124 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler.png Binary files differindex 871a39386e..7ab09c5f2e 100644 --- a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler.png +++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler.png |
