From baab36bfc56a87e5da933af39bbf0be5f3e3f691 Mon Sep 17 00:00:00 2001
From: Daniel Jennings <582974+danieljennings@users.noreply.github.com>
Date: Sat, 8 Feb 2020 13:41:33 -0800
Subject: [PATCH 1/2] Trim schematic string before calling Base64Decoder
 (#1537)

This fixes getting the "Length of Base64 encoded input string is not a multiple of 4." error when importing schematics that have whitespace at the start/end of them, which is easy to accidentally have without knowing by when copying the schematic codes from random different web pages.
---
 core/src/mindustry/game/Schematics.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/game/Schematics.java b/core/src/mindustry/game/Schematics.java
index 7a96ed672b..74a8a6f0bd 100644
--- a/core/src/mindustry/game/Schematics.java
+++ b/core/src/mindustry/game/Schematics.java
@@ -375,7 +375,7 @@ public class Schematics implements Loadable{
     /** Loads a schematic from base64. May throw an exception. */
     public static Schematic readBase64(String schematic){
         try{
-            return read(new ByteArrayInputStream(Base64Coder.decode(schematic)));
+            return read(new ByteArrayInputStream(Base64Coder.decode(schematic.trim())));
         }catch(IOException e){
             throw new RuntimeException(e);
         }

From 941449c50213318b318eaf141992c4901d94c965 Mon Sep 17 00:00:00 2001
From: GioIacca9 <39232448+GioIacca9@users.noreply.github.com>
Date: Mon, 10 Feb 2020 04:26:47 +0100
Subject: [PATCH 2/2] Updated "Full implementation of #1494" (#1541)

---
 core/assets/bundles/bundle_it.properties | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties
index c142113cc3..2d3e2b967f 100644
--- a/core/assets/bundles/bundle_it.properties
+++ b/core/assets/bundles/bundle_it.properties
@@ -172,8 +172,13 @@ hosts.discovering.any = Ricerca partite
 server.refreshing = Aggiornamento del server
 hosts.none = [lightgray]Nessuna partita locale trovata!
 host.invalid = [scarlet]Impossibile connettersi all'host.
-trace = Traccia giocatore
-trace.playername = Nome del giocatore: [accent]{0}
+
+servers.local = Server Locali
+servers.remote = Server Remoti
+servers.global = Server Globali
+
+trace = Traccia Giocatore
+trace.playername = Nome del Giocatore: [accent]{0}
 trace.ip = IP: [accent]{0}
 trace.id = ID univoco: [accent]{0}
 trace.mobile = Client Mobile: [accent]{0}
@@ -183,11 +188,11 @@ server.bans = Lista Bans
 server.bans.none = Nessun giocatore bandito trovato!
 server.admins = Amministratori
 server.admins.none = Nessun amministratore trovato!
-server.add = Aggiungi server
+server.add = Aggiungi Server
 server.delete = Sei sicuro di voler eliminare questo server?
-server.edit = Modifica server
-server.outdated = [crimson]Server obsoleto![]
-server.outdated.client = [crimson]Client obsoleto![]
+server.edit = Modifica Server
+server.outdated = [crimson]Server Obsoleto![]
+server.outdated.client = [crimson]Client Obsoleto![]
 server.version = [gray]v{0} {1}
 server.custombuild = [yellow]Build Personalizzata
 confirmban = Sei sicuro di voler bandire questo giocatore?