diff options
| author | Technus <daniel112092@gmail.com> | 2017-05-01 08:22:05 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-05-01 08:22:05 +0200 |
| commit | cb0f1d4d2c705676de231272cd731a319071c0ac (patch) | |
| tree | 8acf54c21a000f12191bd25126761bac8ea5584c /src/main/resources | |
| parent | c12e474c23ca02fb3479312850f6ae07e623d8b9 (diff) | |
| parent | 417d45d2578402d9bb6406e2622d9261a4c25cf4 (diff) | |
| download | GT5-Unofficial-cb0f1d4d2c705676de231272cd731a319071c0ac.tar.gz GT5-Unofficial-cb0f1d4d2c705676de231272cd731a319071c0ac.tar.bz2 GT5-Unofficial-cb0f1d4d2c705676de231272cd731a319071c0ac.zip | |
Merge branch 'mergeGTNH' of https://github.com/GTNewHorizons/GT5-Unofficial into mergeGTNH
Diffstat (limited to 'src/main/resources')
11 files changed, 10 insertions, 0 deletions
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrochloricacid.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrochloricacid.png Binary files differnew file mode 100644 index 0000000000..9e1fc197cb --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrochloricacid.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrochloricacid.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrochloricacid.png.mcmeta new file mode 100644 index 0000000000..0df7234a79 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrochloricacid.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.iron3chloride.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.iron3chloride.png Binary files differnew file mode 100644 index 0000000000..822f9b0dd6 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.iron3chloride.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.iron3chloride.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.iron3chloride.png.mcmeta new file mode 100644 index 0000000000..0df7234a79 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.iron3chloride.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/702.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/702.png Binary files differindex 6c64b90877..0049c6ac9d 100644 --- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/702.png +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/702.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/100.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/100.png Binary files differnew file mode 100644 index 0000000000..5930084b4c --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/100.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/101.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/101.png Binary files differnew file mode 100644 index 0000000000..c971bfa81d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/101.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/102.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/102.png Binary files differnew file mode 100644 index 0000000000..34411f6986 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/102.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/103.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/103.png Binary files differnew file mode 100644 index 0000000000..7108a9fbe6 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/103.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/104.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/104.png Binary files differnew file mode 100644 index 0000000000..9a4f886c0a --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/104.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/79.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/79.png Binary files differindex 6c64b90877..6ae0c3cb8b 100644 --- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/79.png +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/79.png |
