diff --git a/README.md b/README.md index 2474e71a5..41f8036c4 100644 --- a/README.md +++ b/README.md @@ -186,3 +186,4 @@ Thanks to * Lex et al for MinecraftForge * AlgorithmX2 for AppliedEnergistics2 * all [contributors](https://github.com/GTNewHorizons/Applied-Energistics-2-Unofficial/graphs/contributors) +* Credit to [AE2 1.18](https://github.com/AppliedEnergistics/Applied-Energistics-2) for texture contributions. \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CertusQuartzCrystal.png b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CertusQuartzCrystal.png index 4a5fff832..80ee908cb 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CertusQuartzCrystal.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CertusQuartzCrystal.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CertusQuartzCrystalCharged.png b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CertusQuartzCrystalCharged.png index e99f4f29a..eff6cfb7c 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CertusQuartzCrystalCharged.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CertusQuartzCrystalCharged.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CertusQuartzCrystalCharged.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CertusQuartzCrystalCharged.png.mcmeta new file mode 100644 index 000000000..dd8674956 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CertusQuartzCrystalCharged.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 2}} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CertusQuartzDust.png b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CertusQuartzDust.png index dfb94d574..ab1bc98e2 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CertusQuartzDust.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.CertusQuartzDust.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.EnderDust.png b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.EnderDust.png index ba67c3c29..b2adeda58 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.EnderDust.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.EnderDust.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.FluixCrystal.png b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.FluixCrystal.png index a40c35f6e..dce69de65 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.FluixCrystal.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.FluixCrystal.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.FluixDust.png b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.FluixDust.png index 4f134f47e..72ef21771 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.FluixDust.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.FluixDust.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.FluixPearl.png b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.FluixPearl.png index d7a210355..512629cc1 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.FluixPearl.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.FluixPearl.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.NetherQuartzDust.png b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.NetherQuartzDust.png index 500fa37ba..0bbe96384 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.NetherQuartzDust.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.NetherQuartzDust.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.QESingularity.png b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.QESingularity.png index 1d4f3df06..5a7efabba 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.QESingularity.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.QESingularity.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.QESingularity.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.QESingularity.png.mcmeta new file mode 100644 index 000000000..ebf210387 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.QESingularity.png.mcmeta @@ -0,0 +1,43 @@ +{ + "animation": { + "interpolate": true, + "frames": [ + { + "index": 0, + "time": 4 + }, + { + "index": 1, + "time": 4 + }, + { + "index": 2, + "time": 4 + }, + { + "index": 3, + "time": 4 + }, + { + "index": 4, + "time": 20 + }, + { + "index": 5, + "time": 4 + }, + { + "index": 6, + "time": 4 + }, + { + "index": 7, + "time": 4 + }, + { + "index": 8, + "time": 4 + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Silicon.png b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Silicon.png index 9c5977f21..110edb2e1 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Silicon.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Silicon.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Singularity.png b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Singularity.png index 634b1d780..41df135fe 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Singularity.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Singularity.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Singularity.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Singularity.png.mcmeta new file mode 100644 index 000000000..ee630fbaa --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Singularity.png.mcmeta @@ -0,0 +1,45 @@ +{ + "animation": { + "interpolate": true, + "frames": [ + { + "index": 0, + "time": 2 + }, + { + "index": 1, + "time": 2 + }, + { + "index": 2, + "time": 2 + }, + { + "index": 3, + "time": 2 + } + , + { + "index": 4, + "time": 2 + }, + { + "index": 5, + "time": 2 + }, + { + "index": 6, + "time": 2 + }, + { + "index": 7, + "time": 2 + } + , + { + "index": 8, + "time": 2 + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.SkyDust.png b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.SkyDust.png index b01bbaad4..ff06052af 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.SkyDust.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.SkyDust.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Wireless.png b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Wireless.png index 3ff39eed3..6c102030b 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Wireless.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.Wireless.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.WoodenGear.png b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.WoodenGear.png index 87a5f65e1..36f429164 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.WoodenGear.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ItemMaterial.WoodenGear.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolBiometricCard.png b/src/main/resources/assets/appliedenergistics2/textures/items/ToolBiometricCard.png index da67b5e87..e07c8c693 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ToolBiometricCard.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ToolBiometricCard.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzAxe.png b/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzAxe.png index 0ea271874..46d047494 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzAxe.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzAxe.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzCuttingKnife.png b/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzCuttingKnife.png index 95d236f4f..e30fb0c43 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzCuttingKnife.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzCuttingKnife.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzHoe.png b/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzHoe.png index 26127c933..96e92c4d2 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzHoe.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzHoe.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzPickaxe.png b/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzPickaxe.png index 66601e762..4327c26d1 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzPickaxe.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzPickaxe.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzSpade.png b/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzSpade.png index 10b8105d2..80fec7fbc 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzSpade.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzSpade.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzSword.png b/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzSword.png index 6ccef66d0..bb0efebe6 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzSword.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzSword.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzWrench.png b/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzWrench.png index 55d60ac38..ea6d26a2e 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzWrench.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ToolCertusQuartzWrench.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolChargedStaff.png b/src/main/resources/assets/appliedenergistics2/textures/items/ToolChargedStaff.png index b6f65e996..fd1364136 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ToolChargedStaff.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ToolChargedStaff.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolChargedStaff.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/items/ToolChargedStaff.png.mcmeta new file mode 100644 index 000000000..5bcc24b75 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/textures/items/ToolChargedStaff.png.mcmeta @@ -0,0 +1,52 @@ +{ + "animation": { + "interpolate": true, + "frames": [ + { + "index": 0, + "time": 40 + }, + { + "index": 1, + "time": 2 + }, + { + "index": 2, + "time": 2 + }, + { + "index": 3, + "time": 2 + } + , + { + "index": 4, + "time": 2 + }, + { + "index": 5, + "time": 2 + }, + { + "index": 6, + "time": 2 + }, + { + "index": 7, + "time": 2 + }, + { + "index": 8, + "time": 2 + }, + { + "index": 9, + "time": 2 + }, + { + "index": 10, + "time": 2 + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolColorApplicator.png b/src/main/resources/assets/appliedenergistics2/textures/items/ToolColorApplicator.png index 679ab269d..b7ffc969a 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ToolColorApplicator.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ToolColorApplicator.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolEntropyManipulator.png b/src/main/resources/assets/appliedenergistics2/textures/items/ToolEntropyManipulator.png index 938322330..55059cc42 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ToolEntropyManipulator.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ToolEntropyManipulator.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolMassCannon.png b/src/main/resources/assets/appliedenergistics2/textures/items/ToolMassCannon.png index e64922e7a..42884f85b 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ToolMassCannon.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ToolMassCannon.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzAxe.png b/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzAxe.png index ae361a8a4..0d244ab3d 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzAxe.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzAxe.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzCuttingKnife.png b/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzCuttingKnife.png index 8381a400d..698d468ee 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzCuttingKnife.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzCuttingKnife.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzHoe.png b/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzHoe.png index e6524f8a5..b5d8fd5a5 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzHoe.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzHoe.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzPickaxe.png b/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzPickaxe.png index cace0b863..ae2e754b0 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzPickaxe.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzPickaxe.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzSpade.png b/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzSpade.png index 1b049c434..d21477240 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzSpade.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzSpade.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzSword.png b/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzSword.png index fa9dce16e..0ec979c9f 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzSword.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzSword.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzWrench.png b/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzWrench.png index baf068f74..ed5906dbf 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzWrench.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetherQuartzWrench.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetworkTool.png b/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetworkTool.png index 8a59c8923..bda404e37 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetworkTool.png and b/src/main/resources/assets/appliedenergistics2/textures/items/ToolNetworkTool.png differ