Merge branch 'roundtwo' of https://github.com/70000hp/Hbm-s-Nuclear-T…

…ech-GIT into roundtwo

changelog

@@ -1,4 +1,8 @@
+## Changed
+* Thorium salts can no longer be stored in normal tanks due to being corrosive
+* Updated russian localization
+
 ## Fixed
-* Fixed PWR still operating as normal even when the structure is dissolved
-* Fixed the new watz not giving the meltdown achievement
-* Fixed serverside crash caused by conveyor cranes
+* Fixed PWR crashing servers instantly
+* Fixed missing tank textures for sodium
+* Fixed missing lang entry for hot heavy water

gradle.properties

@@ -1,6 +1,6 @@
 mod_version=1.0.27
 # Empty build number makes a release type
-mod_build_number=4705
+mod_build_number=4707
 
 credits=HbMinecraft, rodolphito (explosion algorithms), grangerave (explosion algorithms),\
   \ Hoboy (textures, models), Doctor17 (russian localization), Drillgon200 (effects, models,\

src/main/java/com/hbm/lib/RefStrings.java

@@ -3,7 +3,7 @@
 public class RefStrings {
 	public static final String MODID = "hbm";
 	public static final String NAME = "Hbm's Nuclear Tech Mod";
-	public static final String VERSION = "1.0.27 BETA (4705)";
+	public static final String VERSION = "1.0.27 BETA (4707)";
 	//HBM's Beta Naming Convention:
 	//V T (X)
 	//V -> next release version

src/main/java/com/hbm/tileentity/machine/TileEntityPWRController.java

@@ -25,6 +25,8 @@
 import com.hbm.util.fauxpointtwelve.BlockPos;
 
 import api.hbm.fluid.IFluidStandardTransceiver;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.entity.player.EntityPlayer;
@@ -506,6 +508,7 @@ public Container provideContainer(int ID, EntityPlayer player, World world, int
 	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) {
 		return new GUIPWR(player.inventory, this);
 	}