Merged with master

core/assets/bundles/bundle.properties

@@ -42,6 +42,8 @@ text.server.kicked.recentKick=You have been kicked recently.\nWait before connec
 text.server.connected={0} has joined.
 text.server.disconnected={0} has disconnected.
 text.nohost=Can't host server on a custom map!
+text.host.info=The [accent]host[] button hosts a server on ports [scarlet]6567[] and [scarlet]6568.[]\nAnybody on the same [LIGHT_GRAY]wifi or local network[] should be able to see your server in their server list.\n\nIf you want people to be able to connect from anywhere by IP, [accent]port forwarding[] is required.\n\n[LIGHT_GRAY]Note: If someone is experiencing trouble connecting to your LAN game, make sure you have allowed Mindustry access to your local network in your firewall settings.
+text.join.info=Here, you can enter a [accent]server IP[] to connect to, or discover [accent]local network[] servers to connect to.\nBoth LAN and WAN multiplayer is supported.\n\n[LIGHT_GRAY]Note: There is no automatic global server list; if you want to connect to someone by IP, you would need to ask the host for their IP.
 text.hostserver=Host Server
 text.host=Host
 text.hosting=[accent]Opening server...

core/assets/shaders/shield.fragment

@@ -64,11 +64,11 @@ void main() {
 	        	if(i >= u_hitamount) break;
 	    		vec3 hit = u_hits[i];
 	    		float rad = hit.z * HIT_RADIUS;
-	    		float fract = 1.0 - hit.z;
+	    		float fin = 1.0 - hit.z;
 	    	
 	    		if(abs(distance(vec2(hit.x, hit.y), coords - u_texsize/2.0) - rad) < 1.0){
-	    			color = mix(color, u_color* vec4(si, si, si, 1.0), (1.0 * fract));
-	    			color.a = ALPHA + 0.82 *fract;
+	    			color = mix(color, u_color* vec4(si, si, si, 1.0), (1.0 * fin));
+	    			color.a = ALPHA + 0.82 *fin;
 	    		}
 	    	}
 	    }