New release

crschnick · May 26, 2023 · b20e739 · b20e739
1 parent 0126bfd
commit b20e739
Show file tree

Hide file tree

Showing 17 changed files with 44 additions and 26 deletions.
diff --git a/canonical_version b/canonical_version
@@ -1 +1 @@
-2.12.5
+2.13.0
diff --git a/changelogs/2.13.0.txt b/changelogs/2.13.0.txt
@@ -0,0 +1,15 @@
+# Changes in 2.13.0
+
+- Make Victoria 3 melter available for savegames (Please report any issues that you encounter with it)
+- Update Victoria 3 support to 1.3
+
+- Add basic savegame information for Stellaris savegames (more to come)
+- Make Stellaris campaigns recognizable across sessions by always including id in exported campaign name (This time for real)
+
+- Fix Invalid header error for some multiplayer EU4 savegames
+
+- Fix melted Hoi4 saves still being treated as ironman by the game
+
+- Improve accessibility descriptions of the user interface
+
+
diff --git a/lang/savegame_l_chinese.yml b/lang/savegame_l_chinese.yml
@@ -23,7 +23,7 @@ l_chinese:
   MELT_SAVEGAME: "转换为非铁人存档"
   ANALYZE_RAKALY: "上传至 pdx.tools 并分析"
   UPLOAD_SKANDERBEG: "上传至 Skanderbeg.pm"
-  EDIT_EU4SAVEEDITOR: "使用 Eu4SaveEditor 编辑"
+  EDIT_EU4SAVEEDITOR: "使用 OsaSaveEditor 编辑"
   CONVERT_TO_EU4: "转换至 EU4 存档"
   EDIT_SAVEGAME: "编辑存档"
   COMPATIBLE: "兼容版本"

diff --git a/lang/savegame_l_english.yml b/lang/savegame_l_english.yml
@@ -23,7 +23,7 @@ l_english:
   MELT_SAVEGAME: "Melt savegame (Convert to Non-Ironman)"
   ANALYZE_RAKALY: "Upload and analyze with pdx.tools"
   UPLOAD_SKANDERBEG: "Upload to Skanderbeg.pm"
-  EDIT_EU4SAVEEDITOR: "Edit with Eu4SaveEditor"
+  EDIT_EU4SAVEEDITOR: "Edit with OsaSaveEditor"
   CONVERT_TO_EU4: "Convert to EU4 savegame"
   EDIT_SAVEGAME: "Edit savegame"
   COMPATIBLE: "Compatible version"

diff --git a/lang/savegame_l_french.yml b/lang/savegame_l_french.yml
@@ -23,7 +23,7 @@ l_french:
   MELT_SAVEGAME: "'Melt' la sauvegarde (Convertir en Non Ironman)"
   ANALYZE_RAKALY: "Publier et analyser avec pdx.tools"
   UPLOAD_SKANDERBEG: "Publier sur Skanderbeg.pm"
-  EDIT_EU4SAVEEDITOR: "Éditer with Eu4SaveEditor"
+  EDIT_EU4SAVEEDITOR: "Éditer with OsaSaveEditor"
   CONVERT_TO_EU4: "Convertir en sauvegarde EU4"
   EDIT_SAVEGAME: "Édit la sauvegarde"
   COMPATIBLE: "Version compatible"

diff --git a/lang/savegame_l_polish.yml b/lang/savegame_l_polish.yml
@@ -23,7 +23,7 @@ l_polish:
   MELT_SAVEGAME: ""Przetop" zapis (skonwertuj do typu nie-Ironman)"
   ANALYZE_RAKALY: "Wyślij i przeanalizuj za pomocą pdx.tools"
   UPLOAD_SKANDERBEG: "Wyślij do Skanderbeg.pm"
-  EDIT_EU4SAVEEDITOR: "Edytuj za pomocą Eu4SaveEditor"
+  EDIT_EU4SAVEEDITOR: "Edytuj za pomocą OsaSaveEditor"
   CONVERT_TO_EU4: "Skonwertuj do zapisu EU4"
   EDIT_SAVEGAME: "Edytuj zapis"
   COMPATIBLE: "Kompatybilna wersja"

diff --git a/lang/savegame_l_russian.yml b/lang/savegame_l_russian.yml
@@ -23,7 +23,7 @@ l_russian:
  MELT_SAVEGAME:0 "Испортить сохранение (преобразование в не-Ironman)"
  ANALYZE_RAKALY:0 "Загрузить для анализа с помощью pdx.tools"
  UPLOAD_SKANDERBEG:0 "Загрузить на Skanderbeg.pm"
- EDIT_EU4SAVEEDITOR:0 "Редактировать с помощью Eu4SaveEditor"
+ EDIT_EU4SAVEEDITOR:0 "Редактировать с помощью OsaSaveEditor"
  CONVERT_TO_EU4:0 "Конвертировать в сохранение EU4"
  EDIT_SAVEGAME:0 "Изменить сохранение"
  COMPATIBLE:0 "Совместимая версия"

