From 82bd52008b663bd38e96472c5d12a3db8bca63b3 Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Wed, 9 Jan 2019 19:17:23 +0100 Subject: Bio Cultre System! -Added the Bio Cultre System -Added the Bio Vat, Bio Lab and custom Glas types -Updated Copyright on the Files -Added a shitton of ressources -Added an API to for the Bio Cultre System -Added a Phyton Script for the ease of adding Glas Types to the Bio Vat -Fixed Spawning on custom blocks -Fixed Nuggets giving out boni in the windmill -Fixed tooltip again for the Windmill -Added dimensionsIDs to the BlockCoord class -Added apiJar, sourceJar, devJar to the grandlew output --- .../resources/assets/bartworks/lang/en_US.lang | 27 +++++++++++++++++++-- .../assets/bartworks/textures/GUI/GUI_RSC.png | Bin 0 -> 2599 bytes .../assets/bartworks/textures/GUI/RadHatch.png | Bin 0 -> 2270 bytes .../textures/blocks/BoronSilicateGlassBlock.png | Bin 0 -> 177 bytes .../blocks/BoronSilicateGlassBlockRand.png | Bin 0 -> 184 bytes .../ChromeReinforcedBoronSilicateGlassBlock.png | Bin 0 -> 199 bytes .../IridiumReinforcedBoronSilicateGlassBlock.png | Bin 0 -> 196 bytes .../NickelReinforcedBoronSilicateGlassBlock.png | Bin 0 -> 201 bytes .../OsmiumReinforcedBoronSilicateGlassBlock.png | Bin 0 -> 211 bytes .../TungstenReinforcedBoronSilicateGlassBlock.png | Bin 0 -> 198 bytes .../assets/bartworks/textures/blocks/brick.png | Bin 506 -> 0 bytes .../assets/bartworks/textures/items/Agarose.png | Bin 0 -> 259 bytes .../items/ClonalCellularSynthesisModule.png | Bin 0 -> 481 bytes .../textures/items/DNAExtractionModule.png | Bin 0 -> 525 bytes .../bartworks/textures/items/DNASampleFlask.png | Bin 0 -> 253 bytes .../bartworks/textures/items/DetergentPowder.png | Bin 0 -> 261 bytes .../bartworks/textures/items/IncubationModule.png | Bin 0 -> 623 bytes .../textures/items/PCRThermoclyclingModule.png | Bin 0 -> 566 bytes .../bartworks/textures/items/PlasmaMembrane.png | Bin 0 -> 2522 bytes .../bartworks/textures/items/PlasmidCell.png | Bin 0 -> 288 bytes .../textures/items/PlasmidSynthesisModule.png | Bin 0 -> 499 bytes .../textures/items/TransformationModule.png | Bin 0 -> 529 bytes .../assets/bartworks/textures/items/petriDish.png | Bin 0 -> 3033 bytes .../textures/GUI/basicmachines/BW.GUI.BioLab.png | Bin 0 -> 3151 bytes 24 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/bartworks/textures/GUI/GUI_RSC.png create mode 100644 src/main/resources/assets/bartworks/textures/GUI/RadHatch.png create mode 100644 src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock.png create mode 100644 src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRand.png create mode 100644 src/main/resources/assets/bartworks/textures/blocks/ChromeReinforcedBoronSilicateGlassBlock.png create mode 100644 src/main/resources/assets/bartworks/textures/blocks/IridiumReinforcedBoronSilicateGlassBlock.png create mode 100644 src/main/resources/assets/bartworks/textures/blocks/NickelReinforcedBoronSilicateGlassBlock.png create mode 100644 src/main/resources/assets/bartworks/textures/blocks/OsmiumReinforcedBoronSilicateGlassBlock.png create mode 100644 src/main/resources/assets/bartworks/textures/blocks/TungstenReinforcedBoronSilicateGlassBlock.png delete mode 100644 src/main/resources/assets/bartworks/textures/blocks/brick.png create mode 100644 src/main/resources/assets/bartworks/textures/items/Agarose.png create mode 100644 src/main/resources/assets/bartworks/textures/items/ClonalCellularSynthesisModule.png create mode 100644 src/main/resources/assets/bartworks/textures/items/DNAExtractionModule.png create mode 100644 src/main/resources/assets/bartworks/textures/items/DNASampleFlask.png create mode 100644 src/main/resources/assets/bartworks/textures/items/DetergentPowder.png create mode 100644 src/main/resources/assets/bartworks/textures/items/IncubationModule.png create mode 100644 src/main/resources/assets/bartworks/textures/items/PCRThermoclyclingModule.png create mode 100644 src/main/resources/assets/bartworks/textures/items/PlasmaMembrane.png create mode 100644 src/main/resources/assets/bartworks/textures/items/PlasmidCell.png create mode 100644 src/main/resources/assets/bartworks/textures/items/PlasmidSynthesisModule.png create mode 100644 src/main/resources/assets/bartworks/textures/items/TransformationModule.png create mode 100644 src/main/resources/assets/bartworks/textures/items/petriDish.png create mode 100644 src/main/resources/assets/gregtech/textures/GUI/basicmachines/BW.GUI.BioLab.png (limited to 'src/main/resources') diff --git a/src/main/resources/assets/bartworks/lang/en_US.lang b/src/main/resources/assets/bartworks/lang/en_US.lang index 400cf182fc..cdcef27970 100644 --- a/src/main/resources/assets/bartworks/lang/en_US.lang +++ b/src/main/resources/assets/bartworks/lang/en_US.lang @@ -1,3 +1,4 @@ +itemGroup.GT2C=Gregtech 2 Compat item.GT_Rockcutter_Item_LV.name=Rockcutter LV item.GT_Rockcutter_Item_MV.name=Rockcutter MV item.GT_Rockcutter_Item_HV.name=Rockcutter HV @@ -5,7 +6,7 @@ item.GT_Teslastaff_Item.name=Teslastaff BW_ItemBlocks.0.name=Etched Lapis Cell BW_ItemBlocks.1.name=Plated Lapis Cell GT_LESU_CASING.0.name=LESU Casing -itemGroup.GT2C=Gregtech 2 Compat + itemGroup.bartworks=BartWorks Inter Temporal BW_Machinery_Casings.0.name=Nickel-Zinc Ferrite Block BW_Machinery_Casings.1.name=Transformer-Winding Block @@ -20,4 +21,26 @@ item.completed_grindstone.name=Grindstone item.rotors.leatherParts.name=Leather Covered Wood Frame item.rotors.woolParts.name=Wool Covered Wood Frame item.rotors.paperParts.name=Paper Covered Wood Frame -item.rotors.combinedParts.name=Multiple Material Covered Wood Frame \ No newline at end of file +item.rotors.combinedParts.name=Multiple Material Covered Wood Frame + +itemGroup.BioTab=BartWorks BioEngineering +filled.item.petriDish.name=Petri Dish with a Culture +item.petriDish.name=Sterilized Petri Dish +item.DNASampleFlask.name=DNA Sample Flask +item.PlasmidCell.name=Plasmid Sample Flask +item.DetergentPowder.name=Detergent Powder +item.Agarose.name=Agarose +item.IncubationModule.name=Incubation Module +item.Cells.name=Bacterial Cells +item.PlasmaMembrane.name=Plasma Membrane +labModule.item.DNAExtractionModule.name=DNA Extraction Module +labModule.item.PCRThermoclyclingModule.name=PCR Thermoclycle Module +labModule.item.PlasmidSynthesisModule.name=Plasmid Synthesis Module +labModule.item.TransformationModule.name=Transformation Module +labModule.item.ClonalCellularSynthesisModule.name=Clonal Cellular Synthesis Module +BW_GlasBlocks.0.name=Borosilicate Glass Blocks +BW_GlasBlocks.1.name=Nickel Reinforced Boroilicate GlassBlock +BW_GlasBlocks.2.name=Tungsten Reinforced Boroilicate GlassBlock +BW_GlasBlocks.3.name=Chrome Reinforced Boroilicate GlassBlock +BW_GlasBlocks.4.name=Iridium Reinforced Boroilicate GlassBlock +BW_GlasBlocks.5.name=Osmium Reinforced Boroilicate GlassBlock \ No newline at end of file diff --git a/src/main/resources/assets/bartworks/textures/GUI/GUI_RSC.png b/src/main/resources/assets/bartworks/textures/GUI/GUI_RSC.png new file mode 100644 index 0000000000..065a6fa929 Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/GUI/GUI_RSC.png differ diff --git a/src/main/resources/assets/bartworks/textures/GUI/RadHatch.png b/src/main/resources/assets/bartworks/textures/GUI/RadHatch.png new file mode 100644 index 0000000000..1950ff0985 Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/GUI/RadHatch.png differ diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock.png new file mode 100644 index 0000000000..4ea5e5973f Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock.png differ diff --git a/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRand.png b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRand.png new file mode 100644 index 0000000000..0e27ddbb62 Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRand.png differ diff --git a/src/main/resources/assets/bartworks/textures/blocks/ChromeReinforcedBoronSilicateGlassBlock.png b/src/main/resources/assets/bartworks/textures/blocks/ChromeReinforcedBoronSilicateGlassBlock.png new file mode 100644 index 0000000000..213f8feafd Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/blocks/ChromeReinforcedBoronSilicateGlassBlock.png differ diff --git a/src/main/resources/assets/bartworks/textures/blocks/IridiumReinforcedBoronSilicateGlassBlock.png b/src/main/resources/assets/bartworks/textures/blocks/IridiumReinforcedBoronSilicateGlassBlock.png new file mode 100644 index 0000000000..9a87942ef9 Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/blocks/IridiumReinforcedBoronSilicateGlassBlock.png differ diff --git a/src/main/resources/assets/bartworks/textures/blocks/NickelReinforcedBoronSilicateGlassBlock.png b/src/main/resources/assets/bartworks/textures/blocks/NickelReinforcedBoronSilicateGlassBlock.png new file mode 100644 index 0000000000..9ab096b467 Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/blocks/NickelReinforcedBoronSilicateGlassBlock.png differ diff --git a/src/main/resources/assets/bartworks/textures/blocks/OsmiumReinforcedBoronSilicateGlassBlock.png b/src/main/resources/assets/bartworks/textures/blocks/OsmiumReinforcedBoronSilicateGlassBlock.png new file mode 100644 index 0000000000..e5be40d5ff Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/blocks/OsmiumReinforcedBoronSilicateGlassBlock.png differ diff --git a/src/main/resources/assets/bartworks/textures/blocks/TungstenReinforcedBoronSilicateGlassBlock.png b/src/main/resources/assets/bartworks/textures/blocks/TungstenReinforcedBoronSilicateGlassBlock.png new file mode 100644 index 0000000000..b3823b02fc Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/blocks/TungstenReinforcedBoronSilicateGlassBlock.png differ diff --git a/src/main/resources/assets/bartworks/textures/blocks/brick.png b/src/main/resources/assets/bartworks/textures/blocks/brick.png deleted file mode 100644 index fd6959c2f5..0000000000 Binary files a/src/main/resources/assets/bartworks/textures/blocks/brick.png and /dev/null differ diff --git a/src/main/resources/assets/bartworks/textures/items/Agarose.png b/src/main/resources/assets/bartworks/textures/items/Agarose.png new file mode 100644 index 0000000000..fe6add0bb0 Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/items/Agarose.png differ diff --git a/src/main/resources/assets/bartworks/textures/items/ClonalCellularSynthesisModule.png b/src/main/resources/assets/bartworks/textures/items/ClonalCellularSynthesisModule.png new file mode 100644 index 0000000000..a420873554 Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/items/ClonalCellularSynthesisModule.png differ diff --git a/src/main/resources/assets/bartworks/textures/items/DNAExtractionModule.png b/src/main/resources/assets/bartworks/textures/items/DNAExtractionModule.png new file mode 100644 index 0000000000..99dc1c9b95 Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/items/DNAExtractionModule.png differ diff --git a/src/main/resources/assets/bartworks/textures/items/DNASampleFlask.png b/src/main/resources/assets/bartworks/textures/items/DNASampleFlask.png new file mode 100644 index 0000000000..69c6c649b9 Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/items/DNASampleFlask.png differ diff --git a/src/main/resources/assets/bartworks/textures/items/DetergentPowder.png b/src/main/resources/assets/bartworks/textures/items/DetergentPowder.png new file mode 100644 index 0000000000..92fe5e9d81 Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/items/DetergentPowder.png differ diff --git a/src/main/resources/assets/bartworks/textures/items/IncubationModule.png b/src/main/resources/assets/bartworks/textures/items/IncubationModule.png new file mode 100644 index 0000000000..e0ea17749d Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/items/IncubationModule.png differ diff --git a/src/main/resources/assets/bartworks/textures/items/PCRThermoclyclingModule.png b/src/main/resources/assets/bartworks/textures/items/PCRThermoclyclingModule.png new file mode 100644 index 0000000000..c0e5b9a822 Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/items/PCRThermoclyclingModule.png differ diff --git a/src/main/resources/assets/bartworks/textures/items/PlasmaMembrane.png b/src/main/resources/assets/bartworks/textures/items/PlasmaMembrane.png new file mode 100644 index 0000000000..f51730a7af Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/items/PlasmaMembrane.png differ diff --git a/src/main/resources/assets/bartworks/textures/items/PlasmidCell.png b/src/main/resources/assets/bartworks/textures/items/PlasmidCell.png new file mode 100644 index 0000000000..680963b8ab Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/items/PlasmidCell.png differ diff --git a/src/main/resources/assets/bartworks/textures/items/PlasmidSynthesisModule.png b/src/main/resources/assets/bartworks/textures/items/PlasmidSynthesisModule.png new file mode 100644 index 0000000000..9c20f554e7 Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/items/PlasmidSynthesisModule.png differ diff --git a/src/main/resources/assets/bartworks/textures/items/TransformationModule.png b/src/main/resources/assets/bartworks/textures/items/TransformationModule.png new file mode 100644 index 0000000000..36b8a44f4d Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/items/TransformationModule.png differ diff --git a/src/main/resources/assets/bartworks/textures/items/petriDish.png b/src/main/resources/assets/bartworks/textures/items/petriDish.png new file mode 100644 index 0000000000..4b151f9be8 Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/items/petriDish.png differ diff --git a/src/main/resources/assets/gregtech/textures/GUI/basicmachines/BW.GUI.BioLab.png b/src/main/resources/assets/gregtech/textures/GUI/basicmachines/BW.GUI.BioLab.png new file mode 100644 index 0000000000..fb9c0e113c Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/GUI/basicmachines/BW.GUI.BioLab.png differ -- cgit