diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2017-09-03 17:57:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-03 17:57:34 +0200 |
| commit | 6df7f36bd91815c71881aed11dc8b37975823736 (patch) | |
| tree | 19fdb02e6c7f3435c8c39136ce73337ef5e14b7e /src/main/resources | |
| parent | 5e87d49f2954f22fd830383420cc5d27e7378160 (diff) | |
| parent | a6a74841389345b08e68d678e454dd76a46cc2a4 (diff) | |
| download | GT5-Unofficial-6df7f36bd91815c71881aed11dc8b37975823736.tar.gz GT5-Unofficial-6df7f36bd91815c71881aed11dc8b37975823736.tar.bz2 GT5-Unofficial-6df7f36bd91815c71881aed11dc8b37975823736.zip | |
Merge branch 'unstable' into CircuitChemistryUpdateFollowup
Diffstat (limited to 'src/main/resources')
19 files changed, 4 insertions, 0 deletions
diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 970e5fd07c..08dba5530f 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -490,6 +490,10 @@ achievement.gt.metaitem.01.32605=Ultimate Battery achievement.gt.metaitem.01.32605.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32609=Really Ultimate Battery achievement.gt.metaitem.01.32609.desc=Pickup this item to see the recipe in NEI +achievement.gt.metaitem.01.32736=Energy Module +achievement.gt.metaitem.01.32736.desc=Pickup this item to see the recipe in NEI +achievement.gt.metaitem.01.32737=Energy Cluster +achievement.gt.metaitem.01.32737.desc=Pickup this item to see the recipe in NEI achievement.ic2.itemArmorQuantumHelmet=Quantum Helmet achievement.ic2.itemArmorQuantumHelmet.desc=Pickup this item to see the recipe in NEI diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736.png Binary files differnew file mode 100644 index 0000000000..e58b3c1383 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/1.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/1.png Binary files differnew file mode 100644 index 0000000000..a53f18ee61 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/1.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/2.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/2.png Binary files differnew file mode 100644 index 0000000000..c0d57c7df8 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/2.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/3.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/3.png Binary files differnew file mode 100644 index 0000000000..68d9520021 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/3.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/4.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/4.png Binary files differnew file mode 100644 index 0000000000..97c4936411 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/4.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/5.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/5.png Binary files differnew file mode 100644 index 0000000000..007d7ce4ec --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/5.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/6.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/6.png Binary files differnew file mode 100644 index 0000000000..39faa3ce2e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/6.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/7.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/7.png Binary files differnew file mode 100644 index 0000000000..62327c4be8 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/7.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/8.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/8.png Binary files differnew file mode 100644 index 0000000000..e58b3c1383 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/8.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737.png Binary files differnew file mode 100644 index 0000000000..b1068d091c --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/1.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/1.png Binary files differnew file mode 100644 index 0000000000..38cbdcf448 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/1.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/2.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/2.png Binary files differnew file mode 100644 index 0000000000..e6deaf2343 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/2.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/3.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/3.png Binary files differnew file mode 100644 index 0000000000..2f25838028 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/3.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/4.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/4.png Binary files differnew file mode 100644 index 0000000000..a42c8d0544 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/4.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/5.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/5.png Binary files differnew file mode 100644 index 0000000000..d0a89ed910 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/5.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/6.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/6.png Binary files differnew file mode 100644 index 0000000000..f6fadbe522 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/6.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/7.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/7.png Binary files differnew file mode 100644 index 0000000000..799981d620 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/7.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/8.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/8.png Binary files differnew file mode 100644 index 0000000000..b1068d091c --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/8.png |