diff --git a/lang/settings_l_chinese.yml b/lang/settings_l_chinese.yml
@@ -27,9 +27,9 @@ l_chinese:
  STORAGE_DIR_RESET_TEXT: "存储路径 $PATH$ 不存在或不可用。\n重置回默认路径吗？"
  STORAGE_DIR_INVALID_TITLE: "存储路径不存在"
  STORAGE_DIR_INVALID_TEXT: "存储路径 $PATH$ 不存在或不可用。"
- EU4SE: "Eu4SaveEditor"
- ENABLE_EU4SE: "启用 Eu4SaveEditor"
- ENABLE_EU4SE_DESC: "选择是否启用 Eu4SaveEditor.\n\n启用后将会自动在下次启动时下载并安装 Eu4SaveEditor。"
+ EU4SE: "OsaSaveEditor"
+ ENABLE_EU4SE: "启用 OsaSaveEditor"
+ ENABLE_EU4SE_DESC: "选择是否启用 OsaSaveEditor.\n\n启用后将会自动在下次启动时下载并安装 OsaSaveEditor。"
  MISC: "杂项"
  FONT_SIZE: "字体大小"
  FONT_SIZE_DESC: "如果你正在使用高分辨率显示器，你可以适当调高以增加可读性。"

diff --git a/lang/settings_l_english.yml b/lang/settings_l_english.yml
@@ -27,9 +27,9 @@ l_english:
  STORAGE_DIR_RESET_TEXT: "Storage directory $PATH$ does not exist or is not valid anymore!\nDo you want to reset it to the default directory?"
  STORAGE_DIR_INVALID_TITLE: "Storage directory does not exist"
  STORAGE_DIR_INVALID_TEXT: "Storage directory $PATH$ does not exist or is not valid."
- EU4SE: "Eu4SaveEditor"
- ENABLE_EU4SE: "Enable Eu4SaveEditor"
- ENABLE_EU4SE_DESC: "Specifies whether to enable the Eu4SaveEditor.\n\nIf you enable this, the Eu4SaveEditor will be downloaded and installed next time you start the Pdx-Unlimiter."
+ EU4SE: "OsaSaveEditor"
+ ENABLE_EU4SE: "Enable OsaSaveEditor"
+ ENABLE_EU4SE_DESC: "Specifies whether to enable the OsaSaveEditor.\n\nIf you enable this, the OsaSaveEditor will be downloaded and installed next time you start the Pdx-Unlimiter."
  MISC: "Miscellaneous"
  FONT_SIZE: "Font size"
  FONT_SIZE_DESC: "The font size within the app.\n\nIf you have a high display resolution, you can turn this up to increase readability."

diff --git a/lang/settings_l_french.yml b/lang/settings_l_french.yml
@@ -27,9 +27,9 @@ l_french:
  STORAGE_DIR_RESET_TEXT: "Le dossier de stockage $PATH$ n'existe pas ou n'est plus valide!\nVoulez-vous le réinitialiser au dossier par défaut ?"
  STORAGE_DIR_INVALID_TITLE: "Le dossier de stockage n'existe pas"
  STORAGE_DIR_INVALID_TEXT: "Le dossier de stockage $PATH$ n'existe pas ou n'est pas valide."
- EU4SE: "Eu4SaveEditor"
- ENABLE_EU4SE: "Activer Eu4SaveEditor "
- ENABLE_EU4SE_DESC: "Indique si vous souhaitez activer l'éditeur Eu4SaveEditor. Si vous activez cette option, l'éditeur Eu4SaveEditor sera téléchargé et installé lors du prochain démarrage de Pdx-Unlimiter."
+ EU4SE: "OsaSaveEditor"
+ ENABLE_EU4SE: "Activer OsaSaveEditor "
+ ENABLE_EU4SE_DESC: "Indique si vous souhaitez activer l'éditeur OsaSaveEditor. Si vous activez cette option, l'éditeur OsaSaveEditor sera téléchargé et installé lors du prochain démarrage de Pdx-Unlimiter."
  MISC: "Divers"
  FONT_SIZE: "Taille de la police "
  FONT_SIZE_DESC: "La taille de la police dans l'application.\n\nSi vous avez un écran avec une grande d'une résolution, vous pouvez l'augmenter pour améliorer la lisibilité."

diff --git a/lang/settings_l_polish.yml b/lang/settings_l_polish.yml
@@ -27,9 +27,9 @@ l_polish:
  STORAGE_DIR_RESET_TEXT: "Ścieżka przechowywania zapisów $PATH$ nie istnieje lub nie jest prawidłowa. Czy chcesz przywrócić ścieżkę domyślną?"
  STORAGE_DIR_INVALID_TITLE: "Ścieżka przechowywania zapisów nie istnieje"
  STORAGE_DIR_INVALID_TEXT: "Ścieżka przechowywania zapisów $PATH$ nie istnieje lub nie jest prawidłowa."
