aboutsummaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2020-03-31 02:40:07 +0000
committerAlkalus <draknyte1@hotmail.com>2020-03-31 02:40:07 +0000
commit6d6adf8039fb97f2025610eb313a4caa48df838b (patch)
tree80e377c85c8a89edeac671cc6b2f2655a150f41e /src/resources
parent47816dec7729bde0bf247ff7db8ebf6b25b92048 (diff)
parent8a8048a6418ca8da9de0bd7b49f6ec39f9b0aad6 (diff)
downloadGT5-Unofficial-6d6adf8039fb97f2025610eb313a4caa48df838b.tar.gz
GT5-Unofficial-6d6adf8039fb97f2025610eb313a4caa48df838b.tar.bz2
GT5-Unofficial-6d6adf8039fb97f2025610eb313a4caa48df838b.zip
Merged in AlkWork (pull request #4)
AlkWork
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/GradleStartClient.java103
-rw-r--r--src/resources/assets/miscutils/lang/en_US.lang45
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GEARBOX_T1.pngbin0 -> 633 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GRINDING_FACTORY.pngbin0 -> 671 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_PIPE_T1.pngbin0 -> 598 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/MACHINE_CASING_VENT.pngbin0 -> 467 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER1.pngbin0 -> 647 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER2.pngbin0 -> 541 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER3.pngbin0 -> 663 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER4.pngbin0 -> 533 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER5.pngbin0 -> 271 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER6.pngbin0 -> 526 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER7.pngbin0 -> 665 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER8.pngbin0 -> 528 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER9.pngbin0 -> 625 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE1.pngbin0 -> 748 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE1.png.mcmeta3
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE2.pngbin0 -> 766 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE2.png.mcmeta3
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE3.pngbin0 -> 849 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE3.png.mcmeta3
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.pdnbin0 -> 5038 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.pngbin0 -> 897 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.png.mcmeta3
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE5.pngbin0 -> 464 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE5.png.mcmeta3
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE6.pngbin0 -> 971 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE6.png.mcmeta3
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE7.pngbin0 -> 768 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE7.png.mcmeta3
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE8.pngbin0 -> 757 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE8.png.mcmeta3
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE9.pngbin0 -> 747 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE9.png.mcmeta3
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/151.pngbin0 -> 335 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/160.pngbin0 -> 459 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/161.pngbin0 -> 455 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/162.pngbin0 -> 455 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/food/MetaItem1/0.pngbin0 -> 565 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/food/MetaItem1/1.pngbin0 -> 548 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/food/MetaItem1/2.pngbin0 -> 455 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/food/MetaItem1/3.pngbin0 -> 556 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/food/MetaItem1/4.pngbin0 -> 453 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/food/MetaItem1/5.pngbin0 -> 447 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/food/MetaItem1/6.pngbin0 -> 402 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/food/MetaItem1/7.pngbin0 -> 562 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/food/MetaItem1/8.pngbin0 -> 447 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/processing/MilledOre/milled.pngbin0 -> 595 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/processing/MilledOre/milled_OVERLAY.pngbin0 -> 437 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/science/general/MetaItem1/7.pngbin0 -> 376 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/science/general/MetaItem1/8.pngbin0 -> 492 bytes
51 files changed, 174 insertions, 1 deletions
diff --git a/src/resources/GradleStartClient.java b/src/resources/GradleStartClient.java
new file mode 100644
index 0000000000..97edde8b04
--- /dev/null
+++ b/src/resources/GradleStartClient.java
@@ -0,0 +1,103 @@
+import java.io.File;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+
+import com.google.common.base.Strings;
+
+import net.minecraftforge.gradle.GradleStartCommon;
+
+public class GradleStartClient extends GradleStart {
+
+ public static void main(String[] args) {
+
+ // hack natives.
+ try {
+ GradleStartCommon.LOGGER.info("Injecting Natives!");
+ hack();
+ GradleStartCommon.LOGGER.info("Natives Injected!");
+ // launch
+ Method launch = GradleStartCommon.class.getDeclaredMethod("launch", String[].class);
+ if (launch != null) {
+ launch.setAccessible(true);
+ GradleStart aStart = new GradleStart();
+ GradleStartCommon.LOGGER.info("Launching!");
+ launch.invoke(aStart, new Object[]{args});
+ }
+ }
+ catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+ e.printStackTrace();
+ }
+ }
+
+ private static final void hack() {
+ GradleStartCommon.LOGGER.info("[FG_1.3] Doing Classloader hack.");
+ String paths = System.getProperty("java.library.path");
+ String nativesDir = "@@NATIVESDIR@@";
+
+ if (Strings.isNullOrEmpty(paths))
+ paths = nativesDir;
+ else
+ paths += File.pathSeparator + nativesDir;
+
+ hackNativesFixed(paths);
+ //addLibraryPath(nativesDir);
+ //addLibraryPath(paths);
+ }
+
+ private static final void hackNativesFixed(String paths) {
+ System.setProperty("java.library.path", paths);
+ // hack the classloader now.
+ try
+ {
+ String aPathData = System.getProperty("java.library.path");
+ final Method initializePathMethod = ClassLoader.class.getDeclaredMethod("initializePath", String.class);
+ GradleStartCommon.LOGGER.info("[FG_1.3] Setting private method 'initializePath' to be accessible.");
+ initializePathMethod.setAccessible(true);
+ GradleStartCommon.LOGGER.info("[FG_1.3] Invoking 'initializePath' with arg 'java.library.path'.");
+ GradleStartCommon.LOGGER.info("[FG_1.3] Path Value: "+aPathData);
+ final Object usrPathsValue = initializePathMethod.invoke(null, "java.library.path");
+ final Field usrPathsField = ClassLoader.class.getDeclaredField("usr_paths");
+ GradleStartCommon.LOGGER.info("[FG_1.3] Setting private field 'usr_paths' to be accessible.");
+ usrPathsField.setAccessible(true);
+ GradleStartCommon.LOGGER.info("[FG_1.3] Injecting path data.");
+ usrPathsField.set(null, usrPathsValue);
+ GradleStartCommon.LOGGER.info("[FG_1.3] Finished Classloader hack.");
+ }
+ catch(Throwable t) {
+ GradleStartCommon.LOGGER.info("[FG_1.3] Error handling Classloader hack, printing stack trace.");
+ t.printStackTrace();
+ };
+ }
+
+ public static void addLibraryPath(String pathToAdd){
+ Field usrPathsField;
+ try {
+ usrPathsField = ClassLoader.class.getDeclaredField("usr_paths");
+ usrPathsField.setAccessible(true);
+
+ //get array of paths
+ final String[] paths = (String[])usrPathsField.get(null);
+
+ //check if the path to add is already present
+ for(String path : paths) {
+ if(path.equals(pathToAdd)) {
+ GradleStartCommon.LOGGER.info("[FG_1.3] Found existing PATH data, skipping.");
+ return;
+ }
+ }
+ GradleStartCommon.LOGGER.info("[FG_1.3] Injecting path data. ["+pathToAdd+"]");
+ //add the new path
+ final String[] newPaths = Arrays.copyOf(paths, paths.length + 1);
+ newPaths[newPaths.length-1] = pathToAdd;
+ usrPathsField.set(null, newPaths);
+ }
+ catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) {
+ GradleStartCommon.LOGGER.info("[FG_1.3] Error handling Classloader hack, printing stack trace.");
+ e.printStackTrace();
+ }
+
+ }
+
+}
diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang
index 6e1b64cc9a..8064848316 100644
--- a/src/resources/assets/miscutils/lang/en_US.lang
+++ b/src/resources/assets/miscutils/lang/en_US.lang
@@ -20,6 +20,7 @@ tile.fluidSludge.0.name=Stagnant Waste Water
//Death Messages
death.attack.plasmabolt=%s died by burning hot plasma.
death.attack.plasmabolt.player=%1$s was killed by %2$s using plasma.
+death.attack.gtpp.grinder=%s was ground into nothingness by an IsaMill.
//Alternative Materials
item.itemPlateBatteryAlloy.name=Plate of Battery Alloy
@@ -3111,5 +3112,47 @@ item.BasicAlgaeItem.4.name=Algae Spore (V)
item.BasicAlgaeItem.5.name=Algae Spore (VI)
item.BasicAlgaeItem.6.name=Algae Spore (VII)
-//Added17/01/20
+//Added 17/01/20
item.BasicGenericChemItem.6.name=Pink Metal Catalyst
+
+//Added 23/03/20
+item.BasicMetaFood.0.name=Raw Human Meat
+item.BasicMetaFood.1.name=Cooked Human Meat
+item.BasicMetaFood.2.name=Raw Horse Meat
+item.BasicMetaFood.3.name=Cooked Horse Meat
+item.BasicMetaFood.4.name=Raw Wolf Meat
+item.BasicMetaFood.5.name=Cooked Wolf Meat
+item.BasicMetaFood.6.name=Raw Ocelot Meat
+item.BasicMetaFood.7.name=Cooked Ocelot Meat
+item.BasicMetaFood.8.name=Blaze Flesh
+
+item.itemCellNaquadahFuel.name=Naquadah Fuel Cell
+item.itemCellEnrichedNaquadahFuel.name=Enriched Naquadah Fuel Cell
+item.itemCellNaquadriaFuel.name=Naquadria Fuel Cell
+item.boricacid.name=Boric Acid Cell
+item.hydrochloricacid.name=Hydrochloric Acid Cell
+
+item.BasicAlgaeItem.name=Breedable Algae
+item.BasicAlgaeItem.0.name=Breedable Algae
+item.BasicAlgaeItem.1.name=Breedable Algae
+item.BasicAlgaeItem.2.name=Breedable Algae
+item.BasicAlgaeItem.3.name=Breedable Algae
+item.BasicAlgaeItem.4.name=Breedable Algae
+item.BasicAlgaeItem.5.name=Breedable Algae
+item.BasicAlgaeItem.6.name=Breedable Algae
+
+//Added 30/03/20
+item.milledChalcopyrite.name=Milled Chalcopyrite
+item.milledSphalerite.name=Milled Sphalerite
+item.milledNickel.name=Milled Nickel
+item.milledPlatinum.name=Milled Platinum
+item.milledPentlandite.name=Milled Pentlandite
+
+item.BasicGenericChemItem.7.name=Alumina Milling Ball
+item.BasicGenericChemItem.8.name=Soapstone Milling Ball
+
+item.FrothZincflotation.name=Sphalerite Flotation Froth Cell
+item.FrothCopperflotation.name=Chalcopyrite Flotation Froth Cell
+item.FrothNickelflotation.name=Nickel Flotation Froth Cell
+item.FrothPlatinumflotation.name=Platinum Flotation Froth Cell
+item.FrothPentlanditeflotation.name=Pentlandite Flotation Froth Cell \ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GEARBOX_T1.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GEARBOX_T1.png
new file mode 100644
index 0000000000..df4e3a1a41
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GEARBOX_T1.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GRINDING_FACTORY.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GRINDING_FACTORY.png
new file mode 100644
index 0000000000..d8677eda87
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GRINDING_FACTORY.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_PIPE_T1.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_PIPE_T1.png
new file mode 100644
index 0000000000..c0065f8379
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_PIPE_T1.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/MACHINE_CASING_VENT.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/MACHINE_CASING_VENT.png
new file mode 100644
index 0000000000..6d9fb32d7e
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/MACHINE_CASING_VENT.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER1.png b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER1.png
new file mode 100644
index 0000000000..ce1c2ef3d8
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER1.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER2.png b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER2.png
new file mode 100644
index 0000000000..84e1ac6350
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER2.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER3.png b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER3.png
new file mode 100644
index 0000000000..4f716e4c61
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER3.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER4.png b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER4.png
new file mode 100644
index 0000000000..fa9e98a6f5
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER4.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER5.png b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER5.png
new file mode 100644
index 0000000000..6c05b315b6
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER5.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER6.png b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER6.png
new file mode 100644
index 0000000000..d4a3888fe5
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER6.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER7.png b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER7.png
new file mode 100644
index 0000000000..8346cccf41
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER7.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER8.png b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER8.png
new file mode 100644
index 0000000000..31bbffb4d4
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER8.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER9.png b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER9.png
new file mode 100644
index 0000000000..0858b2d399
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER9.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE1.png b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE1.png
new file mode 100644
index 0000000000..1bc399315d
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE1.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE1.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE1.png.mcmeta
new file mode 100644
index 0000000000..d746756cbd
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE1.png.mcmeta
@@ -0,0 +1,3 @@
+{
+ "animation":{}
+} \ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE2.png b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE2.png
new file mode 100644
index 0000000000..32ea4edd45
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE2.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE2.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE2.png.mcmeta
new file mode 100644
index 0000000000..d746756cbd
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE2.png.mcmeta
@@ -0,0 +1,3 @@
+{
+ "animation":{}
+} \ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE3.png b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE3.png
new file mode 100644
index 0000000000..eb530ffb75
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE3.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE3.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE3.png.mcmeta
new file mode 100644
index 0000000000..d746756cbd
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE3.png.mcmeta
@@ -0,0 +1,3 @@
+{
+ "animation":{}
+} \ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.pdn b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.pdn
new file mode 100644
index 0000000000..3c8bbeb696
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.pdn
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.png b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.png
new file mode 100644
index 0000000000..1050d78b01
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.png.mcmeta
new file mode 100644
index 0000000000..d746756cbd
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.png.mcmeta
@@ -0,0 +1,3 @@
+{
+ "animation":{}
+} \ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE5.png b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE5.png
new file mode 100644
index 0000000000..b59c940f5e
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE5.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE5.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE5.png.mcmeta
new file mode 100644
index 0000000000..d746756cbd
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE5.png.mcmeta
@@ -0,0 +1,3 @@
+{
+ "animation":{}
+} \ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE6.png b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE6.png
new file mode 100644
index 0000000000..8bde3ca423
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE6.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE6.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE6.png.mcmeta
new file mode 100644
index 0000000000..d746756cbd
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE6.png.mcmeta
@@ -0,0 +1,3 @@
+{
+ "animation":{}
+} \ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE7.png b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE7.png
new file mode 100644
index 0000000000..1b1b12db3b
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE7.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE7.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE7.png.mcmeta
new file mode 100644
index 0000000000..d746756cbd
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE7.png.mcmeta
@@ -0,0 +1,3 @@
+{
+ "animation":{}
+} \ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE8.png b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE8.png
new file mode 100644
index 0000000000..da672b0e24
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE8.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE8.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE8.png.mcmeta
new file mode 100644
index 0000000000..d746756cbd
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE8.png.mcmeta
@@ -0,0 +1,3 @@
+{
+ "animation":{}
+} \ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE9.png b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE9.png
new file mode 100644
index 0000000000..f082c94c55
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE9.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE9.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE9.png.mcmeta
new file mode 100644
index 0000000000..d746756cbd
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE9.png.mcmeta
@@ -0,0 +1,3 @@
+{
+ "animation":{}
+} \ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/151.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/151.png
new file mode 100644
index 0000000000..29ba464570
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/151.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/160.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/160.png
new file mode 100644
index 0000000000..fa7f814d3a
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/160.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/161.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/161.png
new file mode 100644
index 0000000000..673c6e011b
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/161.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/162.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/162.png
new file mode 100644
index 0000000000..65fc3f7d6e
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/162.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/food/MetaItem1/0.png b/src/resources/assets/miscutils/textures/items/food/MetaItem1/0.png
new file mode 100644
index 0000000000..944ab47126
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/food/MetaItem1/0.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/food/MetaItem1/1.png b/src/resources/assets/miscutils/textures/items/food/MetaItem1/1.png
new file mode 100644
index 0000000000..2d235ca65d
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/food/MetaItem1/1.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/food/MetaItem1/2.png b/src/resources/assets/miscutils/textures/items/food/MetaItem1/2.png
new file mode 100644
index 0000000000..ec81acba2c
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/food/MetaItem1/2.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/food/MetaItem1/3.png b/src/resources/assets/miscutils/textures/items/food/MetaItem1/3.png
new file mode 100644
index 0000000000..1fc103297a
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/food/MetaItem1/3.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/food/MetaItem1/4.png b/src/resources/assets/miscutils/textures/items/food/MetaItem1/4.png
new file mode 100644
index 0000000000..db5ddf0063
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/food/MetaItem1/4.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/food/MetaItem1/5.png b/src/resources/assets/miscutils/textures/items/food/MetaItem1/5.png
new file mode 100644
index 0000000000..2497c88e2d
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/food/MetaItem1/5.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/food/MetaItem1/6.png b/src/resources/assets/miscutils/textures/items/food/MetaItem1/6.png
new file mode 100644
index 0000000000..083db84ef1
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/food/MetaItem1/6.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/food/MetaItem1/7.png b/src/resources/assets/miscutils/textures/items/food/MetaItem1/7.png
new file mode 100644
index 0000000000..27927d0db6
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/food/MetaItem1/7.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/food/MetaItem1/8.png b/src/resources/assets/miscutils/textures/items/food/MetaItem1/8.png
new file mode 100644
index 0000000000..7013c41d6b
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/food/MetaItem1/8.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/processing/MilledOre/milled.png b/src/resources/assets/miscutils/textures/items/processing/MilledOre/milled.png
new file mode 100644
index 0000000000..2c56204a7e
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/processing/MilledOre/milled.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/processing/MilledOre/milled_OVERLAY.png b/src/resources/assets/miscutils/textures/items/processing/MilledOre/milled_OVERLAY.png
new file mode 100644
index 0000000000..cfec0f5d8e
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/processing/MilledOre/milled_OVERLAY.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/7.png b/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/7.png
new file mode 100644
index 0000000000..985954250c
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/7.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/8.png b/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/8.png
new file mode 100644
index 0000000000..9b857a9277
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/8.png
Binary files differ