Merge remote-tracking branch 'origin/master'

core/assets/bundles/bundle.properties

@@ -525,6 +525,7 @@ details = Details...
 edit = Edit
 variables = Vars
 logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.restart = Restart
 logic.globals = Built-in Variables
 
 editor.name = Name:

core/assets/bundles/bundle_be.properties

@@ -525,6 +525,7 @@ details = Падрабязнасці...
 edit = Рэдагаваць...
 variables = Пераменныя
 logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.restart = Restart
 logic.globals = Built-in Variables
 
 editor.name = Назва:

core/assets/bundles/bundle_bg.properties

@@ -525,6 +525,7 @@ details = Детайли...
 edit = Редактирай...
 variables = Променливи
 logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.restart = Restart
 logic.globals = Built-in Variables
 
 editor.name = Име:

core/assets/bundles/bundle_ca.properties

@@ -525,6 +525,7 @@ details = Detalls
 edit = Edita
 variables = Variables
 logic.clear.confirm = Esteu segur que voleu esborrar tot el codi d’aquest processador?
+logic.restart = Restart
 logic.globals = Built-in Variables
 
 editor.name = Nom:

core/assets/bundles/bundle_cs.properties

@@ -525,6 +525,7 @@ details = Podrobnosti...
 edit = Upravit...
 variables = Hodnoty
 logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.restart = Restart
 logic.globals = Vestavěné proměnné
 
 editor.name = Jméno:

core/assets/bundles/bundle_da.properties

@@ -525,6 +525,7 @@ details = Detaljer...
 edit = Rediger...
 variables = Vars
 logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.restart = Restart
 logic.globals = Built-in Variables
 
 editor.name = Navn:

core/assets/bundles/bundle_de.properties

@@ -525,6 +525,7 @@ details = Details
 edit = Bearbeiten
 variables = Variablen
 logic.clear.confirm = Willst du wirklich den gesamten Code aus diesem Prozessor löschen?
+logic.restart = Restart
 logic.globals = Eingebaute Variablen
 
 editor.name = Name:

core/assets/bundles/bundle_es.properties

@@ -525,6 +525,7 @@ details = Detalles...
 edit = Editar...
 variables = Variables
 logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.restart = Restart
 logic.globals = Built-in Variables
 
 editor.name = Nombre:

core/assets/bundles/bundle_et.properties

@@ -525,6 +525,7 @@ details = Üksikasjad...
 edit = Muuda...
 variables = Vars
 logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.restart = Restart
 logic.globals = Built-in Variables
 
 editor.name = Nimi:

core/assets/bundles/bundle_eu.properties

@@ -525,6 +525,7 @@ details = Xehetasunak...
 edit = Editatu...
 variables = Vars
 logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.restart = Restart
 logic.globals = Built-in Variables
 
 editor.name = Izena:

core/assets/bundles/bundle_fi.properties

@@ -525,6 +525,7 @@ details = Yksityiskohdat...
 edit = Muokkaa...
 variables = Muuttujat
 logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.restart = Restart
 logic.globals = Built-in Variables
 
 editor.name = Nimi:

core/assets/bundles/bundle_fil.properties

@@ -525,6 +525,7 @@ details = Details...
 edit = Edit...
 variables = Vars
 logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.restart = Restart
 logic.globals = Built-in Variables
 
 editor.name = Name:

core/assets/bundles/bundle_fr.properties

@@ -525,6 +525,7 @@ details = Détails...
 edit = Modifier...
 variables = Variables
 logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.restart = Restart
 logic.globals = Built-in Variables
 
 editor.name = Nom :

core/assets/bundles/bundle_hu.properties

@@ -525,6 +525,7 @@ details = Részletek…
 edit = Szerkesztés
 variables = Változók
 logic.clear.confirm = Biztosan törölni akarod az összes kódot ebből a processzorból?
+logic.restart = Restart
 logic.globals = Beépített változók
 
 editor.name = Név:

core/assets/bundles/bundle_id_ID.properties

