From e412e90f5f9e571aaebf1e05d593a1f0627c8405 Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Thu, 7 Feb 2019 06:08:52 +0100 Subject: API Changes + added a SimpleWaterGenerator + fixed the Diode not working on servers. Former-commit-id: cd0d74153a5a1279b1ff2409eaac39fbccd5c3cf --- src/main/resources/assets/bartworks/lang/en_US.lang | 6 +++++- .../assets/bartworks/textures/GUI/GUIheatedPump.png | Bin 0 -> 2075 bytes .../bartworks/textures/blocks/heatedWaterPumpDown.png | Bin 0 -> 496 bytes .../bartworks/textures/blocks/heatedWaterPumpSide.png | Bin 0 -> 549 bytes .../bartworks/textures/blocks/heatedWaterPumpTop.png | Bin 0 -> 496 bytes .../assets/bartworks/textures/items/BWmotor.png | Bin 0 -> 506 bytes .../assets/bartworks/textures/items/BWrawtube.png | Bin 0 -> 450 bytes 7 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/bartworks/textures/GUI/GUIheatedPump.png create mode 100644 src/main/resources/assets/bartworks/textures/blocks/heatedWaterPumpDown.png create mode 100644 src/main/resources/assets/bartworks/textures/blocks/heatedWaterPumpSide.png create mode 100644 src/main/resources/assets/bartworks/textures/blocks/heatedWaterPumpTop.png create mode 100644 src/main/resources/assets/bartworks/textures/items/BWmotor.png create mode 100644 src/main/resources/assets/bartworks/textures/items/BWrawtube.png (limited to 'src/main/resources/assets/bartworks') diff --git a/src/main/resources/assets/bartworks/lang/en_US.lang b/src/main/resources/assets/bartworks/lang/en_US.lang index f81f0a533b..08a31baa75 100644 --- a/src/main/resources/assets/bartworks/lang/en_US.lang +++ b/src/main/resources/assets/bartworks/lang/en_US.lang @@ -14,7 +14,7 @@ item.BW_PaperRotor.name=Primitive Paper Rotor (Wind only) item.BW_LeatherRotor.name=Primitive Leather Rotor (Wind only) item.BW_WoolRotor.name=Primitive Wool Rotor (Wind only) item.BW_CombinedRotor.name=Combined Primitive Rotor (Wind only) -tile.BWRotorBlock.name=Primitive Kinetic Shaftbox +tile.BWRotorBlock.0.name=Primitive Kinetic Shaftbox item.grindstone_top.name=Grindstone Top Piece item.grindstone_bottom.name=Grindstone Bottom Piece item.completed_grindstone.name=Grindstone @@ -23,6 +23,10 @@ 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 item.BW_SimpleWindMeter.name=Simple Wind Meter +tile.BWHeatedWaterPump.0.name=Simple Stirling Water Pump +item.BWrawtube.name=Elongated Glas Tube +item.BWmotor.name=Simple Stirling Motor +item.BWstove.name=Simple Heated Stove itemGroup.BioTab=BartWorks BioEngineering filled.item.petriDish.name=Petri Dish with a Culture diff --git a/src/main/resources/assets/bartworks/textures/GUI/GUIheatedPump.png b/src/main/resources/assets/bartworks/textures/GUI/GUIheatedPump.png new file mode 100644 index 0000000000..f9f82a19c3 Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/GUI/GUIheatedPump.png differ diff --git a/src/main/resources/assets/bartworks/textures/blocks/heatedWaterPumpDown.png b/src/main/resources/assets/bartworks/textures/blocks/heatedWaterPumpDown.png new file mode 100644 index 0000000000..6fd2b79d13 Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/blocks/heatedWaterPumpDown.png differ diff --git a/src/main/resources/assets/bartworks/textures/blocks/heatedWaterPumpSide.png b/src/main/resources/assets/bartworks/textures/blocks/heatedWaterPumpSide.png new file mode 100644 index 0000000000..4b8c71a8ae Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/blocks/heatedWaterPumpSide.png differ diff --git a/src/main/resources/assets/bartworks/textures/blocks/heatedWaterPumpTop.png b/src/main/resources/assets/bartworks/textures/blocks/heatedWaterPumpTop.png new file mode 100644 index 0000000000..6fd2b79d13 Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/blocks/heatedWaterPumpTop.png differ diff --git a/src/main/resources/assets/bartworks/textures/items/BWmotor.png b/src/main/resources/assets/bartworks/textures/items/BWmotor.png new file mode 100644 index 0000000000..c701227af2 Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/items/BWmotor.png differ diff --git a/src/main/resources/assets/bartworks/textures/items/BWrawtube.png b/src/main/resources/assets/bartworks/textures/items/BWrawtube.png new file mode 100644 index 0000000000..ab3dd4a2bd Binary files /dev/null and b/src/main/resources/assets/bartworks/textures/items/BWrawtube.png differ -- cgit