Skip to content

Commit bedc9fa

Browse files
JavidPackJavidPack
committed
tModLoader v0.11.6.2 patches/changes.
1 parent ba4ab8f commit bedc9fa

File tree

76 files changed

+902
-324
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+902
-324
lines changed

‎RoslynWrapper/RoslynWrapper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public static CompilerErrorCollection Compile(string name, string outputPath, st
4242
IsWarning = d.Severity == DiagnosticSeverity.Warning,
4343
ErrorText = d.GetMessage(),
4444
FileName = loc.Path ?? "",
45-
Line = loc.StartLinePosition.Line,
45+
Line = loc.StartLinePosition.Line+1,
4646
Column = loc.StartLinePosition.Character
4747
});
4848
}

‎patches/tModLoader/Terraria.GameContent.UI.States/UICharacterSelect.cs.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
+ if (list.Count == 0)
4747
+ {
4848
+ string vanillaPlayersPath = Path.Combine(ReLogic.OS.Platform.Current.GetStoragePath("Terraria"), "Players");
49-
+ if (Directory.Exists(vanillaPlayersPath))
49+
+ if (Directory.Exists(vanillaPlayersPath) && Directory.GetFiles(vanillaPlayersPath, "*.plr").Any())
5050
+ {
5151
+ var autoMigrateButton = new UIPanel();
5252
+ autoMigrateButton.Width.Set(0, 1);
@@ -64,7 +64,7 @@
6464
+ .Where(s => s.EndsWith(".plr") || s.EndsWith(".tplr") || s.EndsWith(".bak"));
6565
+
6666
+ foreach (string file in vanillaPlayerFiles) {
67-
+ File.Copy(file, Path.Combine(Main.PlayerPath, Path.GetFileName(file)));
67+
+ File.Copy(file, Path.Combine(Main.PlayerPath, Path.GetFileName(file)), true); // old .bak files might exist, need to have overwrite
6868
+ }
6969
+
7070
+ // Copy map files
@@ -76,7 +76,7 @@
7676
+ foreach (string mapFile in mapFiles) {
7777
+ string mapFileDir = Path.Combine(Main.PlayerPath, Directory.GetParent(mapFile).Name);
7878
+ Directory.CreateDirectory(mapFileDir);
79-
+ File.Copy(mapFile, Path.Combine(mapFileDir, Path.GetFileName(mapFile)));
79+
+ File.Copy(mapFile, Path.Combine(mapFileDir, Path.GetFileName(mapFile)), true);
8080
+ }
8181
+ }
8282
+ catch (Exception e) {

‎patches/tModLoader/Terraria.GameContent.UI.States/UIWorldSelect.cs.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
+ if (list.Count == 0)
2727
+ {
2828
+ string vanillaWorldsPath = Path.Combine(ReLogic.OS.Platform.Current.GetStoragePath("Terraria"), "Worlds");
29-
+ if (Directory.Exists(vanillaWorldsPath))
29+
+ if (Directory.Exists(vanillaWorldsPath) && Directory.GetFiles(vanillaWorldsPath, "*.wld").Any())
3030
+ {
3131
+ var autoMigrateButton = new UIPanel();
3232
+ autoMigrateButton.Width.Set(0, 1);
@@ -44,7 +44,7 @@
4444
+ .Where(s => s.EndsWith(".wld") || s.EndsWith(".twld") || s.EndsWith(".bak"));
4545
+
4646
+ foreach (string file in vanillaWorldFiles) {
47-
+ File.Copy(file, Path.Combine(Main.WorldPath, Path.GetFileName(file)));
47+
+ File.Copy(file, Path.Combine(Main.WorldPath, Path.GetFileName(file)), true);
4848
+ }
4949
+
5050
+ _currentlyMigratingFiles = false;

‎patches/tModLoader/Terraria.Localization.Content.it-IT.tModLoader.json

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
{
44
"tModLoader": {
55
// Main Menu
6-
"PatreonSupport": "Mostra un pò di amore per la mod, perfavore: ",
7-
"MenuModBrowser": "Browser delle Mod",
8-
"MenuMods": "Mod",
9-
"MenuModSources": "Fonti delle Mod",
6+
// "PatreonSupport": "Please show your support: ",
7+
// "MenuModBrowser": "Mod Browser",
8+
// "MenuMods": "Mods",
9+
// "MenuModSources": "Mod Sources",
1010
// "MenuEnableDeveloperMode": "Enable Developer Mode",
1111
// "FirstLaunchWelcomeMessage": "Welcome to tModLoader.\n\nYou have successfully installed tModLoader. Use the Mod Browser menu to find mods you wish to download. Use the Mods menu to change which mods are currently active. After changing mods, make sure you click the Reload Mods button to reload them.",
1212

1313
// Mods Menu
14-
"ModsModsList": "Lista delle Mod",
15-
"ModsEnableAll": "Abilita Tutte",
16-
"ModsDisableAll": "Disabilita Tutte",
17-
"ModsReloadMods": "Ricarica Mod",
18-
"ModsOpenModsFolder": "Apri Cartella delle Mod",
19-
"ModsModPacks": "Pacchetti di Mod",
20-
"ModsDisable": "Disabilita",
21-
"ModsEnable": "Abilita",
14+
// "ModsModsList": "Mods List",
15+
// "ModsEnableAll": "Enable All",
16+
// "ModsDisableAll": "Disable All",
17+
// "ModsReloadMods": "Reload Mods",
18+
// "ModsOpenModsFolder": "Open Mods Folder",
19+
// "ModsModPacks": "Mod Packs",
20+
// "ModsDisable": "Click to disable",
21+
// "ModsEnable": "Click to enable",
2222
// "ModsOpenConfig": "Click to open config",
2323
// "ModOldWarning": "Old mod, enable at own risk",
2424
// "ModDependencyClickTooltip": "This mod depends on: {0}\n (click to enable)",
@@ -31,17 +31,17 @@
3131
// "ModReloadForced": "Reload Forced",
3232
// "ModIsServerSide": "This is a server side mod",
3333
// "ModsByline": "By: {0}",
34-
"ModsMoreInfo": "Altre Informazioni",
35-
"ModsOriginatedFromModBrowser": "Questa mod è originata dal Browser delle Mod",
36-
"ModsTypeToSearch": "Scrivi per cercare",
37-
"ModsSearchByModName": "Cerca per Nome della Mod",
38-
"ModsSearchByAuthor": "Cerca per Nome dell'Autore",
39-
"ModsSortRecently": "Cerca per recentemente modificate",
40-
"ModsSortNamesAlph": "Ordina i nomi delle Mod alfabeticamente",
41-
"ModsSortNamesReverseAlph": "Ordina i nomi delle Mod in alfabeto riverso",
42-
"ModsShowAllMods": "Mostra tutte le Mod",
43-
"ModsShowEnabledMods": "Mostra solo le Mod abilitate",
44-
"ModsShowDisabledMods": "Mostra solo le Mod disabilitate",
34+
// "ModsMoreInfo": "More info",
35+
// "ModsOriginatedFromModBrowser": "This mod originated from the Mod Browser",
36+
// "ModsTypeToSearch": "Type to search",
37+
// "ModsSearchByModName": "Search by Mod name",
38+
// "ModsSearchByAuthor": "Search by Author name",
39+
// "ModsSortRecently": "Sort by recently changed",
40+
// "ModsSortNamesAlph": "Sort mod names alphabetically",
41+
// "ModsSortNamesReverseAlph": "Sort mod names reverse-alphabetically",
42+
// "ModsShowAllMods": "Show all mods",
43+
// "ModsShowEnabledMods": "Show only enabled mods",
44+
// "ModsShowDisabledMods": "Show only disabled mods",
4545
// "ModsXItems": "{0} items",
4646
// "ModsXNPCs": "{0} NPCs",
4747
// "ModsXTiles": "{0} tiles",
@@ -137,32 +137,32 @@
137137
// "MPPacketTooLarge": "Packet too large {0} > {1}",
138138

139139
// Mod Browser
140-
"MBDownload": "Scarica",
140+
// "MBDownload": "Download",
141141
// "MBDownloadAll": "Download All",
142142
// "MBDownloadingMod": "Downloading: {0}",
143143
// "MBInstallingMod": "Installing: {0}",
144144
// "MBDownloadFileProblem": "Failed to handle {0}",
145145
// "MBReleaseFileHandle": "Releasing file handle for {0}",
146146
// "MBDownloadFinished": "Downloading mods finished, returning to browser",
147147
// "MBUploadingMod": "Uploading: {0}",
148-
"MBDowngrade": "Retrocedi",
149-
"MBUpdate": "Aggiorna",
148+
// "MBDowngrade": "Downgrade",
149+
// "MBUpdate": "Update",
150150
// "MBRequiresTMLUpdate": "Requires {0}",
151151
// "MBClickToUpdate": "Click to update",
152152
// "MBDowngradeWithDependencies": "Downgrade with dependencies",
153153
// "MBUpdateWithDependencies": "Update with dependencies",
154154
// "MBDownloadWithDependencies": "Download with dependencies",
155155
// "MBUpdateAll": "Update All",
156-
"MBReloadBrowser": "Ricarica browser",
156+
// "MBReloadBrowser": "Reload browser",
157157
// "MBGettingData": "Getting data...",
158158
// "MBPopulatingBrowser": "Populating browser...",
159-
"MBSortByRecentlyUpdated": "Ordina per recentemente scaricate",
160-
"MBSortByPopularity": "Ordina per popolarità",
161-
"MBSortDownloadDesc": "Ordina per Download discendenti",
162-
"MBSortDownloadAsc": "Ordina per Download ascendenti",
163-
"MBShowAllMods": "Mostra tutte le Mod",
164-
"MBShowNotInstalledUpdates": "Mostra Mod non scaricate e aggiornamenti",
165-
"MBShowUpdates": "Mostra solo aggiornamenti",
159+
// "MBSortByRecentlyUpdated": "Sort by recently updated",
160+
// "MBSortByPopularity": "Sort by popularity",
161+
// "MBSortDownloadDesc": "Sort by downloads descending",
162+
// "MBSortDownloadAsc": "Sort by downloads ascending",
163+
// "MBShowAllMods": "Show all mods",
164+
// "MBShowNotInstalledUpdates": "Show mods not installed and updates",
165+
// "MBShowUpdates": "Show only updates",
166166
// "MBShowInstalled": "Show installed mods",
167167
// "MBShowMSAll": "Show all mods",
168168
// "MBShowMSBoth": "Show normal side only mods",
@@ -207,23 +207,23 @@
207207
// "MBServerResponse": "The Mod Browser server response:\n\n{0}",
208208

209209
// TML Options
210-
"DownloadFromServersYes": "Scarica Mod Dai Server: Attivato",
211-
"DownloadFromServersNo": "Scarica Mod Dai Server: Disattivato",
212-
"DownloadSignedYes": "Scarica Solo Mod Firmate Dai Server: Attivato",
213-
"DownloadSignedNo": "Scarica Solo Mod Firmate Dai Server: Disattivato",
214-
"MusicStreamModeConvert": "Modalità Streaming Di Musica: Converti A Richiesta",
215-
"MusicStreamModeStream": "Modalità Streaming Di Musica: Streaming Dalla Cache",
216-
"AlwaysLogExceptionsYes": "Scrivi log di Errori nascosti: Attivato",
217-
"AlwaysLogExceptionsNo": "Scrivi log di Errori nascosti: Disattivato",
218-
"ExperimentalFeaturesYes": "Feature Sperimentali: Attivato",
219-
"ExperimentalFeaturesNo": "Feature Sperimentali: Disattivato",
210+
// "DownloadFromServersYes": "Download Mods From Servers: On",
211+
// "DownloadFromServersNo": "Download Mods From Servers: Off",
212+
// "DownloadSignedYes": "Only Download Signed Mods From Servers: On",
213+
// "DownloadSignedNo": "Only Download Signed Mods From Servers: Off",
214+
// "MusicStreamModeConvert": "Music Stream Mode: Convert On Demand",
215+
// "MusicStreamModeStream": "Music Stream Mode: Stream From Cache",
216+
// "AlwaysLogExceptionsYes": "Always Log Exceptions: On",
217+
// "AlwaysLogExceptionsNo": "Always Log Exceptions: Off",
218+
// "ExperimentalFeaturesYes": "Experimental Features: On",
219+
// "ExperimentalFeaturesNo": "Experimental Features: Off",
220220
// "RemoveForcedMinimumZoomYes": "Remove Forced Minimum Zoom: On",
221221
// "RemoveForcedMinimumZoomNo": "Remove Forced Minimum Zoom: Off",
222222
// "AllowGreaterResolutionsYes": "Allow Greater Resolutions: On",
223223
// "AllowGreaterResolutionsNo": "Allow Greater Resolutions: Off",
224224
// "ShowMemoryEstimatesYes": "Show Mod Memory Estimates: On",
225225
// "ShowMemoryEstimatesNo": "Show Mod Memory Estimates: Off",
226-
"ClearMBCredentials": "Ripulisci credenziali del Mod Browser",
226+
// "ClearMBCredentials": "Clear Mod Browser Credentials",
227227
// "AutomaticallyEnableNewlyDownloadedModsYes": "Automatically enabled newly downloaded mods: On",
228228
// "AutomaticallyEnableNewlyDownloadedModsNo": "Automatically enabled newly downloaded mods: Off",
229229
// "AutomaticallyReloadAndEnableModsLeavingModBrowserYes": "Automatically enable and reload mods when leaving Mod Browser: On",
@@ -251,14 +251,14 @@
251251
// "PlayerLoadWorldFail": "A problem was encountered when trying to load a world",
252252

253253
// Mod Sources
254-
"MSBuild": "Costruisci",
255-
"MSBuildReload": "Costruisci + Ricarica",
256-
"MSBuildAll": "Costruisci Tutte",
257-
"MSBuildReloadAll": "Costruisci + Ricarica Tutte",
254+
// "MSBuild": "Build",
255+
// "MSBuildReload": "Build + Reload",
256+
// "MSBuildAll": "Build All",
257+
// "MSBuildReloadAll": "Build + Reload All",
258258
// "MSUpgradeCSProj": "Upgrade .csproj file",
259-
"MSOpenSources": "Risorse aperte",
260-
"MSManagePublished": "Gestisci Pubblicate",
261-
"MSPublish": "Pubblica",
259+
// "MSOpenSources": "Open Sources",
260+
// "MSManagePublished": "Manage Published",
261+
// "MSPublish": "Publish",
262262
// "MSModSourcesCantHaveSpaces": "(Mod Sources folders can't have spaces)",
263263
// "MSCreateMod": "Create Mod",
264264

@@ -305,11 +305,11 @@
305305
// "EnabledEAC": "Edit and continue path: {0}",
306306
// "Packaging": "Packaging: {0}",
307307
// There should be ModName after ':'
308-
"MSFinding": "Trovando Mod...",
308+
// "MSFinding": "Finding Mods...",
309309
// "MSInstantiating": "Instantiating Mods...",
310310
// "MSSandboxing": "Sandboxing: {0}",
311-
"MSIntializing": "Inizializzazione: ",
312-
"MSLoading": "Caricando Mod: ",
311+
// "MSIntializing": "Initializing: {0}",
312+
// "MSLoading": "Loading: {0}",
313313
// "MSUnloading": "Unloading: {0}",
314314
// "MSFinishingResourceLoading": "Finishing Resource Loading",
315315
// "MSSettingUp": "Setting up...",
@@ -328,9 +328,9 @@
328328
// "DefaultNurseCantHealChat": "I don't know why I can't heal you, the modder forgot to give me a chat message.",
329329

330330
// Extra mouse buttons
331-
"MouseMiddle": "Mouse Centrale",
332-
"MouseXButton1": "Mouse 4",
333-
"MouseXButton2": "Mouse 5"
331+
// "MouseMiddle": "Middle Mouse",
332+
// "MouseXButton1": "Mouse 4",
333+
// "MouseXButton2": "Mouse 5",
334334

335335
// Misc
336336
// "OK": "OK",
@@ -341,6 +341,6 @@
341341
// "ServerCrash": "Server crash: {0}\n{1}\n\nPlease check server.log to determine if a mod is responsible, otherwise head to #support in the tModLoader Discord"
342342
},
343343
"CommonItemTooltip": {
344-
"PercentIncreasedDamage": "Danno aumentato del {0}%"
344+
// "PercentIncreasedDamage": "{0}% increased damage"
345345
}
346346
}

0 commit comments

Comments
 (0)