From 733d77481757b6b1619408ea6f4766f770b45419 Mon Sep 17 00:00:00 2001 From: SLiMylya Date: Sat, 8 Jul 2017 14:07:31 +0300 Subject: add icon battery --- .../gregtech/textures/items/gt.metaitem.01/736.png | Bin 0 -> 330 bytes .../gregtech/textures/items/gt.metaitem.01/736/1.png | Bin 0 -> 328 bytes .../gregtech/textures/items/gt.metaitem.01/736/2.png | Bin 0 -> 322 bytes .../gregtech/textures/items/gt.metaitem.01/736/3.png | Bin 0 -> 323 bytes .../gregtech/textures/items/gt.metaitem.01/736/4.png | Bin 0 -> 319 bytes .../gregtech/textures/items/gt.metaitem.01/736/5.png | Bin 0 -> 322 bytes .../gregtech/textures/items/gt.metaitem.01/736/6.png | Bin 0 -> 322 bytes .../gregtech/textures/items/gt.metaitem.01/736/7.png | Bin 0 -> 330 bytes .../gregtech/textures/items/gt.metaitem.01/736/8.png | Bin 0 -> 330 bytes .../gregtech/textures/items/gt.metaitem.01/737.png | Bin 0 -> 2312 bytes .../gregtech/textures/items/gt.metaitem.01/737/1.png | Bin 0 -> 2361 bytes .../gregtech/textures/items/gt.metaitem.01/737/2.png | Bin 0 -> 2374 bytes .../gregtech/textures/items/gt.metaitem.01/737/3.png | Bin 0 -> 2359 bytes .../gregtech/textures/items/gt.metaitem.01/737/4.png | Bin 0 -> 2360 bytes .../gregtech/textures/items/gt.metaitem.01/737/5.png | Bin 0 -> 2350 bytes .../gregtech/textures/items/gt.metaitem.01/737/6.png | Bin 0 -> 2378 bytes .../gregtech/textures/items/gt.metaitem.01/737/7.png | Bin 0 -> 2305 bytes .../gregtech/textures/items/gt.metaitem.01/737/8.png | Bin 0 -> 2312 bytes 18 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/1.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/2.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/3.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/4.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/5.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/6.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/7.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/8.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/1.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/2.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/3.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/4.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/5.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/6.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/7.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/8.png (limited to 'src/main/resources/assets/gregtech') 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 new file mode 100644 index 0000000000..e58b3c1383 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736.png differ 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 new file mode 100644 index 0000000000..a53f18ee61 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/1.png differ 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 new file mode 100644 index 0000000000..c0d57c7df8 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/2.png differ 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 new file mode 100644 index 0000000000..68d9520021 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/3.png differ 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 new file mode 100644 index 0000000000..97c4936411 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/4.png differ 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 new file mode 100644 index 0000000000..007d7ce4ec Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/5.png differ 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 new file mode 100644 index 0000000000..39faa3ce2e Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/6.png differ 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 new file mode 100644 index 0000000000..62327c4be8 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/7.png differ 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 new file mode 100644 index 0000000000..e58b3c1383 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/736/8.png differ 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 new file mode 100644 index 0000000000..4644bf59c8 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737.png differ 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 new file mode 100644 index 0000000000..57b21c4991 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/1.png differ 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 new file mode 100644 index 0000000000..e215a3750d Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/2.png differ 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 new file mode 100644 index 0000000000..a7490e93c8 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/3.png differ 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 new file mode 100644 index 0000000000..165b6a3133 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/4.png differ 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 new file mode 100644 index 0000000000..7d393914d6 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/5.png differ 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 new file mode 100644 index 0000000000..2757c27c4a Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/6.png differ 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 new file mode 100644 index 0000000000..94b7336ed4 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/7.png differ 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 new file mode 100644 index 0000000000..4644bf59c8 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/8.png differ -- cgit From 147101ff6cfb6bc2a0d8a46bad8aa77c943b7429 Mon Sep 17 00:00:00 2001 From: SLiMylya Date: Sat, 8 Jul 2017 14:12:20 +0300 Subject: add achievements --- src/main/resources/assets/gregtech/lang/en_US.lang | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 970e5fd07c..7f8489d589 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -408,8 +408,12 @@ achievement.finalpreparations=Final Preparations achievement.finalpreparations.desc=Cool down a Hot Naquadria Ingot achievement.denseaspossible=As Dense As Possible achievement.denseaspossible.desc=Produce Neutronium +achievement.zpmage=Welcome to ZPM Energy Age +achievement.zpmage.desc=Craft a Energy Module achievement.whatnow=What now? achievement.whatnow.desc=Craft a Ultimate Battery +achievement.whattheend=The End? +achievement.whattheend.desc=Craft a Maximum Battery achievement.gt.metaitem.01.32606=Electric Motor LuV tier achievement.gt.metaitem.01.32606.desc=Pickup this item to see the recipe in NEI @@ -490,6 +494,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=Maximum Battery +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 -- cgit From 612cece6299ed698146d041d1277b52fa6e65df1 Mon Sep 17 00:00:00 2001 From: SLiMylya Date: Sun, 9 Jul 2017 19:36:23 +0300 Subject: update change --- src/main/resources/assets/gregtech/lang/en_US.lang | 4 ++-- .../gregtech/textures/items/gt.metaitem.01/737.png | Bin 2312 -> 319 bytes .../gregtech/textures/items/gt.metaitem.01/737/1.png | Bin 2361 -> 325 bytes .../gregtech/textures/items/gt.metaitem.01/737/2.png | Bin 2374 -> 317 bytes .../gregtech/textures/items/gt.metaitem.01/737/3.png | Bin 2359 -> 313 bytes .../gregtech/textures/items/gt.metaitem.01/737/4.png | Bin 2360 -> 310 bytes .../gregtech/textures/items/gt.metaitem.01/737/5.png | Bin 2350 -> 313 bytes .../gregtech/textures/items/gt.metaitem.01/737/6.png | Bin 2378 -> 315 bytes .../gregtech/textures/items/gt.metaitem.01/737/7.png | Bin 2305 -> 321 bytes .../gregtech/textures/items/gt.metaitem.01/737/8.png | Bin 2312 -> 319 bytes 10 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 7f8489d589..b5f598fe2e 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -412,8 +412,8 @@ achievement.zpmage=Welcome to ZPM Energy Age achievement.zpmage.desc=Craft a Energy Module achievement.whatnow=What now? achievement.whatnow.desc=Craft a Ultimate Battery -achievement.whattheend=The End? -achievement.whattheend.desc=Craft a Maximum Battery +achievement.uvage=Welcome to UV Energy Age +achievement.uvage.desc=Energy Cluster achievement.gt.metaitem.01.32606=Electric Motor LuV tier achievement.gt.metaitem.01.32606.desc=Pickup this item to see the recipe in NEI 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 index 4644bf59c8..b1068d091c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737.png differ 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 index 57b21c4991..38cbdcf448 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/1.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/1.png differ 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 index e215a3750d..e6deaf2343 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/2.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/2.png differ 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 index a7490e93c8..2f25838028 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/3.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/3.png differ 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 index 165b6a3133..a42c8d0544 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/4.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/4.png differ 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 index 7d393914d6..d0a89ed910 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/5.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/5.png differ 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 index 2757c27c4a..f6fadbe522 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/6.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/6.png differ 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 index 94b7336ed4..799981d620 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/7.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/7.png differ 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 index 4644bf59c8..b1068d091c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/8.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/737/8.png differ -- cgit From 820b335d831f60e1936c462d0cb8e7dba3c13fae Mon Sep 17 00:00:00 2001 From: SLiMylya Date: Mon, 17 Jul 2017 12:56:37 +0300 Subject: add config EnableZPMandUVBatteries default false --- src/main/resources/assets/gregtech/lang/en_US.lang | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index b5f598fe2e..08dba5530f 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -408,12 +408,8 @@ achievement.finalpreparations=Final Preparations achievement.finalpreparations.desc=Cool down a Hot Naquadria Ingot achievement.denseaspossible=As Dense As Possible achievement.denseaspossible.desc=Produce Neutronium -achievement.zpmage=Welcome to ZPM Energy Age -achievement.zpmage.desc=Craft a Energy Module achievement.whatnow=What now? achievement.whatnow.desc=Craft a Ultimate Battery -achievement.uvage=Welcome to UV Energy Age -achievement.uvage.desc=Energy Cluster achievement.gt.metaitem.01.32606=Electric Motor LuV tier achievement.gt.metaitem.01.32606.desc=Pickup this item to see the recipe in NEI @@ -496,7 +492,7 @@ 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=Maximum Battery +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 -- cgit