From f39e8134fcef5da8bd04503c5233b2b6de249b3a Mon Sep 17 00:00:00 2001 From: Alkalus Date: Sat, 28 Mar 2020 02:09:24 +0000 Subject: + Added more 'Special Behaviour' items for my multiblocks as Examples. + Added '/gtpp hand' command. + Added TungstenSteel & Neutronium tool variants to NEI while in dev. + Added Large Semifluid Generator and a crafting recipe for it. + Added Placeholder for Adv. Assembly Line. + Added Distillus Upgrade Chip and a crafting recipe for it. % Updated build.gradle. % Reworked a few recipes. $ Fixed ULV Overflow Covers using 0L Water in assembler. (https://github.com/GTNewHorizons/NewHorizons/issues/5700) $ Fixed Integral Encasement I using 0L Steel in assembler. (https://github.com/GTNewHorizons/NewHorizons/issues/5617) $ Fixed Thaumcraft based FakePlayer's triggering Fluorite drops. (https://github.com/GTNewHorizons/NewHorizons/issues/5744) $ Fixed bad handling of hatch textures on a few multiblocks. $ Semi-Fixed Distillus. $ Fixed Semifluid Generator recipes. $ Fixed Semifluid Generators crashing the game when mined. $ Fixed bad handling of calls to ItemList.java. $ Began work fixing all ASM to be more compatible with ProGuard. $ Fixed compiler complaining about varargs. ^ Bumped version to 1.7.05.x. --- .../miscutils/textures/items/MU-metaitem.01/151.png | Bin 0 -> 335 bytes .../miscutils/textures/items/MU-metaitem.01/160.png | Bin 0 -> 459 bytes .../miscutils/textures/items/MU-metaitem.01/161.png | Bin 0 -> 455 bytes .../miscutils/textures/items/MU-metaitem.01/162.png | Bin 0 -> 455 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/resources/assets/miscutils/textures/items/MU-metaitem.01/151.png create mode 100644 src/resources/assets/miscutils/textures/items/MU-metaitem.01/160.png create mode 100644 src/resources/assets/miscutils/textures/items/MU-metaitem.01/161.png create mode 100644 src/resources/assets/miscutils/textures/items/MU-metaitem.01/162.png (limited to 'src/resources/assets/miscutils') 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/151.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/160.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/161.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/162.png differ -- cgit From 254f1af84f1a673523aa936acada7d5b1c1a91c3 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Sat, 28 Mar 2020 14:36:57 +0000 Subject: + Added some new food items. --- src/resources/assets/miscutils/lang/en_US.lang | 11 +++++++++++ .../assets/miscutils/textures/items/food/MetaItem1/0.png | Bin 0 -> 565 bytes .../assets/miscutils/textures/items/food/MetaItem1/1.png | Bin 0 -> 548 bytes .../assets/miscutils/textures/items/food/MetaItem1/2.png | Bin 0 -> 455 bytes .../assets/miscutils/textures/items/food/MetaItem1/3.png | Bin 0 -> 556 bytes .../assets/miscutils/textures/items/food/MetaItem1/4.png | Bin 0 -> 392 bytes .../assets/miscutils/textures/items/food/MetaItem1/5.png | Bin 0 -> 447 bytes .../assets/miscutils/textures/items/food/MetaItem1/6.png | Bin 0 -> 402 bytes .../assets/miscutils/textures/items/food/MetaItem1/7.png | Bin 0 -> 562 bytes .../assets/miscutils/textures/items/food/MetaItem1/8.png | Bin 0 -> 447 bytes 10 files changed, 11 insertions(+) create mode 100644 src/resources/assets/miscutils/textures/items/food/MetaItem1/0.png create mode 100644 src/resources/assets/miscutils/textures/items/food/MetaItem1/1.png create mode 100644 src/resources/assets/miscutils/textures/items/food/MetaItem1/2.png create mode 100644 src/resources/assets/miscutils/textures/items/food/MetaItem1/3.png create mode 100644 src/resources/assets/miscutils/textures/items/food/MetaItem1/4.png create mode 100644 src/resources/assets/miscutils/textures/items/food/MetaItem1/5.png create mode 100644 src/resources/assets/miscutils/textures/items/food/MetaItem1/6.png create mode 100644 src/resources/assets/miscutils/textures/items/food/MetaItem1/7.png create mode 100644 src/resources/assets/miscutils/textures/items/food/MetaItem1/8.png (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 6e1b64cc9a..7713e74566 100644 --- a/src/resources/assets/miscutils/lang/en_US.lang +++ b/src/resources/assets/miscutils/lang/en_US.lang @@ -3113,3 +3113,14 @@ item.BasicAlgaeItem.6.name=Algae Spore (VII) //Added17/01/20 item.BasicGenericChemItem.6.name=Pink Metal Catalyst + +//Added23/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 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/food/MetaItem1/0.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/food/MetaItem1/1.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/food/MetaItem1/2.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/food/MetaItem1/3.png 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..f32a00069e Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/food/MetaItem1/4.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/food/MetaItem1/5.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/food/MetaItem1/6.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/food/MetaItem1/7.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/food/MetaItem1/8.png differ -- cgit From a3c8210a4318f34cbe46306cb1c829f41650515d Mon Sep 17 00:00:00 2001 From: Alkalus Date: Sat, 28 Mar 2020 20:32:11 +0000 Subject: + Added Materials for the new LNR fuels. + Added a new casing block class for special handled multiblock casings. + Added locale for Naq Fuel Cells. $ Reworked TAE. There are now 19 texture slots free out of the 64 total. $ Fixed a minor bug in the update checker. --- src/resources/assets/miscutils/lang/en_US.lang | 4 ++++ .../miscutils/textures/items/food/MetaItem1/4.png | Bin 392 -> 453 bytes 2 files changed, 4 insertions(+) (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 7713e74566..274fb8f36e 100644 --- a/src/resources/assets/miscutils/lang/en_US.lang +++ b/src/resources/assets/miscutils/lang/en_US.lang @@ -3124,3 +3124,7 @@ 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 \ No newline at end of file diff --git a/src/resources/assets/miscutils/textures/items/food/MetaItem1/4.png b/src/resources/assets/miscutils/textures/items/food/MetaItem1/4.png index f32a00069e..db5ddf0063 100644 Binary files a/src/resources/assets/miscutils/textures/items/food/MetaItem1/4.png and b/src/resources/assets/miscutils/textures/items/food/MetaItem1/4.png differ -- cgit From 8e95eb1c0876f55d9568d704d150a8c38b1c5316 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Sun, 29 Mar 2020 00:14:36 +0000 Subject: % Moved Rocket Fuel production to the Chem Plant. % Adjusted Rocket Fuel recipe values a bit. % Localised a few things. --- src/resources/assets/miscutils/lang/en_US.lang | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (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 274fb8f36e..bab8719f93 100644 --- a/src/resources/assets/miscutils/lang/en_US.lang +++ b/src/resources/assets/miscutils/lang/en_US.lang @@ -3127,4 +3127,14 @@ 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 \ No newline at end of file +item.itemCellNaquadriaFuel.name=Naquadria Fuel Cell +item.boricacid.name=Boric Acid Cell +item.hydrochloricacid.name=Hydrochloric Acid Cell + +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 \ No newline at end of file -- cgit From 0fd60ac639521d74f0026505c8f2c8db13750ae5 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Sun, 29 Mar 2020 04:35:20 +0100 Subject: + Added code to remove GT recipes for rocket_fuel and 1,1dimethylhydrazine. % Made Formaldehyde Catalyst handled correctly in Chemical Plant. --- src/resources/assets/miscutils/lang/en_US.lang | 1 + 1 file changed, 1 insertion(+) (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 bab8719f93..329e665b26 100644 --- a/src/resources/assets/miscutils/lang/en_US.lang +++ b/src/resources/assets/miscutils/lang/en_US.lang @@ -3131,6 +3131,7 @@ 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 -- cgit From b5cbe510e959ae0fe8803b5df1031f2752c50e30 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Mon, 30 Mar 2020 15:56:40 +0100 Subject: + Added IsaMill. + Added repackaged Sun classes. + Added Milled ores. + Added Milling Balls. $ Disabled Hand-pump pumping from non-GT tile entities. > Maybe did other things, but in a hurry to commit. --- src/resources/assets/miscutils/lang/en_US.lang | 10 +++++++--- .../blocks/TileEntities/MACHINE_CASING_GEARBOX_T1.png | Bin 0 -> 633 bytes .../TileEntities/MACHINE_CASING_GRINDING_FACTORY.png | Bin 0 -> 671 bytes .../blocks/TileEntities/MACHINE_CASING_PIPE_T1.png | Bin 0 -> 598 bytes .../TileEntities/RoundRobinator/MACHINE_CASING_VENT.png | Bin 0 -> 467 bytes .../textures/blocks/iconsets/Grinder/GRINDER1.png | Bin 0 -> 647 bytes .../textures/blocks/iconsets/Grinder/GRINDER2.png | Bin 0 -> 541 bytes .../textures/blocks/iconsets/Grinder/GRINDER3.png | Bin 0 -> 663 bytes .../textures/blocks/iconsets/Grinder/GRINDER4.png | Bin 0 -> 533 bytes .../textures/blocks/iconsets/Grinder/GRINDER5.png | Bin 0 -> 271 bytes .../textures/blocks/iconsets/Grinder/GRINDER6.png | Bin 0 -> 526 bytes .../textures/blocks/iconsets/Grinder/GRINDER7.png | Bin 0 -> 665 bytes .../textures/blocks/iconsets/Grinder/GRINDER8.png | Bin 0 -> 528 bytes .../textures/blocks/iconsets/Grinder/GRINDER9.png | Bin 0 -> 625 bytes .../textures/blocks/iconsets/Grinder/GRINDER_ACTIVE1.png | Bin 0 -> 748 bytes .../blocks/iconsets/Grinder/GRINDER_ACTIVE1.png.mcmeta | 3 +++ .../textures/blocks/iconsets/Grinder/GRINDER_ACTIVE2.png | Bin 0 -> 766 bytes .../blocks/iconsets/Grinder/GRINDER_ACTIVE2.png.mcmeta | 3 +++ .../textures/blocks/iconsets/Grinder/GRINDER_ACTIVE3.png | Bin 0 -> 849 bytes .../blocks/iconsets/Grinder/GRINDER_ACTIVE3.png.mcmeta | 3 +++ .../textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.pdn | Bin 0 -> 5038 bytes .../textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.png | Bin 0 -> 897 bytes .../blocks/iconsets/Grinder/GRINDER_ACTIVE4.png.mcmeta | 3 +++ .../textures/blocks/iconsets/Grinder/GRINDER_ACTIVE5.png | Bin 0 -> 464 bytes .../blocks/iconsets/Grinder/GRINDER_ACTIVE5.png.mcmeta | 3 +++ .../textures/blocks/iconsets/Grinder/GRINDER_ACTIVE6.png | Bin 0 -> 971 bytes .../blocks/iconsets/Grinder/GRINDER_ACTIVE6.png.mcmeta | 3 +++ .../textures/blocks/iconsets/Grinder/GRINDER_ACTIVE7.png | Bin 0 -> 768 bytes .../blocks/iconsets/Grinder/GRINDER_ACTIVE7.png.mcmeta | 3 +++ .../textures/blocks/iconsets/Grinder/GRINDER_ACTIVE8.png | Bin 0 -> 757 bytes .../blocks/iconsets/Grinder/GRINDER_ACTIVE8.png.mcmeta | 3 +++ .../textures/blocks/iconsets/Grinder/GRINDER_ACTIVE9.png | Bin 0 -> 747 bytes .../blocks/iconsets/Grinder/GRINDER_ACTIVE9.png.mcmeta | 3 +++ .../textures/items/processing/MilledOre/milled.png | Bin 0 -> 595 bytes .../items/processing/MilledOre/milled_OVERLAY.png | Bin 0 -> 437 bytes .../textures/items/science/general/MetaItem1/7.png | Bin 0 -> 376 bytes .../textures/items/science/general/MetaItem1/8.png | Bin 0 -> 492 bytes 37 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GEARBOX_T1.png create mode 100644 src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GRINDING_FACTORY.png create mode 100644 src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_PIPE_T1.png create mode 100644 src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/MACHINE_CASING_VENT.png create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER1.png create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER2.png create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER3.png create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER4.png create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER5.png create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER6.png create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER7.png create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER8.png create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER9.png create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE1.png create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE1.png.mcmeta create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE2.png create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE2.png.mcmeta create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE3.png create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE3.png.mcmeta create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.pdn create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.png create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.png.mcmeta create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE5.png create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE5.png.mcmeta create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE6.png create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE6.png.mcmeta create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE7.png create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE7.png.mcmeta create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE8.png create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE8.png.mcmeta create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE9.png create mode 100644 src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE9.png.mcmeta create mode 100644 src/resources/assets/miscutils/textures/items/processing/MilledOre/milled.png create mode 100644 src/resources/assets/miscutils/textures/items/processing/MilledOre/milled_OVERLAY.png create mode 100644 src/resources/assets/miscutils/textures/items/science/general/MetaItem1/7.png create mode 100644 src/resources/assets/miscutils/textures/items/science/general/MetaItem1/8.png (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 329e665b26..a63c57f44c 100644 --- a/src/resources/assets/miscutils/lang/en_US.lang +++ b/src/resources/assets/miscutils/lang/en_US.lang @@ -3111,10 +3111,10 @@ 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 -//Added23/03/20 +//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 @@ -3138,4 +3138,8 @@ 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 \ No newline at end of file +item.BasicAlgaeItem.6.name=Breedable Algae + +//Added 30/03/20 +item.BasicGenericChemItem.7.name=Alumina Milling Ball +item.BasicGenericChemItem.8.name=Soapstone Milling Ball \ 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GEARBOX_T1.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GRINDING_FACTORY.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_PIPE_T1.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/MACHINE_CASING_VENT.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER1.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER2.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER3.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER4.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER5.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER6.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER7.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER8.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER9.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE1.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE2.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE3.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.pdn 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE5.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE6.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE7.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE8.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE9.png 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/processing/MilledOre/milled.png b/src/resources/assets/miscutils/textures/items/processing/MilledOre/milled.png new file mode 100644 index 0000000000..2c56204a7e Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/processing/MilledOre/milled.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/processing/MilledOre/milled_OVERLAY.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/7.png 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 Binary files /dev/null and b/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/8.png differ -- cgit From 75ea33600537047847091b55a46f5b88c3c75dbb Mon Sep 17 00:00:00 2001 From: Alkalus Date: Tue, 31 Mar 2020 01:25:58 +0100 Subject: + Added Custom NEI Handler for IsaMIll. + Added Death by IsaMIll. % Moved debug mode switch to AsmConfig. $ Fixed handling of custom OrePrefixes. $ Fixed OreDict registration of MetaFoodItems. $ Improved handling of Core Classes being static initialised too early. $ Fixed client-side bug in Distillus which would cause an infinite loop. $ Fixed bug in ForgeEnumHelper. $ Fixed bug in setField methods from ReflectionUtils. --- src/resources/assets/miscutils/lang/en_US.lang | 3 +++ 1 file changed, 3 insertions(+) (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 a63c57f44c..e358c2d272 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 @@ -3141,5 +3142,7 @@ 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.BasicGenericChemItem.7.name=Alumina Milling Ball item.BasicGenericChemItem.8.name=Soapstone Milling Ball \ No newline at end of file -- cgit From d58dc988a2d378cf9c5544f037f074cba169c5f4 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Tue, 31 Mar 2020 03:31:19 +0100 Subject: + Added NitroBenzene to the Gas Turbine fuel list. (Up for balance) + Added recipes for both grinding balls. + Added more milling chains. + Added two advanced recipes for obtaining Nitric Acid. + Added Nitric Oxide and recipes if it doesn't exist. + Added Nitrogen Dioxide and recipes if it doesn't exist. % Changed recipe for Nitrogen Tetroxide. % Adjusted recipe for Th232 again. % Changed Rocket Fuels slightly once more, swapped T3 and T4 fuels back. (Accidentally did them backwards in my last update) --- src/resources/assets/miscutils/lang/en_US.lang | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (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 e358c2d272..8064848316 100644 --- a/src/resources/assets/miscutils/lang/en_US.lang +++ b/src/resources/assets/miscutils/lang/en_US.lang @@ -3144,5 +3144,15 @@ 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 \ No newline at end of file +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 -- cgit