Changeset 988 for java/installer2
- Timestamp:
- Mar 29, 2014, 11:26:44 PM (11 years ago)
- Location:
- java/installer2
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
java/installer2/locales/net/oni2/aeinstaller/localization/MainWin_de.properties
r892 r988 26 26 menu.copyConfigTooltip=Kopiert die aktuell installierten Mods in die Zwischenablage zum Posten im OCF 27 27 28 menu.corePackages= &Zeige Kernpakete28 menu.corePackages=Über die Kernpakete 29 29 menu.corePackagesTooltip=Zeige welche Kernpakete genutzt werden 30 30 menu.reglobalize=&Reinitialisiere Edition -
java/installer2/src/net/oni2/aeinstaller/AEInstaller2.java
r886 r988 116 116 */ 117 117 public static void main(String[] args) { 118 if (PlatformInformation.getPlatform() == Platform.MACOS) 119 initMacOS(); 120 118 121 Paths.getPrefsPath().mkdirs(); 119 122 Paths.getDownloadPath().mkdirs(); … … 139 142 } 140 143 } 141 142 if (PlatformInformation.getPlatform() == Platform.MACOS)143 initMacOS();144 144 145 145 SettingsManager.deserializeFromFile(Paths.getSettingsFilename()); -
java/installer2/src/net/oni2/aeinstaller/backend/oni/management/Installer.java
r925 r988 4 4 import java.io.FileFilter; 5 5 import java.io.FileNotFoundException; 6 import java.io.FileOutputStream; 6 7 import java.io.FilenameFilter; 7 8 import java.io.IOException; 8 9 import java.io.InputStream; 10 import java.io.OutputStreamWriter; 9 11 import java.io.PrintWriter; 12 import java.io.UnsupportedEncodingException; 10 13 import java.text.SimpleDateFormat; 11 14 import java.util.Date; … … 22 25 import net.oni2.aeinstaller.backend.CaseInsensitiveFile; 23 26 import net.oni2.aeinstaller.backend.Paths; 27 import net.oni2.aeinstaller.backend.RuntimeOptions; 24 28 import net.oni2.aeinstaller.backend.oni.OniSplit; 25 29 import net.oni2.aeinstaller.backend.oni.PersistDat; … … 485 489 PrintWriter masterpatchWriter = null; 486 490 try { 487 masterpatchWriter = new PrintWriter(masterpatch); 491 masterpatchWriter = new PrintWriter(new OutputStreamWriter( 492 new FileOutputStream(masterpatch), "UTF-8")); 488 493 } catch (FileNotFoundException e) { 494 e.printStackTrace(); 495 } catch (UnsupportedEncodingException e) { 489 496 e.printStackTrace(); 490 497 } … … 502 509 // Apply patches through masterpatch in levelFolderXML 503 510 res = XMLTools.patch(masterpatch); 504 log.logAppOutput(res, false);511 log.logAppOutput(res, true); 505 512 506 513 // Create .oni files from XML … … 510 517 log.logAppOutput(res, true); 511 518 512 // Remove XML folder as import will only require .oni's 513 try { 514 FileUtils.deleteDirectory(levelFolderXML); 515 } catch (IOException e) { 516 e.printStackTrace(); 519 if (!RuntimeOptions.isDebug()) { 520 // Remove XML folder as import will only require .oni's 521 try { 522 FileUtils.deleteDirectory(levelFolderXML); 523 } catch (IOException e) { 524 e.printStackTrace(); 525 } 517 526 } 518 527 -
java/installer2/src/net/oni2/aeinstaller/backend/oni/management/Logger.java
r749 r988 81 81 log.println("\t\t\tDuration: " + result.time + " ms"); 82 82 log.println(); 83 } else { 84 log.println("\t\t\tExecution of external tool failed."); 83 85 } 84 86 } -
java/installer2/src/net/oni2/aeinstaller/localization/MainWin.properties
r892 r988 26 26 menu.copyConfigTooltip=Copies the currently installed mods to clipboard in format for posting on OCF 27 27 28 menu.corePackages= &Showcore packages28 menu.corePackages=About core packages 29 29 menu.corePackagesTooltip=View which core packages are used 30 30 menu.reglobalize=&Re-initialize Edition
Note:
See TracChangeset
for help on using the changeset viewer.