From 568f05651e187e9bd7af44d72742665ebcee274f Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sun, 30 Apr 2017 00:13:36 +1000 Subject: + Added Resonant Ender. $ Fixed COFH Fluids having incorrect textures. $ Fixed the recipe for Clay plates not auto-generating. --- src/resources/assets/miscutils/lang/en_US.lang | 5 +++ .../textures/blocks/fluid/Fluid_Ender_Flow.png | Bin 0 -> 9694 bytes .../blocks/fluid/Fluid_Ender_Flow.png.mcmeta | 5 +++ .../textures/blocks/fluid/Fluid_Ender_Still.png | Bin 0 -> 7679 bytes .../blocks/fluid/Fluid_Ender_Still.png.mcmeta | 45 +++++++++++++++++++++ .../textures/blocks/fluids/fluid.cryotheum.png | Bin 9224 -> 7010 bytes .../blocks/fluids/fluid.cryotheum.png.mcmeta | 42 ++++++++++++++++++- .../textures/blocks/fluids/fluid.ender.png | Bin 0 -> 7679 bytes .../textures/blocks/fluids/fluid.ender.png.mcmeta | 45 +++++++++++++++++++++ .../textures/blocks/fluids/fluid.pyrotheum.png | Bin 11952 -> 11735 bytes .../blocks/fluids/fluid.pyrotheum.png.mcmeta | 42 ++++++++++++++++++- .../textures/items/bucket/BucketEnder.png | Bin 0 -> 4159 bytes .../textures/items/bucket/BucketEnder.png.mcmeta | 5 +++ 13 files changed, 187 insertions(+), 2 deletions(-) create mode 100644 src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Flow.png create mode 100644 src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Flow.png.mcmeta create mode 100644 src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Still.png create mode 100644 src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Still.png.mcmeta create mode 100644 src/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png create mode 100644 src/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png.mcmeta create mode 100644 src/resources/assets/miscutils/textures/items/bucket/BucketEnder.png create mode 100644 src/resources/assets/miscutils/textures/items/bucket/BucketEnder.png.mcmeta (limited to 'src/resources/assets/miscutils') diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang index 03523c1392..c2d177de48 100644 --- a/src/resources/assets/miscutils/lang/en_US.lang +++ b/src/resources/assets/miscutils/lang/en_US.lang @@ -78,6 +78,7 @@ fluid.psc_JD=Jack Daniels item.MiscUtils.bucket.bucketPyrotheum.name=Blazing Pyrotheum Bucket item.MiscUtils.bucket.bucketCryotheum.name=Gelid Cryotheum Bucket +item.MiscUtils.bucket.bucketEnder.name=Resonant Ender Bucket item.MiscUtils.material.dustPyrotheum.name=Pyrotheum Dust item.MiscUtils.material.dustCryotheum.name=Cryotheum Dust item.MiscUtils.material.rodBlizz.name=Blizz Rod @@ -85,6 +86,10 @@ item.MiscUtils.material.dustBlizz.name=Blizz Powder tile.MiscUtils.fluid.pyrotheum.name=Blazing Pyrotheum tile.MiscUtils.fluid.cryotheum.name=Gelid Cryotheum +tile.miscutils.fluid.cryotheum.name=Gelid Cryotheum +tile.miscutils.fluid.pyrotheum.name=Blazing Pyrotheum +tile.miscutils.fluid.ender.name=Resonant Ender + item.frameAccelerated.name=Accelerated Frame item.frameVoid.name=Void Frame item.frameMutagenic.name=Mutagenic Frame diff --git a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Flow.png b/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Flow.png new file mode 100644 index 0000000000..620646075d Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Flow.png differ diff --git a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Flow.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Flow.png.mcmeta new file mode 100644 index 0000000000..7e77c64858 --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Flow.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} \ No newline at end of file diff --git a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Still.png b/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Still.png new file mode 100644 index 0000000000..b0c6449d4e Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Still.png differ diff --git a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Still.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Still.png.mcmeta new file mode 100644 index 0000000000..4fadce8aff --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Still.png.mcmeta @@ -0,0 +1,45 @@ +{ + "animation": { + "frametime": 4, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] + } +} \ No newline at end of file diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png index 75fdf154e6..113b14ba51 100644 Binary files a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png and b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png differ diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png.mcmeta index 70cc4d313c..aa41c3d5c8 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png.mcmeta +++ b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png.mcmeta @@ -1,5 +1,45 @@ { "animation": { - "frametime": 6 + "frametime": 8, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] } } \ No newline at end of file diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png new file mode 100644 index 0000000000..b0c6449d4e Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png differ diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png.mcmeta new file mode 100644 index 0000000000..4fadce8aff --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png.mcmeta @@ -0,0 +1,45 @@ +{ + "animation": { + "frametime": 4, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] + } +} \ No newline at end of file diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png index 4ec6c5636c..c72b26c547 100644 Binary files a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png and b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png differ diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png.mcmeta index 70cc4d313c..aa41c3d5c8 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png.mcmeta +++ b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png.mcmeta @@ -1,5 +1,45 @@ { "animation": { - "frametime": 6 + "frametime": 8, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] } } \ No newline at end of file diff --git a/src/resources/assets/miscutils/textures/items/bucket/BucketEnder.png b/src/resources/assets/miscutils/textures/items/bucket/BucketEnder.png new file mode 100644 index 0000000000..be510770c6 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/bucket/BucketEnder.png differ diff --git a/src/resources/assets/miscutils/textures/items/bucket/BucketEnder.png.mcmeta b/src/resources/assets/miscutils/textures/items/bucket/BucketEnder.png.mcmeta new file mode 100644 index 0000000000..f6730e30a9 --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/bucket/BucketEnder.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 4 + } +} \ No newline at end of file -- cgit