diff options
Diffstat (limited to 'src/main/resources')
44 files changed, 75 insertions, 8 deletions
diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index e764d6128b..c24d8dd8a6 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -230,6 +230,14 @@ gt.recipe.largeboilerfakefuels=Large Boiler gt.recipe.nanoforge=Nano Forge gt.recipe.pcbfactory=PCB Factory gt.recipe.ic2nuke=Nuclear Fission +gt.recipe.purificationplantclarifier=Clarifier +gt.recipe.purificationplantflocculation=Flocculation +gt.recipe.purificationplantphadjustment=pH Neutralization +gt.recipe.purificationplantozonation=Ozonation +gt.recipe.purificationplantplasmaheating=Temperature Fluctuation +gt.recipe.purificationplantuvtreatment=High Energy Laser Treatment +gt.recipe.purificationplantdegasifier=Degassing +gt.recipe.purificationplantquarkextractor=Baryonic Perfection # Recipe categories gt.recipe.category.arc_furnace_recycling=Arc Furnace Recycling @@ -538,14 +546,15 @@ GT5U.gui.text.drone_operating=§aDrone operating normally! GT5U.gui.text.drone_title=Drone Control Centre GT5U.gui.text.drone_custom_name=Custom Machine Name GT5U.gui.text.drone_search=Search machine name -GT5U.gui.text.out_of_fluid=§cNo following fluids supplied: §b%s§f x §6%s L -GT5U.gui.text.out_of_item=§cNo following items supplied: §b%s§f x §6%s -GT5U.gui.text.out_of_stuff=§cNo following stuffs supplied: §b%s§f x §6%s -GT5U.gui.text.power_loss=§cShut down due to power loss. -GT5U.gui.text.pollution_fail=§cFailed to output the pollution. -GT5U.gui.text.structure_incomplete=§7Shut down due to incomplete structure. -GT5U.gui.text.no_repair=§7Shut down due to machine damage. -GT5U.gui.text.no_machine_part=§7No correct machine part in controller slot. +GT5U.gui.text.out_of_fluid=§4No following fluids supplied: §b%s§f x §6%s L +GT5U.gui.text.out_of_item=§4No following items supplied: §b%s§f x §6%s +GT5U.gui.text.out_of_stuff=§4No following stuffs supplied: §b%s§f x §6%s +GT5U.gui.text.power_loss=§4Shut down due to power loss. +GT5U.gui.text.pollution_fail=§4Failed to output the pollution. +GT5U.gui.text.structure_incomplete=§4Shut down due to incomplete structure. +GT5U.gui.text.no_repair=§4Shut down due to machine damage. +GT5U.gui.text.no_machine_part=No correct machine part in controller slot. +GT5U.gui.text.ph_sensor=pH threshold GT5U.item.programmed_circuit.select.header=Reprogram Circuit diff --git a/src/main/resources/assets/gregtech/sounds.json b/src/main/resources/assets/gregtech/sounds.json index 06245db1a1..2d33d116da 100644 --- a/src/main/resources/assets/gregtech/sounds.json +++ b/src/main/resources/assets/gregtech/sounds.json @@ -70,5 +70,58 @@ "stream": false } ] + }, + "machines.PurificationPlantLoop": { + "category": "block", + "sounds": [ + { + "name": "PurificationPlantLoop", + "stream": false + } + ] + }, + "machines.PurificationPhLoop": { + "category": "block", + "sounds": [ + { + "name": "PurificationPhLoop", + "stream": false + } + ] + }, + "machines.PurificationCoagulationLoop": { + "category": "block", + "sounds": [ + { + "name": "PurificationCoagulationLoop", + "stream": false + } + ] + }, + "machines.PurificationOzonationLoop": { + "category": "block", + "sounds": [ + { + "name": "PurificationOzonationLoop", + "stream": false, + "licensing": { + "sound_url": "https://freesound.org/people/MattJ99/sounds/66787/", + "sound_name": "bubbling02.wav", + "author_url": "https://freesound.org/people/MattJ99/", + "author_name": "MattJ99", + "license_url": "http://creativecommons.org/licenses/by/3.0/", + "license_name": "Attribution 3.0" + } + } + ] + }, + "machines.PurificationPlasmaLoop": { + "category": "block", + "sounds": [ + { + "name": "PurificationPlasmaLoop", + "stream": false + } + ] } } diff --git a/src/main/resources/assets/gregtech/sounds/PurificationCoagulationLoop.ogg b/src/main/resources/assets/gregtech/sounds/PurificationCoagulationLoop.ogg Binary files differnew file mode 100644 index 0000000000..923c1eb2e8 --- /dev/null +++ b/src/main/resources/assets/gregtech/sounds/PurificationCoagulationLoop.ogg diff --git a/src/main/resources/assets/gregtech/sounds/PurificationOzonationLoop.ogg b/src/main/resources/assets/gregtech/sounds/PurificationOzonationLoop.ogg Binary files differnew file mode 100644 index 0000000000..5aaee8983e --- /dev/null +++ b/src/main/resources/assets/gregtech/sounds/PurificationOzonationLoop.ogg diff --git a/src/main/resources/assets/gregtech/sounds/PurificationPhLoop.ogg b/src/main/resources/assets/gregtech/sounds/PurificationPhLoop.ogg Binary files differnew file mode 100644 index 0000000000..4d40d014c0 --- /dev/null +++ b/src/main/resources/assets/gregtech/sounds/PurificationPhLoop.ogg diff --git a/src/main/resources/assets/gregtech/sounds/PurificationPlantLoop.ogg b/src/main/resources/assets/gregtech/sounds/PurificationPlantLoop.ogg Binary files differnew file mode 100644 index 0000000000..9bdb5e991a --- /dev/null +++ b/src/main/resources/assets/gregtech/sounds/PurificationPlantLoop.ogg diff --git a/src/main/resources/assets/gregtech/sounds/PurificationPlasmaLoop.ogg b/src/main/resources/assets/gregtech/sounds/PurificationPlasmaLoop.ogg Binary files differnew file mode 100644 index 0000000000..9650414b24 --- /dev/null +++ b/src/main/resources/assets/gregtech/sounds/PurificationPlasmaLoop.ogg diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_CONTAINMENT_CASING.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_CONTAINMENT_CASING.png Binary files differnew file mode 100644 index 0000000000..3116b8973c --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_CONTAINMENT_CASING.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png Binary files differnew file mode 100644 index 0000000000..2686522d15 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png.mcmeta new file mode 100644 index 0000000000..60af678259 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":4 + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_RELEASE_CHAMBER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_RELEASE_CHAMBER.png Binary files differnew file mode 100644 index 0000000000..a623e9f1d5 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_RELEASE_CHAMBER.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CLARIFIER_CONTROLLER_CASING.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CLARIFIER_CONTROLLER_CASING.png Binary files differnew file mode 100644 index 0000000000..95bdede284 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CLARIFIER_CONTROLLER_CASING.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_PH_RESISTANT.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_PH_RESISTANT.png Binary files differnew file mode 100644 index 0000000000..4e210ec714 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_PH_RESISTANT.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_QUARK_CONTAINMENT.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_QUARK_CONTAINMENT.png Binary files differnew file mode 100644 index 0000000000..daa05d5dfc --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_QUARK_CONTAINMENT.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_BLACK.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_BLACK.png Binary files differnew file mode 100644 index 0000000000..72fd8bd069 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_BLACK.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_GRAY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_GRAY.png Binary files differnew file mode 100644 index 0000000000..e8b21b26e3 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_GRAY.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_LIGHT_GRAY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_LIGHT_GRAY.png Binary files differnew file mode 100644 index 0000000000..0767d4fffc --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_LIGHT_GRAY.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_WHITE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_WHITE.png Binary files differnew file mode 100644 index 0000000000..bd3cb68e09 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GLASS_TINTED_INDUSTRIAL_WHITE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/INDUSTRIAL_STRENGTH_CONCRETE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INDUSTRIAL_STRENGTH_CONCRETE.png Binary files differnew file mode 100644 index 0000000000..89aed04ff4 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INDUSTRIAL_STRENGTH_CONCRETE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EXTREME_CORROSION_RESISTANT.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EXTREME_CORROSION_RESISTANT.png Binary files differnew file mode 100644 index 0000000000..c10e687897 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EXTREME_CORROSION_RESISTANT.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FLOCCULATION.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FLOCCULATION.png Binary files differnew file mode 100644 index 0000000000..bd1080178f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FLOCCULATION.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_HIGH_PRESSURE_RESISTANT.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_HIGH_PRESSURE_RESISTANT.png Binary files differnew file mode 100644 index 0000000000..1fe2b7ea95 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_HIGH_PRESSURE_RESISTANT.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_INDUSTRIAL_WATER_PLANT.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_INDUSTRIAL_WATER_PLANT.png Binary files differnew file mode 100644 index 0000000000..d0e0a573e1 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_INDUSTRIAL_WATER_PLANT.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_NAQUADAH_REINFORCED_WATER_PLANT.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_NAQUADAH_REINFORCED_WATER_PLANT.png Binary files differnew file mode 100644 index 0000000000..57e6dd1f37 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_NAQUADAH_REINFORCED_WATER_PLANT.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_OZONE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_OZONE.png Binary files differnew file mode 100644 index 0000000000..fee3bf9261 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_OZONE.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_PLASMA_HEATER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_PLASMA_HEATER.png Binary files differnew file mode 100644 index 0000000000..ce826bd1c7 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_PLASMA_HEATER.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/NAQUADRIA_REINFORCED_WATER_PLANT_CASING.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/NAQUADRIA_REINFORCED_WATER_PLANT_CASING.png Binary files differnew file mode 100644 index 0000000000..d1936d6f5a --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/NAQUADRIA_REINFORCED_WATER_PLANT_CASING.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/NEUTRONIUM_COATED_UV_RESISTANT_GLASS.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/NEUTRONIUM_COATED_UV_RESISTANT_GLASS.png Binary files differnew file mode 100644 index 0000000000..df11861d63 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/NEUTRONIUM_COATED_UV_RESISTANT_GLASS.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OMNI_PURPOSE_INFINITY_FUSED_GLASS.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OMNI_PURPOSE_INFINITY_FUSED_GLASS.png Binary files differnew file mode 100644 index 0000000000..b6d429de7e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OMNI_PURPOSE_INFINITY_FUSED_GLASS.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_HATCH_PH_SENSOR.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_HATCH_PH_SENSOR.png Binary files differnew file mode 100644 index 0000000000..e849b26703 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_HATCH_PH_SENSOR.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_HATCH_PH_SENSOR_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_HATCH_PH_SENSOR_GLOW.png Binary files differnew file mode 100644 index 0000000000..36dd0187dd --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_HATCH_PH_SENSOR_GLOW.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/UV_BACKLIGHT_STERILIZER_CASING.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UV_BACKLIGHT_STERILIZER_CASING.png Binary files differnew file mode 100644 index 0000000000..d49fa6d477 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/UV_BACKLIGHT_STERILIZER_CASING.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/WATER_PLANT_CONCRETE_CASING.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/WATER_PLANT_CONCRETE_CASING.png Binary files differnew file mode 100644 index 0000000000..be7d0f177e --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/WATER_PLANT_CONCRETE_CASING.png diff --git a/src/main/resources/assets/gregtech/textures/gui/background/flocculation_recipe.png b/src/main/resources/assets/gregtech/textures/gui/background/flocculation_recipe.png Binary files differnew file mode 100644 index 0000000000..39d05085d5 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/gui/background/flocculation_recipe.png diff --git a/src/main/resources/assets/gregtech/textures/gui/progressbar/clarifier.png b/src/main/resources/assets/gregtech/textures/gui/progressbar/clarifier.png Binary files differnew file mode 100644 index 0000000000..6c167fffa9 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/gui/progressbar/clarifier.png diff --git a/src/main/resources/assets/gregtech/textures/gui/progressbar/flocculation.png b/src/main/resources/assets/gregtech/textures/gui/progressbar/flocculation.png Binary files differnew file mode 100644 index 0000000000..6479c42215 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/gui/progressbar/flocculation.png diff --git a/src/main/resources/assets/gregtech/textures/gui/progressbar/ozonation.png b/src/main/resources/assets/gregtech/textures/gui/progressbar/ozonation.png Binary files differnew file mode 100644 index 0000000000..54edbee6d0 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/gui/progressbar/ozonation.png diff --git a/src/main/resources/assets/gregtech/textures/gui/progressbar/phneutralization.png b/src/main/resources/assets/gregtech/textures/gui/progressbar/phneutralization.png Binary files differnew file mode 100644 index 0000000000..f28a705626 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/gui/progressbar/phneutralization.png diff --git a/src/main/resources/assets/gregtech/textures/gui/progressbar/water_plasma_heater.png b/src/main/resources/assets/gregtech/textures/gui/progressbar/water_plasma_heater.png Binary files differnew file mode 100644 index 0000000000..aa1be2b71d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/gui/progressbar/water_plasma_heater.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/233.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/233.png Binary files differnew file mode 100644 index 0000000000..e939423163 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/233.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/234.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/234.png Binary files differnew file mode 100644 index 0000000000..377a385ee1 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/234.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/235.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/235.png Binary files differnew file mode 100644 index 0000000000..e51fab970d --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/235.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/236.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/236.png Binary files differnew file mode 100644 index 0000000000..1b46a70159 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/236.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/237.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/237.png Binary files differnew file mode 100644 index 0000000000..657460fd9b --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/237.png |