@@ -525,6 +525,7 @@ details = Detail...
 edit = Sunting
 variables = Variabel
 logic.clear.confirm = Apakah Anda yakin ingin menghapus semua kode dari prosesor ini?
+logic.restart = Restart
 logic.globals = Variabel Bawaan
 
 editor.name = Nama:

core/assets/bundles/bundle_it.properties

@@ -525,6 +525,7 @@ details = Dettagli...
 edit = Modifica...
 variables = Vars
 logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.restart = Restart
 logic.globals = Built-in Variables
 
 editor.name = Nome:

core/assets/bundles/bundle_ja.properties

@@ -525,6 +525,7 @@ details = 詳細...
 edit = 編集...
 variables = 変数
 logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.restart = Restart
 logic.globals = Built-in Variables
 
 editor.name = 名前:

core/assets/bundles/bundle_ko.properties

@@ -525,6 +525,7 @@ details = 설명...
 edit = 편집...
 variables = 변수
 logic.clear.confirm = 이 프로세서의 모든 코드를 삭제하시겠습니까?
+logic.restart = Restart
 logic.globals = 내장 변수
 
 editor.name = 이름:

core/assets/bundles/bundle_lt.properties

@@ -525,6 +525,7 @@ details = Detaliau...
 edit = Redaguoti...
 variables = Vars
 logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.restart = Restart
 logic.globals = Built-in Variables
 
 editor.name = Pavadinimas:

core/assets/bundles/bundle_nl.properties

@@ -525,6 +525,7 @@ details = Details...
 edit = Bewerk...
 variables = Vars
 logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.restart = Restart
 logic.globals = Built-in Variables
 
 editor.name = Naam:

core/assets/bundles/bundle_nl_BE.properties

@@ -525,6 +525,7 @@ details = Details...
 edit = Edit...
 variables = Vars
 logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.restart = Restart
 logic.globals = Built-in Variables
 
 editor.name = Name:

core/assets/bundles/bundle_pl.properties

@@ -525,6 +525,7 @@ details = Detale...
 edit = Edytuj...
 variables = Zmienne
 logic.clear.confirm = Czy na pewno chcesz wyczyścić cały kod z tego procesora??
+logic.restart = Restart
 logic.globals = Built-in Variables
 
 editor.name = Nazwa:

core/assets/bundles/bundle_pt_BR.properties

@@ -525,6 +525,7 @@ details = Detalhes...
 edit = Editar...
 variables = Variáveis
 logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.restart = Restart
 logic.globals = Built-in Variables
 
 editor.name = Nome:

core/assets/bundles/bundle_pt_PT.properties

@@ -525,6 +525,7 @@ details = Detalhes...
 edit = Editar...
 variables = Variáveis
 logic.clear.confirm = Tens a certeza que querea apagar todo o código deste procesador?
+logic.restart = Restart
 logic.globals = Variáveis Embutidas
 
 editor.name = Nome:

core/assets/bundles/bundle_ro.properties

@@ -525,6 +525,7 @@ details = Detalii...
 edit = Editează...
 variables = Vars
 logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.restart = Restart
 logic.globals = Built-in Variables
 
 editor.name = Nume:

core/assets/bundles/bundle_ru.properties

@@ -525,6 +525,7 @@ details = Подробности...
 edit = Редактировать...
 variables = Переменные
 logic.clear.confirm = Вы уверены, что хотите удалить весь код из этого процессора?
+logic.restart = Restart
 logic.globals = Встроенные переменные
 
 editor.name = Название:

core/assets/bundles/bundle_sr.properties

@@ -525,6 +525,7 @@ details = Detalji...
 edit = Izmeni...
 variables = Varijabla
 logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.restart = Restart
 logic.globals = Built-in Variables
 
 editor.name = Ime:

core/assets/bundles/bundle_sv.properties

@@ -525,6 +525,7 @@ details = Details...
 edit = Redigera...
 variables = Vars
 logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.restart = Restart
 logic.globals = Built-in Variables
 
 editor.name = Namn:

