v0.11.7.4 release, fix npc spawning issue from 0.11.7.3 update

jakeroo123 · May 30, 2020 · 8ee2966 · 8ee2966
1 parent df9b1ee
commit 8ee2966
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 10 deletions.
diff --git a/ExampleMod/build.txt b/ExampleMod/build.txt
@@ -1,5 +1,5 @@
 author = TML Team
-version = 0.11.7.3
+version = 0.11.7.4
 displayName = Example Mod
 homepage = https://tmodloader.net/
 hideCode = false

diff --git a/patches/tModLoader/Terraria.Localization.Content/de-DE.tModLoader.json b/patches/tModLoader/Terraria.Localization.Content/de-DE.tModLoader.json
@@ -342,4 +342,4 @@
 	"CommonItemTooltip": {
 		"PercentIncreasedDamage": "Um {0}% erhöhter Schaden"
 	}
-}
+}
diff --git a/patches/tModLoader/Terraria.Localization.Content/es-ES.tModLoader.json b/patches/tModLoader/Terraria.Localization.Content/es-ES.tModLoader.json
@@ -8,7 +8,7 @@
 		"MenuEnableDeveloperMode": "Activar modo desarrollador",
 		"FirstLaunchWelcomeMessage": "Bienvenido a tModLoader.\n\ntModLoader se ha instalado correctamente. Usa el menú del Navegador de Mods para buscar los mods que deseas descargar. Usa el menú de Mods para cambiar los mods que están actualmente activos. Después de cambiar de mods, asegúrate de pulsar el botón Recargar mods para poder usarlos.",
 		"tModLoaderSettings": "Configuración de tModLoader",
-		
+
 		// Mods Menu
 		"ModsModsList": "Lista de mods",
 		"ModsEnableAll": "Activar todos",

diff --git a/patches/tModLoader/Terraria.Localization.Content/ru-RU.tModLoader.json b/patches/tModLoader/Terraria.Localization.Content/ru-RU.tModLoader.json
@@ -224,7 +224,7 @@
 		"ShowMemoryEstimatesNo": "Показывать приблизительное использование памяти: Нет",
 		"ClearMBCredentials": "Очистить данные браузера модов",
 		"AutomaticallyEnableNewlyDownloadedModsYes": "Автоматически включать недавно скачанные моды: Да",
-		"AutomaticallyEnableNewlyDownloadedModsNo": "Автоматически включать недавно скачанные моды: Нет", 
+		"AutomaticallyEnableNewlyDownloadedModsNo": "Автоматически включать недавно скачанные моды: Нет",
 		"AutomaticallyReloadAndEnableModsLeavingModBrowserYes": "Автоматически включать и перезагружать моды при выходе из браузера модов: Да",
 		"AutomaticallyReloadAndEnableModsLeavingModBrowserNo": "Автоматически включать и перезагружать моды при выходе из браузера модов: Нет",
 		"ReloadModsReminder": "Вы обновили мод. Не забудьте перезагрузить моды, чтобы изменения вступили в силу.",

diff --git a/patches/tModLoader/Terraria.ModLoader/ItemLoader.cs b/patches/tModLoader/Terraria.ModLoader/ItemLoader.cs
@@ -120,6 +120,7 @@ internal static void ResizeArrays(bool unloading) {
 			Array.Resize(ref ItemID.Sets.LockOnAimAbove, nextItem);
 			Array.Resize(ref ItemID.Sets.LockOnAimCompensation, nextItem);
 			Array.Resize(ref ItemID.Sets.SingleUseInGamepad, nextItem);
+			Array.Resize(ref ItemID.Sets.ItemsThatCountAsBombsForDemolitionistToSpawn, nextItem);
 			ItemID.Sets.IsAMaterial = new bool[nextItem]; // clears it, which is desired.
 			for (int k = ItemID.Count; k < nextItem; k++) {
 				Lang._itemNameCache[k] = LocalizedText.Empty;

diff --git a/patches/tModLoader/Terraria.ModLoader/ModLoader.cs b/patches/tModLoader/Terraria.ModLoader/ModLoader.cs
@@ -27,7 +27,7 @@ namespace Terraria.ModLoader
 	/// </summary>
 	public static class ModLoader
 	{
-		public static readonly Version version = new Version(0, 11, 7, 3);
+		public static readonly Version version = new Version(0, 11, 7, 4);
 		// Stores the most recent version of tModLoader launched. Can be used for migration.
 		public static Version LastLaunchedTModLoaderVersion;
 		// public static bool ShowWhatsNew;

diff --git a/solutions/CompleteRelease.bat b/solutions/CompleteRelease.bat
@@ -4,7 +4,7 @@
 @ECHO off
 :: Compile/Build exe 
 echo "Building Release"
-set tModLoaderVersion=v0.11.7.3
+set tModLoaderVersion=v0.11.7.4
 call buildRelease.bat
 
 set destinationFolder=.\tModLoader %tModLoaderVersion% Release

diff --git a/solutions/ReleaseExtras/version b/solutions/ReleaseExtras/version
@@ -1 +1 @@
-v0.11.7.3
+v0.11.7.4
diff --git a/solutions/TranslationsNeeded.txt b/solutions/TranslationsNeeded.txt
@@ -1,5 +1,4 @@
 zh-Hans 1
-ru-RU 198
 pt-BR 260
 pl-PL 171
 it-IT 303

diff --git a/solutions/UpdateLocalizationFiles.py b/solutions/UpdateLocalizationFiles.py
@@ -2,7 +2,7 @@
 # Run this script after updating en-US.tModLoader.json with new keys. python 3.
 # Also make sure the file encodings are UTF-8 not UTF-8-BOM.
 
-filename = '../src/tModLoader/Terraria.Localization.Content.{0}.tModLoader.json'
+filename = '../src/tModLoader/Terraria.Localization.Content/{0}.tModLoader.json'
 
 languages = ['zh-Hans', 'ru-RU', 'pt-BR', 'pl-PL', 'it-IT', 'fr-FR', 'es-ES', 'de-DE']
 missings = []

diff --git a/solutions/documentation/Doxyfile b/solutions/documentation/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = "Terraria ModLoader"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 0.11.7.3
+PROJECT_NUMBER         = 0.11.7.4
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
-Original file line number
+Diff line change
@@ Expand Up / @@ -342,4 +342,4 @@ @@
     	"CommonItemTooltip": {
     		"PercentIncreasedDamage": "Um {0}% erhöhter Schaden"
     	}
-    }
+    }