- EU4SE: "Eu4SaveEditor"
- ENABLE_EU4SE: "Włącz Eu4SaveEditor"
- ENABLE_EU4SE_DESC: "Określa, czy włączyć Eu4SaveEditor.\n\nJeśli włączysz tę opcję, Eu4SaveEditor zostanie pobrany oraz zainstalowany przy następnym uruchomieniu Pdx-Unlimiter"
+ EU4SE: "OsaSaveEditor"
+ ENABLE_EU4SE: "Włącz OsaSaveEditor"
+ ENABLE_EU4SE_DESC: "Określa, czy włączyć OsaSaveEditor.\n\nJeśli włączysz tę opcję, OsaSaveEditor zostanie pobrany oraz zainstalowany przy następnym uruchomieniu Pdx-Unlimiter"
  MISC: "Inne"
  FONT_SIZE: "Rozmiar czcionki"
  FONT_SIZE_DESC: "Rozmiar czcionki używanej przez program.\n\nJeśli posiadasz ekran o wysokiej rozdzielczości, powiększenie czcionki może polepszyć czytelność tekstu."

diff --git a/lang/settings_l_russian.yml b/lang/settings_l_russian.yml
@@ -27,9 +27,9 @@ l_russian:
  STORAGE_DIR_RESET_TEXT:0 "Каталог хранения $PATH$ не существует или больше недействителен!\nВы хотите сбросить его на каталог по умолчанию?"
  STORAGE_DIR_INVALID_TITLE:0 "Каталог хранилища не существует"
  STORAGE_DIR_INVALID_TEXT:0 "Каталог хранения $PATH$ не существует или недействителен."
- EU4SE:0 "Eu4SaveEditor"
- ENABLE_EU4SE:0 "Включить Eu4SaveEditor"
- ENABLE_EU4SE_DESC:0 "Указывает, включать ли Eu4SaveEditor.\n\nЕсли вы включите это, Eu4SaveEditor будет загружен и установлен при следующем запуске Pdx-Unlimiter."
+ EU4SE:0 "OsaSaveEditor"
+ ENABLE_EU4SE:0 "Включить OsaSaveEditor"
+ ENABLE_EU4SE_DESC:0 "Указывает, включать ли OsaSaveEditor.\n\nЕсли вы включите это, OsaSaveEditor будет загружен и установлен при следующем запуске Pdx-Unlimiter."
  MISC:0 "Разное"
  FONT_SIZE:0 "Размер шрифта"
  FONT_SIZE_DESC:0 "Размер шрифта в приложении.\n\nЕсли у вас высокое разрешение экрана, вы можете увеличить его, чтобы улучшить читаемость."

diff --git a/pdxu-app/src/main/java/com/crschnick/pdxu/app/util/integration/Eu4SeHelper.java b/pdxu-app/src/main/java/com/crschnick/pdxu/app/util/integration/Eu4SeHelper.java
@@ -11,15 +11,14 @@
 import com.crschnick.pdxu.app.savegame.SavegameStorage;
 import com.crschnick.pdxu.app.util.ThreadHelper;
 import com.crschnick.pdxu.model.eu4.Eu4Tag;
-import org.apache.commons.lang3.SystemUtils;
 
 import java.io.IOException;
 import java.nio.file.Files;
 
 public class Eu4SeHelper {
 
     public static boolean isSupported() {
-        return SystemUtils.IS_OS_WINDOWS;
+        return false;
     }
 
     public static boolean shouldShowButton(SavegameEntry<?, ?> entry, SavegameInfo<?> info) {
@@ -61,9 +60,13 @@ public static void open(SavegameEntry<?, ?> entry) {
                         PdxuInstallation.getInstance().getResourceDir().resolve("bin").resolve("OsaSaveEditor.jar").toString(),
                         saveFile, gameFolder, overwrite
                 )
-                        .redirectErrorStream(true)
+                        .redirectOutput(ProcessBuilder.Redirect.DISCARD)
                         .start();
-                var out = proc.getInputStream().readAllBytes();
+                var out = proc.getErrorStream().readAllBytes();
+                var exit = proc.waitFor();
+                if (exit != 0) {
+                    throw new IOException(new String(out));
+                }
                 SavegameActions.reloadSavegame(eu4Entry);
             } catch (Exception e) {
                 ErrorHandler.handleException(e);

diff --git a/resources/bin/rakaly_linux b/resources/bin/rakaly_linux
diff --git a/resources/bin/rakaly_mac b/resources/bin/rakaly_mac
diff --git a/resources/bin/rakaly_windows.exe b/resources/bin/rakaly_windows.exe
diff --git a/version b/version
@@ -1 +1 @@
-2.12.5-SNAPSHOT
+2.13.0