From 5132a027068d9a9e7eb1e7c0f3d2080288f1a918 Mon Sep 17 00:00:00 2001 From: charles Date: Sat, 3 Apr 2021 05:00:34 -0600 Subject: Partial commit, needed sleep --- README.md | 2 +- .../api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c8cebf4cec..2db2d28539 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -GT5-Unofficial +GT5-Unofficial-chuck === ## About diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java index 7c57076ae9..50611bca63 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java @@ -20,6 +20,8 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM private static final int ARROW_UP_INDEX = 4; private static final int FRONT_INDEX = 5; + public int maxStackSize = 64; + public boolean bOutput = false, bRedstoneIfFull = false, bInvert = false, bStockingMode = false; public int mSuccess = 0, mTargetStackSize = 0; @@ -237,7 +239,7 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM if (aSide == getBaseMetaTileEntity().getBackFacing()) { mTargetStackSize = (byte) ((mTargetStackSize + (aPlayer.isSneaking()? -1 : 1)) % 65); - if(mTargetStackSize <0){mTargetStackSize = 64;} + if(mTargetStackSize <0){mTargetStackSize = maxStackSize;} if (mTargetStackSize == 0) { GT_Utility.sendChatToPlayer(aPlayer, trans("098","Do not regulate Item Stack Size")); } else { -- cgit From 3440f44467a0708a7f4428d7ba9cd9ee2f08bb24 Mon Sep 17 00:00:00 2001 From: charles Date: Sat, 3 Apr 2021 10:52:56 -0600 Subject: Made it so that higher tier buffers try to move multiple stacks/tick --- .../implementations/GT_MetaTileEntity_Buffer.java | 1 + .../automation/GT_MetaTileEntity_ChestBuffer.java | 33 ++++++++++++++-------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java index 50611bca63..21c6bff512 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java @@ -21,6 +21,7 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM private static final int FRONT_INDEX = 5; public int maxStackSize = 64; + public static int MAX = 8; public boolean bOutput = false, bRedstoneIfFull = false, bInvert = false, bStockingMode = false; public int mSuccess = 0, mTargetStackSize = 0; diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java index 73a8fac252..e07d9d0536 100644 --- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java +++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java @@ -18,7 +18,9 @@ import java.util.Arrays; import java.util.Comparator; public class GT_MetaTileEntity_ChestBuffer extends GT_MetaTileEntity_Buffer { - private static final int[] tickRate = {400, 200, 100, 20, 4, 1, 1, 1, 1, 1, 1, 1, 1}; + + private static final int[] tickRate = {400, 200, 100, 20, 4, 1, 1, 1, 1, 1, 1, 1, 1}; + private static final int[] maxStacks = { 1, 1, 1, 1, 1, 1, 2, 4, 8, 16, 32, 64, 128}; public GT_MetaTileEntity_ChestBuffer(int aID, String aName, String aNameRegional, int aTier) { @@ -60,17 +62,19 @@ public class GT_MetaTileEntity_ChestBuffer extends GT_MetaTileEntity_Buffer { protected void moveItems(IGregTechTileEntity aBaseMetaTileEntity, long aTimer) { if (aTimer % tickRate[mTier] > 0) return; - if(aBaseMetaTileEntity.hasInventoryBeenModified()) { - fillStacksIntoFirstSlots(); - } - // mSuccess will be negative if the call is caused by the %200 aTimer, always try to push. Otherwise it will be positive. - // For the first 6 ticks after a successful move (49->44), push every tick. Then go to every 5 ticks. - if ( (mSuccess <= 0 ) || (mSuccess > 43) || ((mSuccess % 5) == 0 )){ - super.moveItems(aBaseMetaTileEntity, aTimer); - } + for (int i = 0; i < MAX; i++ ){ + if(aBaseMetaTileEntity.hasInventoryBeenModified()) { + fillStacksIntoFirstSlots(); + } + // mSuccess will be negative if the call is caused by the %200 aTimer, always try to push. Otherwise it will be positive. + // For the first 6 ticks after a successful move (49->44), push every tick. Then go to every 5 ticks. + if ( (mSuccess <= 0 ) || (mSuccess > 43) || ((mSuccess % 5) == 0 )){ + super.moveItems(aBaseMetaTileEntity, aTimer); + } - if(mSuccess < 0) { - mSuccess = 0; + if(mSuccess < 0) { + mSuccess = 0; + } } } @@ -141,7 +145,7 @@ public class GT_MetaTileEntity_ChestBuffer extends GT_MetaTileEntity_Buffer { int tickRate = getTickRate(tier); String s = ""; if (tickRate < 20) - s = "1/" + 20/tickRate + " "; + s = maxStacks[tier] + "/" + 20/tickRate + " "; else if (tickRate > 20) { s = (tickRate / 20) + "th "; } @@ -153,4 +157,9 @@ public class GT_MetaTileEntity_ChestBuffer extends GT_MetaTileEntity_Buffer { return 1; return tickRate[tier]; } + + protected static int getMaxStacks(int tier) { + // Included higher tiers on the off chance they actually work without blowing things up lmao + return tier > 9 ? MAX : Math.min(maxStacks[tier], MAX); + } } -- cgit From 85bb71ffc8960659dbdb035fb7fa57932f24e8ab Mon Sep 17 00:00:00 2001 From: charles Date: Mon, 12 Apr 2021 21:03:56 -0600 Subject: Removed change intended for private branch --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2db2d28539..c8cebf4cec 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -GT5-Unofficial-chuck +GT5-Unofficial === ## About -- cgit From 413703a7aa5964ad481ca7dfa6abc91bdcbdd86f Mon Sep 17 00:00:00 2001 From: charles Date: Mon, 12 Apr 2021 21:53:20 -0600 Subject: Fixed algorithm, updated flavor text. --- .../implementations/GT_MetaTileEntity_Buffer.java | 32 +++++++++++-------- .../automation/GT_MetaTileEntity_ChestBuffer.java | 36 ++++++++++++---------- 2 files changed, 39 insertions(+), 29 deletions(-) diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java index 1122f6f906..d993e830f8 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java @@ -20,7 +20,7 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM private static final int ARROW_UP_INDEX = 4; private static final int FRONT_INDEX = 5; - public int maxStackSize = 64; + public int mMaxStackSize = 64; public static int MAX = 8; public boolean bOutput = false, bRedstoneIfFull = false, bInvert = false, bStockingMode = false, bSortStacks = false; public int mSuccess = 0, mTargetStackSize = 0; @@ -227,9 +227,9 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM if (aNBT.hasKey("bStockingMode")) { // Adding new key to existing NBT, need to protect if it is not there. bStockingMode = aNBT.getBoolean("bStockingMode"); } - if (aNBT.hasKey("bSortStacks")) { - bSortStacks = aNBT.getBoolean("bSortStacks"); - } + if (aNBT.hasKey("bSortStacks")) { + bSortStacks = aNBT.getBoolean("bSortStacks"); + } mTargetStackSize = aNBT.getInteger("mTargetStackSize"); } @@ -244,7 +244,7 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM if (aSide == getBaseMetaTileEntity().getBackFacing()) { mTargetStackSize = (byte) ((mTargetStackSize + (aPlayer.isSneaking()? -1 : 1)) % 65); - if(mTargetStackSize <0){mTargetStackSize = maxStackSize;} + if(mTargetStackSize <0){mTargetStackSize = mMaxStackSize;} if (mTargetStackSize == 0) { GT_Utility.sendChatToPlayer(aPlayer, trans("098","Do not regulate Item Stack Size")); } else { @@ -283,14 +283,20 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM } protected void moveItems(IGregTechTileEntity aBaseMetaTileEntity, long aTimer) { - int tCost; - if( bStockingMode ) - tCost = GT_Utility.moveMultipleItemStacks(aBaseMetaTileEntity, aBaseMetaTileEntity.getTileEntityAtSide(aBaseMetaTileEntity.getBackFacing()), aBaseMetaTileEntity.getBackFacing(), aBaseMetaTileEntity.getFrontFacing(), null, false, mTargetStackSize == 0 ? 64 : (byte) mTargetStackSize, mTargetStackSize == 0 ? 1 : (byte) mTargetStackSize, (byte) 64, (byte) 1,1); - else - tCost = GT_Utility.moveMultipleItemStacks(aBaseMetaTileEntity, aBaseMetaTileEntity.getTileEntityAtSide(aBaseMetaTileEntity.getBackFacing()), aBaseMetaTileEntity.getBackFacing(), aBaseMetaTileEntity.getFrontFacing(), null, false, (byte) 64, (byte) 1, mTargetStackSize == 0 ? 64 : (byte) mTargetStackSize, mTargetStackSize == 0 ? 1 : (byte) mTargetStackSize,1); - - if (tCost > 0 || aBaseMetaTileEntity.hasInventoryBeenModified()) { - mSuccess = 50; + moveItems(aBaseMetaTileEntity, aTimer, 1); + } + + protected void moveItems(IGregTechTileEntity aBaseMetaTileEntity, long aTimer, int stacks) { + for (int i = 0; i < stacks; i++) { + int tCost; + if (bStockingMode) + tCost = GT_Utility.moveMultipleItemStacks(aBaseMetaTileEntity, aBaseMetaTileEntity.getTileEntityAtSide(aBaseMetaTileEntity.getBackFacing()), aBaseMetaTileEntity.getBackFacing(), aBaseMetaTileEntity.getFrontFacing(), null, false, mTargetStackSize == 0 ? 64 : (byte) mTargetStackSize, mTargetStackSize == 0 ? 1 : (byte) mTargetStackSize, (byte) 64, (byte) 1, 1); + else + tCost = GT_Utility.moveMultipleItemStacks(aBaseMetaTileEntity, aBaseMetaTileEntity.getTileEntityAtSide(aBaseMetaTileEntity.getBackFacing()), aBaseMetaTileEntity.getBackFacing(), aBaseMetaTileEntity.getFrontFacing(), null, false, (byte) 64, (byte) 1, mTargetStackSize == 0 ? 64 : (byte) mTargetStackSize, mTargetStackSize == 0 ? 1 : (byte) mTargetStackSize, 1); + + if (tCost > 0 || aBaseMetaTileEntity.hasInventoryBeenModified()) { + mSuccess = 50; + } } } diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java index e07d9d0536..6951f9bb44 100644 --- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java +++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java @@ -62,19 +62,17 @@ public class GT_MetaTileEntity_ChestBuffer extends GT_MetaTileEntity_Buffer { protected void moveItems(IGregTechTileEntity aBaseMetaTileEntity, long aTimer) { if (aTimer % tickRate[mTier] > 0) return; - for (int i = 0; i < MAX; i++ ){ - if(aBaseMetaTileEntity.hasInventoryBeenModified()) { - fillStacksIntoFirstSlots(); - } - // mSuccess will be negative if the call is caused by the %200 aTimer, always try to push. Otherwise it will be positive. - // For the first 6 ticks after a successful move (49->44), push every tick. Then go to every 5 ticks. - if ( (mSuccess <= 0 ) || (mSuccess > 43) || ((mSuccess % 5) == 0 )){ - super.moveItems(aBaseMetaTileEntity, aTimer); - } + if(aBaseMetaTileEntity.hasInventoryBeenModified()) { + fillStacksIntoFirstSlots(); + } + // mSuccess will be negative if the call is caused by the %200 aTimer, always try to push. Otherwise it will be positive. + // For the first 6 ticks after a successful move (49->44), push every tick. Then go to every 5 ticks. + if ( (mSuccess <= 0 ) || (mSuccess > 43) || ((mSuccess % 5) == 0 )){ + super.moveItems(aBaseMetaTileEntity, aTimer, Math.min(MAX, maxStacks[mTier])); + } - if(mSuccess < 0) { - mSuccess = 0; - } + if(mSuccess < 0) { + mSuccess = 0; } } @@ -143,13 +141,19 @@ public class GT_MetaTileEntity_ChestBuffer extends GT_MetaTileEntity_Buffer { protected static String getTickRateDesc(int tier){ int tickRate = getTickRate(tier); - String s = ""; + String timeStr = ""; + String numStr = ""; + if (maxStacks[tier] > 1) { + numStr = maxStacks[tier] + " items"; + } else { + numStr = "1 item"; + } if (tickRate < 20) - s = maxStacks[tier] + "/" + 20/tickRate + " "; + timeStr = "1/" + 20/tickRate + " "; else if (tickRate > 20) { - s = (tickRate / 20) + "th "; + timeStr = (tickRate / 20) + "th "; } - return "Moves items every " + s + "second"; + return "Moves " + numStr + " every " + timeStr + "second"; } protected static int getTickRate(int tier) { -- cgit From 8ab359f64d112e4d82baa74b6f1b4f9a9ba35104 Mon Sep 17 00:00:00 2001 From: Léa Gris Date: Tue, 27 Apr 2021 22:36:36 +0200 Subject: tidy(json): all .mcmeta and .info Normalise all these json files with jq Used Linux shell ```sh find ./src -type f \( -iname '*.mcmeta' -o -iname '*.info' \) -execdir bash -c ' for f; do if jq "." "$f" >/tmp/a.json; then cat /tmp/a.json >"$f"; fi; done; rm -f -- /tmp/a.json ' _ {} +; ``` --- src/main/pack.mcmeta | 10 +++--- .../centrifuge/OVERLAY_FRONT_ACTIVE.png.mcmeta | 8 ++--- .../centrifuge/OVERLAY_SIDE_ACTIVE.png.mcmeta | 8 ++--- .../centrifuge/OVERLAY_TOP_ACTIVE.png.mcmeta | 8 ++--- .../OVERLAY_FRONT_ACTIVE.png.mcmeta | 8 ++--- .../laser_engraver/OVERLAY_FRONT_ACTIVE.png.mcmeta | 8 ++--- .../macerator/OVERLAY_TOP_ACTIVE.png.mcmeta | 8 ++--- .../miner/OVERLAY_TOP_ACTIVE.png.mcmeta | 9 +++--- .../mixer/OVERLAY_FRONT_ACTIVE.png.mcmeta | 8 ++--- .../mixer/OVERLAY_SIDE_ACTIVE.png.mcmeta | 8 ++--- .../mixer/OVERLAY_TOP_ACTIVE.png.mcmeta | 8 ++--- .../pulverizer/OVERLAY_TOP_ACTIVE.png.mcmeta | 8 ++--- .../sifter/OVERLAY_FRONT_ACTIVE.png.mcmeta | 8 ++--- .../textures/blocks/fluids/fluid.air.png.mcmeta | 8 ++--- .../textures/blocks/fluids/fluid.argon.png.mcmeta | 8 ++--- .../blocks/fluids/fluid.berylium.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.bioethanol.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.biomass.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.calcium.png.mcmeta | 10 +++--- .../fluids/fluid.calciumcarbonate.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.chlorine.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.creosote.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.deuterium.png.mcmeta | 10 +++--- .../textures/blocks/fluids/fluid.dyes.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.fieryblood.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.fishoil.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.fluorine.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.for.honey.png.mcmeta | 10 +++--- .../textures/blocks/fluids/fluid.fuel.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.gas_gas.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.gas_natural_gas.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.gas_sulfuricgas.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.glyceryl.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.helium-3.png.mcmeta | 10 +++--- .../textures/blocks/fluids/fluid.helium.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.heliumplasma.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.holywater.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.hotfryingoil.png.mcmeta | 10 +++--- .../fluids/fluid.hydrochloricacid.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.hydrogen.png.mcmeta | 10 +++--- .../textures/blocks/fluids/fluid.ice.png.mcmeta | 10 +++--- .../textures/blocks/fluids/fluid.indigo.png.mcmeta | 10 +++--- .../fluids/fluid.indiumconcentrate.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.iron3chloride.png.mcmeta | 10 +++--- .../fluids/fluid.leadzincsolution.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.lifeessence.png.mcmeta | 8 ++--- .../fluid.liquid_cracked_heavy_fuel.png.mcmeta | 10 +++--- .../fluid.liquid_cracked_light_fuel.png.mcmeta | 10 +++--- .../fluids/fluid.liquid_drillingfluid.png.mcmeta | 10 +++--- .../fluids/fluid.liquid_epichlorhydrin.png.mcmeta | 10 +++--- .../fluids/fluid.liquid_extra_heavy_oil.png.mcmeta | 10 +++--- .../fluids/fluid.liquid_heavy_fuel.png.mcmeta | 10 +++--- .../fluids/fluid.liquid_heavy_oil.png.mcmeta | 10 +++--- .../fluids/fluid.liquid_hydricsulfur.png.mcmeta | 10 +++--- .../fluids/fluid.liquid_light_fuel.png.mcmeta | 10 +++--- .../fluids/fluid.liquid_light_oil.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.liquid_lpg.png.mcmeta | 10 +++--- .../fluids/fluid.liquid_medium_oil.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.liquid_naphtha.png.mcmeta | 10 +++--- .../fluid.liquid_nitrationmixture.png.mcmeta | 2 +- .../fluid.liquid_sufluriclight_fuel.png.mcmeta | 10 +++--- .../fluid.liquid_sulfuricheavy_fuel.png.mcmeta | 10 +++--- .../fluids/fluid.liquid_sulfuricnaphtha.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.liquid_toluene.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.liquidair.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.liquidnitrogen.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.liquidoxygen.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.lithium.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.lubricant.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.mcguffium.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.mercury.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.methane.png.mcmeta | 10 +++--- .../textures/blocks/fluids/fluid.milk.png.mcmeta | 10 +++--- .../fluids/fluid.molten.autogenerated.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.molten.blaze.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.molten.concrete.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.molten.glass.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.molten.redstone.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.nitricacid.png.mcmeta | 2 +- .../blocks/fluids/fluid.nitrocoalfuel.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.nitrofuel.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.nitrogen.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.nitrogendioxide.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.nitrogenplasma.png.mcmeta | 10 +++--- .../textures/blocks/fluids/fluid.oil.png.mcmeta | 10 +++--- .../textures/blocks/fluids/fluid.oxygen.png.mcmeta | 10 +++--- .../fluids/fluid.plasma.autogenerated.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.potassium.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.potion.alcopops.png.mcmeta | 10 +++--- .../fluids/fluid.potion.applejuice.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.potion.awkward.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.potion.beer.png.mcmeta | 10 +++--- .../fluids/fluid.potion.cafeaulait.png.mcmeta | 10 +++--- ...luid.potion.cavejohnsonsgrenadejuice.png.mcmeta | 10 +++--- .../fluids/fluid.potion.chillysauce.png.mcmeta | 10 +++--- .../fluids/fluid.potion.chocolatemilk.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.potion.cider.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.potion.coffee.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.potion.damage.png.mcmeta | 10 +++--- .../fluids/fluid.potion.damage.splash.png.mcmeta | 10 +++--- .../fluids/fluid.potion.damage.strong.png.mcmeta | 10 +++--- .../fluid.potion.damage.strong.splash.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.potion.darkbeer.png.mcmeta | 10 +++--- .../fluids/fluid.potion.darkcafeaulait.png.mcmeta | 10 +++--- .../fluid.potion.darkchocolatemilk.png.mcmeta | 10 +++--- .../fluids/fluid.potion.darkcoffee.png.mcmeta | 10 +++--- .../fluids/fluid.potion.diablosauce.png.mcmeta | 10 +++--- .../fluid.potion.diablosauce.strong.png.mcmeta | 10 +++--- .../fluids/fluid.potion.diabolosauce.png.mcmeta | 10 +++--- .../fluids/fluid.potion.dragonblood.png.mcmeta | 10 +++--- .../fluid.potion.fireresistance.long.png.mcmeta | 10 +++--- ...id.potion.fireresistance.long.splash.png.mcmeta | 10 +++--- .../fluids/fluid.potion.fireresistance.png.mcmeta | 10 +++--- .../fluid.potion.fireresistance.splash.png.mcmeta | 10 +++--- .../fluids/fluid.potion.glenmckenner.png.mcmeta | 10 +++--- .../fluid.potion.goldenapplejuice.png.mcmeta | 10 +++--- .../fluids/fluid.potion.goldencider.png.mcmeta | 10 +++--- .../fluids/fluid.potion.grapejuice.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.potion.health.png.mcmeta | 10 +++--- .../fluids/fluid.potion.health.splash.png.mcmeta | 10 +++--- .../fluids/fluid.potion.health.strong.png.mcmeta | 10 +++--- .../fluid.potion.health.strong.splash.png.mcmeta | 10 +++--- .../fluids/fluid.potion.hopsjuice.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.potion.hotsauce.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.potion.icetea.png.mcmeta | 10 +++--- .../fluids/fluid.potion.idunsapplejuice.png.mcmeta | 10 +++--- .../fluid.potion.invisibility.long.png.mcmeta | 10 +++--- ...luid.potion.invisibility.long.splash.png.mcmeta | 10 +++--- .../fluids/fluid.potion.invisibility.png.mcmeta | 10 +++--- .../fluid.potion.invisibility.splash.png.mcmeta | 10 +++--- .../fluids/fluid.potion.laitaucafe.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.potion.lemonade.png.mcmeta | 10 +++--- .../fluids/fluid.potion.lemonjuice.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.potion.leninade.png.mcmeta | 10 +++--- .../fluids/fluid.potion.limoncello.png.mcmeta | 10 +++--- .../fluids/fluid.potion.mineralwater.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.potion.mundane.png.mcmeta | 10 +++--- .../fluid.potion.nightvision.long.png.mcmeta | 10 +++--- ...fluid.potion.nightvision.long.splash.png.mcmeta | 10 +++--- .../fluids/fluid.potion.nightvision.png.mcmeta | 10 +++--- .../fluid.potion.nightvision.splash.png.mcmeta | 10 +++--- .../fluids/fluid.potion.notchesbrew.png.mcmeta | 10 +++--- .../fluids/fluid.potion.piratebrew.png.mcmeta | 10 +++--- .../fluids/fluid.potion.poison.long.png.mcmeta | 10 +++--- .../fluid.potion.poison.long.splash.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.potion.poison.png.mcmeta | 10 +++--- .../fluids/fluid.potion.poison.splash.png.mcmeta | 10 +++--- .../fluids/fluid.potion.poison.strong.png.mcmeta | 10 +++--- .../fluid.potion.poison.strong.splash.png.mcmeta | 10 +++--- .../fluids/fluid.potion.potatojuice.png.mcmeta | 10 +++--- .../fluids/fluid.potion.purpledrink.png.mcmeta | 10 +++--- .../fluids/fluid.potion.reedwater.png.mcmeta | 10 +++--- .../fluids/fluid.potion.regen.long.png.mcmeta | 10 +++--- .../fluid.potion.regen.long.splash.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.potion.regen.png.mcmeta | 10 +++--- .../fluids/fluid.potion.regen.splash.png.mcmeta | 10 +++--- .../fluids/fluid.potion.regen.strong.png.mcmeta | 10 +++--- .../fluid.potion.regen.strong.splash.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.potion.rum.png.mcmeta | 10 +++--- .../fluids/fluid.potion.saltywater.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.potion.scotch.png.mcmeta | 10 +++--- .../fluids/fluid.potion.slowness.long.png.mcmeta | 10 +++--- .../fluid.potion.slowness.long.splash.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.potion.slowness.png.mcmeta | 10 +++--- .../fluids/fluid.potion.slowness.splash.png.mcmeta | 10 +++--- .../fluids/fluid.potion.speed.long.png.mcmeta | 10 +++--- .../fluid.potion.speed.long.splash.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.potion.speed.png.mcmeta | 10 +++--- .../fluids/fluid.potion.speed.splash.png.mcmeta | 10 +++--- .../fluids/fluid.potion.speed.strong.png.mcmeta | 10 +++--- .../fluid.potion.speed.strong.splash.png.mcmeta | 10 +++--- .../fluids/fluid.potion.strength.long.png.mcmeta | 10 +++--- .../fluid.potion.strength.long.splash.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.potion.strength.png.mcmeta | 10 +++--- .../fluids/fluid.potion.strength.splash.png.mcmeta | 10 +++--- .../fluids/fluid.potion.strength.strong.png.mcmeta | 10 +++--- .../fluid.potion.strength.strong.splash.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.potion.sweettea.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.potion.tea.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.potion.thick.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.potion.vinegar.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.potion.vodka.png.mcmeta | 10 +++--- .../fluid.potion.waterbreathing.long.png.mcmeta | 10 +++--- ...id.potion.waterbreathing.long.splash.png.mcmeta | 10 +++--- .../fluids/fluid.potion.waterbreathing.png.mcmeta | 10 +++--- .../fluid.potion.waterbreathing.splash.png.mcmeta | 10 +++--- .../fluids/fluid.potion.weakness.long.png.mcmeta | 10 +++--- .../fluid.potion.weakness.long.splash.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.potion.weakness.png.mcmeta | 10 +++--- .../fluids/fluid.potion.weakness.splash.png.mcmeta | 10 +++--- .../fluids/fluid.potion.wheatyhopsjuice.png.mcmeta | 10 +++--- .../fluids/fluid.potion.wheatyjuice.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.potion.wine.png.mcmeta | 10 +++--- .../textures/blocks/fluids/fluid.radon.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.refinedglue.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.rocket_fuel.png.mcmeta | 2 +- .../blocks/fluids/fluid.seedoil.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.silicon.png.mcmeta | 10 +++--- .../textures/blocks/fluids/fluid.sodium.png.mcmeta | 10 +++--- .../fluids/fluid.sodiumpersulfate.png.mcmeta | 10 +++--- .../fluids/fluid.solution.bluevitriol.png.mcmeta | 2 +- .../fluids/fluid.solution.nickelsulfate.png.mcmeta | 2 +- .../blocks/fluids/fluid.squidink.png.mcmeta | 10 +++--- .../textures/blocks/fluids/fluid.steam.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.sulfuricacid.png.mcmeta | 10 +++--- .../fluids/fluid.titaniumtetrachloride.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.tritium.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.uuamplifier.png.mcmeta | 10 +++--- .../fluids/fluid.wet.autogenerated.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.wet.concrete.png.mcmeta | 10 +++--- .../blocks/fluids/fluid.wolframium.png.mcmeta | 10 +++--- .../blocks/iconsets/BOILER_FRONT_ACTIVE.png.mcmeta | 8 ++--- .../iconsets/BOILER_LAVA_FRONT_ACTIVE.png.mcmeta | 8 ++--- .../DIESEL_GENERATOR_TOP_ACTIVE.png.mcmeta | 8 ++--- .../iconsets/LARGETURBINE_SS_ACTIVE1.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_SS_ACTIVE2.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_SS_ACTIVE3.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_SS_ACTIVE4.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_SS_ACTIVE5.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_SS_ACTIVE6.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_SS_ACTIVE7.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_SS_ACTIVE8.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_SS_ACTIVE9.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_ST_ACTIVE1.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_ST_ACTIVE2.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_ST_ACTIVE3.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_ST_ACTIVE4.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_ST_ACTIVE5.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_ST_ACTIVE6.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_ST_ACTIVE7.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_ST_ACTIVE8.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_ST_ACTIVE9.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_TI_ACTIVE1.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_TI_ACTIVE2.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_TI_ACTIVE3.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_TI_ACTIVE4.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_TI_ACTIVE5.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_TI_ACTIVE6.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_TI_ACTIVE7.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_TI_ACTIVE8.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_TI_ACTIVE9.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_TU_ACTIVE1.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_TU_ACTIVE2.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_TU_ACTIVE3.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_TU_ACTIVE4.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_TU_ACTIVE5.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_TU_ACTIVE6.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_TU_ACTIVE7.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_TU_ACTIVE8.png.mcmeta | 4 +-- .../iconsets/LARGETURBINE_TU_ACTIVE9.png.mcmeta | 4 +-- .../blocks/iconsets/OVERLAY_ARM.png.mcmeta | 8 ++--- .../iconsets/OVERLAY_AUTOMAINTENANCE.png.mcmeta | 8 ++--- .../OVERLAY_AUTOMAINTENANCE_IDLE.png.mcmeta | 8 ++--- .../blocks/iconsets/OVERLAY_CONVEYOR.png.mcmeta | 8 ++--- .../OVERLAY_FRONT_REPLICATOR_ACTIVE.png.mcmeta | 8 ++--- .../OVERLAY_FRONT_ROCK_BREAKER_ACTIVE.png.mcmeta | 8 ++--- .../blocks/iconsets/OVERLAY_FUSION1.png.mcmeta | 8 ++--- .../blocks/iconsets/OVERLAY_FUSION2.png.mcmeta | 8 ++--- .../blocks/iconsets/OVERLAY_FUSION3.png.mcmeta | 8 ++--- .../blocks/iconsets/OVERLAY_PUMP.png.mcmeta | 8 ++--- .../blocks/iconsets/OVERLAY_QCHEST.png.mcmeta | 8 ++--- .../blocks/iconsets/OVERLAY_QTANK.png.mcmeta | 8 ++--- .../blocks/iconsets/OVERLAY_SCHEST.png.mcmeta | 8 ++--- .../blocks/iconsets/OVERLAY_SCREEN.png.mcmeta | 8 ++--- .../blocks/iconsets/OVERLAY_STANK.png.mcmeta | 8 ++--- .../iconsets/OVERLAY_TELEPORTER_ACTIVE.png.mcmeta | 8 ++--- .../iconsets/OVERLAY_TELEPORTER_SIDES.png.mcmeta | 8 ++--- .../OVERLAY_TOP_CLEANROOM_ACTIVE.png.mcmeta | 8 ++--- .../OVERLAY_TOP_STEAM_MACERATOR_ACTIVE.png.mcmeta | 8 ++--- .../blocks/iconsets/OVERLAY_VALVE.png.mcmeta | 8 ++--- .../blocks/iconsets/VENT_ADVANCED.png.mcmeta | 8 ++--- .../blocks/iconsets/VENT_NORMAL.png.mcmeta | 8 ++--- src/main/resources/mcmod.info | 37 +++++++++++++--------- 273 files changed, 1214 insertions(+), 1208 deletions(-) diff --git a/src/main/pack.mcmeta b/src/main/pack.mcmeta index c6d1a1c594..33f118cbd7 100644 --- a/src/main/pack.mcmeta +++ b/src/main/pack.mcmeta @@ -1,6 +1,6 @@ { - "pack":{ - "pack_format":1, - "description":"GregTech Resource Pack" - } -} \ No newline at end of file + "pack": { + "pack_format": 1, + "description": "GregTech Resource Pack" + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/centrifuge/OVERLAY_FRONT_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/centrifuge/OVERLAY_FRONT_ACTIVE.png.mcmeta index dfae8cae16..24f9c2fae3 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/centrifuge/OVERLAY_FRONT_ACTIVE.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/centrifuge/OVERLAY_FRONT_ACTIVE.png.mcmeta @@ -1,5 +1,5 @@ { - "animation":{ - "frametime":1 - } -} \ No newline at end of file + "animation": { + "frametime": 1 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/centrifuge/OVERLAY_SIDE_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/centrifuge/OVERLAY_SIDE_ACTIVE.png.mcmeta index dfae8cae16..24f9c2fae3 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/centrifuge/OVERLAY_SIDE_ACTIVE.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/centrifuge/OVERLAY_SIDE_ACTIVE.png.mcmeta @@ -1,5 +1,5 @@ { - "animation":{ - "frametime":1 - } -} \ No newline at end of file + "animation": { + "frametime": 1 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/centrifuge/OVERLAY_TOP_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/centrifuge/OVERLAY_TOP_ACTIVE.png.mcmeta index dfae8cae16..24f9c2fae3 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/centrifuge/OVERLAY_TOP_ACTIVE.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/centrifuge/OVERLAY_TOP_ACTIVE.png.mcmeta @@ -1,5 +1,5 @@ { - "animation":{ - "frametime":1 - } -} \ No newline at end of file + "animation": { + "frametime": 1 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/electromagnetic_separator/OVERLAY_FRONT_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/electromagnetic_separator/OVERLAY_FRONT_ACTIVE.png.mcmeta index dfae8cae16..24f9c2fae3 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/electromagnetic_separator/OVERLAY_FRONT_ACTIVE.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/electromagnetic_separator/OVERLAY_FRONT_ACTIVE.png.mcmeta @@ -1,5 +1,5 @@ { - "animation":{ - "frametime":1 - } -} \ No newline at end of file + "animation": { + "frametime": 1 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/laser_engraver/OVERLAY_FRONT_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/laser_engraver/OVERLAY_FRONT_ACTIVE.png.mcmeta index dfae8cae16..24f9c2fae3 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/laser_engraver/OVERLAY_FRONT_ACTIVE.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/laser_engraver/OVERLAY_FRONT_ACTIVE.png.mcmeta @@ -1,5 +1,5 @@ { - "animation":{ - "frametime":1 - } -} \ No newline at end of file + "animation": { + "frametime": 1 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/macerator/OVERLAY_TOP_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/macerator/OVERLAY_TOP_ACTIVE.png.mcmeta index 60af678259..b84e69f2c5 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/macerator/OVERLAY_TOP_ACTIVE.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/macerator/OVERLAY_TOP_ACTIVE.png.mcmeta @@ -1,5 +1,5 @@ { - "animation":{ - "frametime":4 - } -} \ No newline at end of file + "animation": { + "frametime": 4 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/miner/OVERLAY_TOP_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/miner/OVERLAY_TOP_ACTIVE.png.mcmeta index fba3e2efc9..b84e69f2c5 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/miner/OVERLAY_TOP_ACTIVE.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/miner/OVERLAY_TOP_ACTIVE.png.mcmeta @@ -1,6 +1,5 @@ - { - "animation":{ - "frametime":4 - } -} \ No newline at end of file + "animation": { + "frametime": 4 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/mixer/OVERLAY_FRONT_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/mixer/OVERLAY_FRONT_ACTIVE.png.mcmeta index dfae8cae16..24f9c2fae3 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/mixer/OVERLAY_FRONT_ACTIVE.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/mixer/OVERLAY_FRONT_ACTIVE.png.mcmeta @@ -1,5 +1,5 @@ { - "animation":{ - "frametime":1 - } -} \ No newline at end of file + "animation": { + "frametime": 1 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/mixer/OVERLAY_SIDE_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/mixer/OVERLAY_SIDE_ACTIVE.png.mcmeta index dfae8cae16..24f9c2fae3 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/mixer/OVERLAY_SIDE_ACTIVE.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/mixer/OVERLAY_SIDE_ACTIVE.png.mcmeta @@ -1,5 +1,5 @@ { - "animation":{ - "frametime":1 - } -} \ No newline at end of file + "animation": { + "frametime": 1 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/mixer/OVERLAY_TOP_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/mixer/OVERLAY_TOP_ACTIVE.png.mcmeta index dfae8cae16..24f9c2fae3 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/mixer/OVERLAY_TOP_ACTIVE.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/mixer/OVERLAY_TOP_ACTIVE.png.mcmeta @@ -1,5 +1,5 @@ { - "animation":{ - "frametime":1 - } -} \ No newline at end of file + "animation": { + "frametime": 1 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/pulverizer/OVERLAY_TOP_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/pulverizer/OVERLAY_TOP_ACTIVE.png.mcmeta index 97596ba817..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/pulverizer/OVERLAY_TOP_ACTIVE.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/pulverizer/OVERLAY_TOP_ACTIVE.png.mcmeta @@ -1,5 +1,5 @@ { - "animation":{ - "frametime":2 - } -} \ No newline at end of file + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/sifter/OVERLAY_FRONT_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/sifter/OVERLAY_FRONT_ACTIVE.png.mcmeta index dfae8cae16..24f9c2fae3 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/sifter/OVERLAY_FRONT_ACTIVE.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/sifter/OVERLAY_FRONT_ACTIVE.png.mcmeta @@ -1,5 +1,5 @@ { - "animation":{ - "frametime":1 - } -} \ No newline at end of file + "animation": { + "frametime": 1 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.air.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.air.png.mcmeta index 83e994c588..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.air.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.air.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } +{ + "animation": { + "frametime": 2 + } } diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png.mcmeta index 83e994c588..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } +{ + "animation": { + "frametime": 2 + } } diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.berylium.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.berylium.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.berylium.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.berylium.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.bioethanol.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.bioethanol.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.bioethanol.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.bioethanol.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.biomass.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.biomass.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.biomass.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.biomass.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.calcium.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.calcium.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.calcium.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.calcium.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.calciumcarbonate.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.calciumcarbonate.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.calciumcarbonate.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.calciumcarbonate.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.chlorine.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.chlorine.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.chlorine.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.chlorine.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.creosote.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.creosote.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.creosote.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.creosote.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.deuterium.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.deuterium.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.deuterium.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.deuterium.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.dyes.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.dyes.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.dyes.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.dyes.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fieryblood.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fieryblood.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fieryblood.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fieryblood.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fishoil.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fishoil.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fishoil.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fishoil.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fluorine.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fluorine.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fluorine.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fluorine.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.for.honey.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.for.honey.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.for.honey.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.for.honey.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fuel.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fuel.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fuel.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fuel.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_gas.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_gas.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_gas.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_gas.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_natural_gas.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_natural_gas.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_natural_gas.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_natural_gas.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_sulfuricgas.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_sulfuricgas.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_sulfuricgas.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_sulfuricgas.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.glyceryl.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.glyceryl.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.glyceryl.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.glyceryl.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium-3.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium-3.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium-3.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium-3.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.heliumplasma.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.heliumplasma.png.mcmeta index 87c542d295..24f9c2fae3 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.heliumplasma.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.heliumplasma.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":1 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 1 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.holywater.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.holywater.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.holywater.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.holywater.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hotfryingoil.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hotfryingoil.png.mcmeta index 87c542d295..24f9c2fae3 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hotfryingoil.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hotfryingoil.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":1 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 1 + } +} 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 index 0df7234a79..0645f48c62 100644 --- 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 @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrogen.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrogen.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrogen.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrogen.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.ice.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.ice.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.ice.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.ice.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.indigo.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.indigo.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.indigo.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.indigo.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.indiumconcentrate.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.indiumconcentrate.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.indiumconcentrate.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.indiumconcentrate.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} 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 index 0df7234a79..0645f48c62 100644 --- 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 @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.leadzincsolution.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.leadzincsolution.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.leadzincsolution.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.leadzincsolution.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.lifeessence.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.lifeessence.png.mcmeta index 83e994c588..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.lifeessence.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.lifeessence.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } +{ + "animation": { + "frametime": 2 + } } diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_cracked_heavy_fuel.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_cracked_heavy_fuel.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_cracked_heavy_fuel.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_cracked_heavy_fuel.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_cracked_light_fuel.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_cracked_light_fuel.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_cracked_light_fuel.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_cracked_light_fuel.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_drillingfluid.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_drillingfluid.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_drillingfluid.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_drillingfluid.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_epichlorhydrin.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_epichlorhydrin.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_epichlorhydrin.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_epichlorhydrin.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_extra_heavy_oil.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_extra_heavy_oil.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_extra_heavy_oil.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_extra_heavy_oil.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_heavy_fuel.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_heavy_fuel.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_heavy_fuel.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_heavy_fuel.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_heavy_oil.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_heavy_oil.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_heavy_oil.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_heavy_oil.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_hydricsulfur.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_hydricsulfur.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_hydricsulfur.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_hydricsulfur.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_light_fuel.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_light_fuel.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_light_fuel.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_light_fuel.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_light_oil.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_light_oil.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_light_oil.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_light_oil.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_lpg.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_lpg.png.mcmeta index 87c542d295..24f9c2fae3 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_lpg.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_lpg.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":1 - } -} \ No newline at end of file +{ + "animation": { + "frametime": 1 + } +} diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_medium_oil.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_medium_oil.png.mcmeta index 0df7234a79..0645f48c62 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_medium_oil.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_medium_oil.png.mcmeta @@ -1,5 +1,5 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file +{ + "animation"