core/assets/bundles/bundle_th.properties

@@ -525,6 +525,7 @@ details = รายละเอียด...
 edit = แก้ไข...
 variables = ตัวแปร
 logic.clear.confirm = คุณแน่ใจหรือว่าจะเคลียร์โค้ดทั้งหมดของตัวประมวลผลนี้?
+logic.restart = Restart
 logic.globals = ตัวแปรค่าเริ่มต้น
 
 editor.name = ชื่อ:

core/assets/bundles/bundle_tk.properties

@@ -525,6 +525,7 @@ details = Details...
 edit = Edit...
 variables = Vars
 logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.restart = Restart
 logic.globals = Built-in Variables
 
 editor.name = isim:

core/assets/bundles/bundle_tr.properties

@@ -525,6 +525,7 @@ details = Detaylar...
 edit = Düzenle...
 variables = Değişkenler
 logic.clear.confirm = Bu işlemciden bütün kodları silmek istediğinze emin misiniz?
+logic.restart = Restart
 logic.globals = Dahili Değişkenler
 
 editor.name = İsim:

core/assets/bundles/bundle_uk_UA.properties

@@ -525,6 +525,7 @@ details = Подробиці…
 edit = Змінити…
 variables = Змінні
 logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.restart = Restart
 logic.globals = Built-in Variables
 
 editor.name = Ім’я:

core/assets/bundles/bundle_vi.properties

@@ -525,6 +525,7 @@ details = Chi tiết...
 edit = Chỉnh sửa
 variables = Biến số
 logic.clear.confirm = Bạn có muốn xóa sạch tất cả mã khỏi bộ xử lý này?
+logic.restart = Restart
 logic.globals = Biến số sẵn có
 
 editor.name = Tên:

core/assets/bundles/bundle_zh_CN.properties

@@ -525,6 +525,7 @@ details = 详情
 edit = 编辑
 variables = 变量
 logic.clear.confirm = 确定要清除此处理器中的所有代码吗？
+logic.restart = Restart
 logic.globals = 内建变量
 
 editor.name = 名称：

core/assets/bundles/bundle_zh_TW.properties

@@ -525,6 +525,7 @@ details = 詳細資訊……
 edit = 編輯……
 variables = 變數
 logic.clear.confirm = Are you sure you want to clear all code from this processor?
+logic.restart = Restart
 logic.globals = 內建變數
 
 editor.name = 名稱：

core/src/mindustry/logic/LogicDialog.java

@@ -31,7 +31,7 @@ public class LogicDialog extends BaseDialog{
     boolean privileged;
     @Nullable LExecutor executor;
     GlobalVarsDialog globalsDialog = new GlobalVarsDialog();
-    boolean wasRows, wasPortrait;
+    boolean wasRows, wasPortrait, forceRestart;
 
     public LogicDialog(){
         super("logic");
@@ -142,7 +142,14 @@ public class LogicDialog extends BaseDialog{
                         }catch(Throwable e){
                             ui.showException(e);
                         }
-                    }).marginLeft(12f).disabled(b -> Core.app.getClipboardText() == null);
+                    }).marginLeft(12f).disabled(b -> Core.app.getClipboardText() == null).row();
+
+                    t.button("@logic.restart", Icon.refresh, style, () -> {
+                        forceRestart = true;
+                        dialog.hide();
+                        hide();
+                    }).marginLeft(12f);
+
                 });
             });
 
@@ -336,6 +343,7 @@ public class LogicDialog extends BaseDialog{
     public void show(String code, LExecutor executor, boolean privileged, Cons<String> modified){
         this.executor = executor;
         this.privileged = privileged;
+        this.forceRestart = false;
         canvas.statements.clearChildren();
         canvas.rebuild();
         canvas.privileged = privileged;
@@ -346,7 +354,7 @@ public class LogicDialog extends BaseDialog{
             canvas.load("");
         }
         this.consumer = result -> {
-            if(!result.equals(code)){
+            if(forceRestart || !result.equals(code)){
                 modified.get(result);
             }
         };