Skip to content

Commit 2ab7562

Browse files
committed
Merge remote-tracking branch 'upstream/master' into BLTCSE_ClientOnlyDLL
2 parents 0846695 + d9d0b8e commit 2ab7562

17 files changed

+787
-38
lines changed

mods/base/base.lua

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,11 @@ if io then
6060
end
6161

6262
io.remove_directory_and_files = function( path, do_log )
63-
63+
if not path then
64+
log("[Error] paramater #1 to io.remove_directory_and_files, string expected, recieved " .. tostring(path))
65+
return false
66+
end
67+
6468
if not file.DirectoryExists( path ) then
6569
log("[Error] Directory does not exist: " .. path)
6670
return false
@@ -277,7 +281,7 @@ if _loaded_mod_folders and _mods then
277281
end
278282

279283
end
280-
284+
281285
-- Prioritize
282286
table.sort( _mods, function(a, b)
283287
return a.priority > b.priority
@@ -286,7 +290,7 @@ if _loaded_mod_folders and _mods then
286290
-- Add mod hooks to tables
287291
for k, v in ipairs( _mods ) do
288292

289-
if LuaModManager:IsModEnabled( v.path ) then
293+
if LuaModManager:IsModEnabled( v.path ) and LuaModManager:HasRequiredMod(v) then
290294

291295
-- Load pre- and post- hooks
292296
add_hooks_table( v, C.mod_hooks_key, _posthooks )

mods/base/loc/de.txt

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
{
2+
"base_options_menu_lua_mods" : "Lua Mods",
3+
"base_options_menu_lua_mods_desc" : "Status pruefen, installierte Lua-Mods aktivieren oder deaktivieren",
4+
"base_options_menu_keybinds" : "Mod Tastenkuerzel",
5+
"base_options_menu_keybinds_desc" : "Tastenkuerzel fur Lua-Mods anpassen",
6+
"base_options_menu_lua_mod_options" : "Mod Optionen",
7+
"base_options_menu_lua_mod_options_desc" : "Lua Mods anpassen",
8+
9+
"base_mod_info_version" : "Version",
10+
"base_mod_info_author" : "Author",
11+
"base_mod_info_contact" : "Kontakt",
12+
"base_mod_info_path" : "Pfad",
13+
"base_mod_info_keybinds" : "Kuerzel",
14+
"base_mod_info_prehooks" : "Prae-Hooks",
15+
"base_mod_info_hooks" : "Hooks",
16+
"base_mod_info_persist" : "Persistente Skripte",
17+
"base_mod_info_disabled" : "Deaktiviert",
18+
"base_mod_info_to_be_disabled" : "Wird beim Neustart deaktiviert",
19+
"base_mod_info_to_be_enabled" : "Wird beim Neustart aktiviert",
20+
"base_mod_info_disabled_impossible" : "Kann nicht deaktiviert werden",
21+
22+
"base_mod_info_no_name" : "Mod ohne Name",
23+
"base_mod_info_no_desc" : "Mod ohne Beschreibung",
24+
"base_mod_info_no_author" : "Kein Author angegeben",
25+
"base_mod_info_no_contact" : "Keine Kontaktiformationen",
26+
"base_mod_info_no_keybinds" : "Ohne Kuerzel",
27+
"base_mod_info_no_hooks" : "Keine Hooks",
28+
"base_mod_info_no_prehooks" : "Keine Prae-Hooks",
29+
"base_mod_info_no_persist_scripts" : "Keine persistenten Skripte",
30+
31+
"base_mod_notifications_none" : "Keine Benachrichtigungen",
32+
"base_mod_notifications_prev" : "<",
33+
"base_mod_notifications_next" : ">",
34+
"base_mod_notifications_count" : "$current/$max",
35+
36+
"base_mod_updates_all_up_to_date" : "Alle Mods aktuell!",
37+
"base_mod_updates_updates_required" : " $count Aktualisierung(en) benoetigt",
38+
"base_mod_updates_updates_required_row" : " $mod",
39+
"base_mod_updates_click_manager" : "[Update Manager oeffnen]",
40+
41+
"base_mod_updates_update_all" : "Alle Mods aktualisieren",
42+
"base_mod_automically_check_for_updates" : "$mod_name Aktualisierungen",
43+
"base_mod_automically_check_for_updates_desc" : "Beim Spielstart automatisch nach Aktualisierungen fuer $mod_name suchen",
44+
"base_mod_check_for_updates_now" : "Aktualisiere $mod_name jetzt",
45+
"base_mod_check_for_updates_now_desc" : "Jetzt nach Aktualisierungen fuer $mod_name suchen",
46+
47+
"base_mod_updates_show_update_available" : "$mod_name Update verfuegbar",
48+
"base_mod_updates_show_update_available_message" : "Es ist eine Aktualisierung fuer $mod_name verfuegbar!\nEs kann direkt heruntergeladen werden, wenn Du den Update Manager links-unten oeffnest!",
49+
50+
"base_mod_updates_update_mod_now" : "Jetzt $mod_name aktualisieren",
51+
"base_mod_update_update_available" : "Fur $mod_name ist eine Aktualisierung verfuegbar!\nWillst Du $mod_name jetzt aktualisieren?",
52+
"base_mod_updates_open_update_manager" : "Oeffne Update Manager",
53+
"base_mod_updates_open_update_notes" : "Oeffne Patch Notes (Steam Overlay benoetigt)",
54+
"base_mod_updates_update_now" : "Jetzt aktualisieren",
55+
"base_mod_updates_update_later" : "Spater aktualisieren",
56+
57+
"base_mod_updates_show_multiple_update_available" : "Mehrere Aktualisierungen verfuegbar",
58+
"base_mod_updates_show_multiple_update_available_message" : "Es stehen Aktualisierungen fuer folgende Mods bereit:\n$mods\nDu kannst Sie automatisch aktualiseren, wenn Du den Update Manager oeffnest!",
59+
"base_mod_updates_update_all_now" : "Alle Mods aktualisieren",
60+
61+
"base_mod_update_no_update_available_title" : "$mod_name Aktuell!",
62+
"base_mod_update_no_update_available" : "Du hast die neueste Version von $mod_name.\nWillst Du $mod_name herunterladen und neu installieren?",
63+
"base_mod_update_no_update_available_no_data" : "$mod_name ist aktuell.",
64+
"base_mod_update_no_update_available_force" : "Erneutes Herunterladen erzwingen",
65+
66+
"base_mod_download_downloading_mod" : "Lade: $mod_name",
67+
"base_mod_download_download_progress" : "Heruntergeladen $downloaded kb / $total kb",
68+
"base_mod_download_download_progress_extract" : "Entpacke...",
69+
"base_mod_download_download_progress_complete" : "Herunterladen abgeschlossen, bitte Payday2 neustarten!",
70+
"base_mod_download_download_progress_failed" : "Herunterladen fehlgeschlagen, bitte erneut versuchen! :(",
71+
72+
"base_language_select" : "Sprache",
73+
"base_language_select_desc" : "Waehle die Sprache, in der Texte der BLT angezeigt werden sollen",
74+
"base_language_en" : "Englisch",
75+
"base_language_de" : "Deutsch",
76+
"base_language_fr" : "French",
77+
"base_language_ru" : "Russian",
78+
"base_language_tr" : "Turkish",
79+
80+
}

mods/base/loc/en.txt

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535

3636
"base_mod_updates_all_up_to_date" : "All mods up to date!",
3737
"base_mod_updates_updates_required" : " $count Update$s Required",
38+
"base_mod_updates_mod_required" : " $count Mod$s Required",
3839
"base_mod_updates_updates_required_row" : " $mod",
3940
"base_mod_updates_click_manager" : "[Click to View Updates Manager]",
4041

@@ -43,7 +44,12 @@
4344
"base_mod_automically_check_for_updates_desc" : "Automatically check the server for updates for the mod $mod_name every time the game is loaded",
4445
"base_mod_check_for_updates_now" : "Update $mod_name Now",
4546
"base_mod_check_for_updates_now_desc" : "Check the server for updates for $mod_name immediately",
46-
47+
48+
"base_mod_notify_required" : "$mod_name Notification",
49+
"base_mod_notify_required_desc" : "Automatically notify you that $mod_name is required to be installed by certain mods",
50+
"base_mod_download_required_now" : "Download $mod_name Now",
51+
"base_mod_download_required_now_desc" : "Download and Install $mod_name immediately",
52+
4753
"base_mod_updates_show_update_available" : "$mod_name Update Available",
4854
"base_mod_updates_show_update_available_message" : "An update for $mod_name is available!\nIt can be automatically downloaded for by visiting the Update Manager in the lower-left!",
4955

@@ -54,6 +60,14 @@
5460
"base_mod_updates_update_now" : "Update Now",
5561
"base_mod_updates_update_later" : "Update Later",
5662

63+
"base_mod_updates_show_required_available" : "Download $mod_name Now",
64+
"base_mod_updates_show_required_available_message" : "$req_mod_name require(s) $mod_name to be installed to function!\nDo you want to download $mod_name now?",
65+
"base_mod_updates_show_required_available_optional_message" : "$req_mod_name require(s) $mod_name to be installed for all features to work!\nDo you want to download $mod_name now?",
66+
"base_mod_required_update_mod_now" : "Download Now",
67+
"base_mod_required_update_later" : "Download Later",
68+
"base_mod_updates_show_multiple_require_available" : "Multiple Mods Required",
69+
"base_mod_updates_show_multiple_require_available_message" : "The following mods are required for certain mods to function fully:\n$mods\nYou can update them by visiting the Update Manager in the lower-left!",
70+
5771
"base_mod_updates_show_multiple_update_available" : "Multiple Updates Available",
5872
"base_mod_updates_show_multiple_update_available_message" : "Updates are available for the following mods:\n$mods\nYou can update them by visiting the Update Manager in the lower-left!",
5973
"base_mod_updates_update_all_now" : "Update All Mods Now",
@@ -69,4 +83,13 @@
6983
"base_mod_download_download_progress_complete" : "Download Complete, Please restart your game!",
7084
"base_mod_download_download_progress_failed" : "Download Failed, Please try again! :(",
7185

86+
"base_language_select" : "Language",
87+
"base_language_select_desc" : "Select the language for the BLT to be displayed in",
88+
"base_language_en" : "English",
89+
"base_language_de" : "German",
90+
"base_language_fr" : "French",
91+
"base_language_ru" : "Russian",
92+
"base_language_tr" : "Turkish",
93+
"base_language_id" : "Indonesian",
94+
7295
}

mods/base/loc/fr.txt

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
{
2+
"base_options_menu_lua_mods" : "Mods Lua",
3+
"base_options_menu_lua_mods_desc" : "Vérifier l'état, activer et désactiver vos mods installés",
4+
"base_options_menu_keybinds" : "Keybinds des mods",
5+
"base_options_menu_keybinds_desc" : "Personnalisez vos keybinds pour les modifications de lua",
6+
"base_options_menu_lua_mod_options" : "Options des mods",
7+
"base_options_menu_lua_mod_options_desc" : "Paramétrer les mods",
8+
9+
"base_mod_info_version" : "Version",
10+
"base_mod_info_author" : "Auteur",
11+
"base_mod_info_contact" : "Contact",
12+
"base_mod_info_path" : "Emplacement",
13+
"base_mod_info_keybinds" : "Keybinds",
14+
"base_mod_info_prehooks" : "Pre-Fichier",
15+
"base_mod_info_hooks" : "Fichier",
16+
"base_mod_info_persist" : "Scripts persistants",
17+
"base_mod_info_disabled" : "Désactivé",
18+
"base_mod_info_to_be_disabled" : "Sera désactivée au redémarrage",
19+
"base_mod_info_to_be_enabled" : "Sera activé au redémarrage",
20+
"base_mod_info_disabled_impossible" : "Ne peut pas être désactivé",
21+
22+
"base_mod_info_no_name" : "Pas de nom",
23+
"base_mod_info_no_desc" : "Pas de description",
24+
"base_mod_info_no_author" : "Pas de Auteur spécifié",
25+
"base_mod_info_no_contact" : "Pas de contact",
26+
"base_mod_info_no_keybinds" : "Pas de Keybinds",
27+
"base_mod_info_no_hooks" : "Pas de fichier",
28+
"base_mod_info_no_prehooks" : "Pas de Pre-Fichier",
29+
"base_mod_info_no_persist_scripts" : "Pas de Scripts persistants",
30+
31+
"base_mod_notifications_none" : "Pas de Notifications",
32+
"base_mod_notifications_prev" : "<",
33+
"base_mod_notifications_next" : ">",
34+
"base_mod_notifications_count" : "$current/$max",
35+
36+
"base_mod_updates_all_up_to_date" : "Tout les mods sont à jour!",
37+
"base_mod_updates_updates_required" : " $count mises à jour$s Requis",
38+
"base_mod_updates_updates_required_row" : " $mod",
39+
"base_mod_updates_click_manager" : "[Cliquez ici pour voir le gestionnaire des mises à jour]",
40+
41+
"base_mod_updates_update_all" : "Mettre à jour tout les mods",
42+
"base_mod_automically_check_for_updates" : "$mod_name Updates",
43+
"base_mod_automically_check_for_updates_desc" : "Vérifier automatiquement si le mod $mod_name est à jour à chaque fois que le jeu est lancé",
44+
"base_mod_check_for_updates_now" : "Mettre à jour $mod_name Maintenant",
45+
"base_mod_check_for_updates_now_desc" : "Voir si il y a une mise à jour pour $mod_name immédiatement",
46+
47+
"base_mod_updates_show_update_available" : "$mod_name Mise à jour Disponible",
48+
"base_mod_updates_show_update_available_message" : "Une mise à jour pour $mod_name est disponible!\nIl peut être automatiquement téléchargé en visitant le gestionnaire des mises à jour en bas à gauche!",
49+
50+
"base_mod_updates_update_mod_now" : "Mettre à jour $mod_name Maintenant",
51+
"base_mod_update_update_available" : "Une mise à jour est disponible pour $mod_name!\nVoulez-vous mettre à jour $mod_name maintenant?",
52+
"base_mod_updates_open_update_manager" : "Ouvrir le gestionnaire des mises à jour",
53+
"base_mod_updates_open_update_notes" : "Voir les notes de mises à jour (Overlay Steam Requis)",
54+
"base_mod_updates_update_now" : "Mettre à jour",
55+
"base_mod_updates_update_later" : "Mettre à jour plus tard",
56+
57+
"base_mod_updates_show_multiple_update_available" : "Plusieurs mises à jour disponibles",
58+
"base_mod_updates_show_multiple_update_available_message" : "Des mises à jour sont disponibles pour les mods suivants:\n$mods\nVous pouvez les mettres à jour en visitant le gestionnaire des mises à jour en bas à gauche!",
59+
"base_mod_updates_update_all_now" : "Mettre à jour tout les mods maintenant",
60+
61+
"base_mod_update_no_update_available_title" : "$mod_name est à jour!",
62+
"base_mod_update_no_update_available" : "Voulez vous re-télécharger et réinstaller $mod_name immédiatement?",
63+
"base_mod_update_no_update_available_no_data" : "Vous avez la derniere version de $mod_name.",
64+
"base_mod_update_no_update_available_force" : "Forcer le téléchargement",
65+
66+
"base_mod_download_downloading_mod" : "Téléchargement de $mod_name",
67+
"base_mod_download_download_progress" : "Téléchargement de $downloaded kb / sur $total kb",
68+
"base_mod_download_download_progress_extract" : "Extraction de l'archive...",
69+
"base_mod_download_download_progress_complete" : "Téléchargement fini, veuillez redémarrez votre jeu!",
70+
"base_mod_download_download_progress_failed" : "Téléchargement raté, veuillez essayer à nouveau! :(",
71+
72+
"base_language_select" : "Langue",
73+
"base_language_select_desc" : "Choisir la langue du BLT",
74+
"base_language_fr" : "Français",
75+
"base_language_en" : "Anglais",
76+
"base_language_de" : "Allemand",
77+
"base_language_ru" : "Russe",
78+
"base_language_tr" : "Turque",
79+
80+
}

mods/base/loc/id.txt

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
{
2+
"base_options_menu_lua_mods" : "Lua Mods",
3+
"base_options_menu_lua_mods_desc" : "Cek status, mengaktifkan dan menonaktifkan mods Lua Anda yang terpasang",
4+
"base_options_menu_keybinds" : "Mod Keybinds",
5+
"base_options_menu_keybinds_desc" : "Atur keybinds untuk modifikasi lua",
6+
"base_options_menu_lua_mod_options" : "Opsi Mod",
7+
"base_options_menu_lua_mod_options_desc" : "Atur lua mods Anda",
8+
9+
"base_mod_info_version" : "Versi",
10+
"base_mod_info_author" : "Pencipta",
11+
"base_mod_info_contact" : "Kontak",
12+
"base_mod_info_path" : "Letak",
13+
"base_mod_info_keybinds" : "Keybinds",
14+
"base_mod_info_prehooks" : "Pre-Hooks",
15+
"base_mod_info_hooks" : "Hooks",
16+
"base_mod_info_persist" : "Skrip Persisten",
17+
"base_mod_info_disabled" : "Dinonaktifkan",
18+
"base_mod_info_to_be_disabled" : "Akan dinonaktifkan setelah dimulai ulang",
19+
"base_mod_info_to_be_enabled" : "Akan diaktifkan setelah dimulai ulang",
20+
"base_mod_info_disabled_impossible" : "Tidak bisa dinonaktifkan",
21+
22+
"base_mod_info_no_name" : "Tidak ada Nama Mod",
23+
"base_mod_info_no_desc" : "Tidak ada Diskripsi Mod",
24+
"base_mod_info_no_author" : "Pencipta tidak ditetapkan",
25+
"base_mod_info_no_contact" : "tidak ada detail kontak",
26+
"base_mod_info_no_keybinds" : "Tidak ada Keybinds",
27+
"base_mod_info_no_hooks" : "Tidak ada Hooks",
28+
"base_mod_info_no_prehooks" : "Tidak ada Pre-Hooks",
29+
"base_mod_info_no_persist_scripts" : "Tidak ada Skrip Persinten",
30+
31+
"base_mod_notifications_none" : "Tidak ada pemberitahuan",
32+
"base_mod_notifications_prev" : "<",
33+
"base_mod_notifications_next" : ">",
34+
"base_mod_notifications_count" : "$current/$max",
35+
36+
"base_mod_updates_all_up_to_date" : "Semua mod ini terbaru!",
37+
"base_mod_updates_updates_required" : " $count Pembaruan Dibutuhkan",
38+
"base_mod_updates_updates_required_row" : " $mod",
39+
"base_mod_updates_click_manager" : "[Tekan Untuk Melihat Pengelola Pembaruan]",
40+
41+
"base_mod_updates_update_all" : "Perbarui semua Mod",
42+
"base_mod_automically_check_for_updates" : "Perbarui $mod_name",
43+
"base_mod_automically_check_for_updates_desc" : "Secara otomatis memeriksa server untuk memperbarui mod $mod_name setiap permainan ini dimuat",
44+
"base_mod_check_for_updates_now" : "Perbarui $mod_name Sekarang",
45+
"base_mod_check_for_updates_now_desc" : "Cek server untuk perbarui segera $mod_name ini",
46+
47+
"base_mod_updates_show_update_available" : "Pembaruan $mod_name Tersedia",
48+
"base_mod_updates_show_update_available_message" : "Pembaruan $mod_name Tersedia!\nini dapat secara otomatis diunduh untuk dengan mengunjungi Pengelola Pembaruan pada kiri bawah!",
49+
50+
"base_mod_updates_update_mod_now" : "Perbarui $mod_name Sekarang",
51+
"base_mod_update_update_available" : "Pembaruan $mod_name tersedia!\nApakah Anda ingin memperbarui $mod_name sekarang?",
52+
"base_mod_updates_open_update_manager" : "Buka Pengelola Pembaruan",
53+
"base_mod_updates_open_update_notes" : "Lihat Catatan Patch (Membutuhkan Steam Overlay)",
54+
"base_mod_updates_update_now" : "Perbarui Sekarang",
55+
"base_mod_updates_update_later" : "Perbarui Nanti",
56+
57+
"base_mod_updates_show_multiple_update_available" : "Beberapa Pembaruan Tersedia",
58+
"base_mod_updates_show_multiple_update_available_message" : "Pembaruan tersedia untuk Mod Berikut ini:\n$mods\nAnda dapat memperbarui itu dengan mengunjungi Pengelola Pembaruan pada kiri bawah!",
59+
"base_mod_updates_update_all_now" : "Perbarui Semua Mod Sekarang",
60+
61+
"base_mod_update_no_update_available_title" : "$mod_name Ini Terbaru!",
62+
"base_mod_update_no_update_available" : "Anda mempunyai versi terbaru dari $mod_name.\nApakah Anda ingin mengunduh dan memasang ulang $mod_name ini secara otomatis?",
63+
"base_mod_update_no_update_available_no_data" : "Anda mempunyai versi terbaru dari $mod_name.",
64+
"base_mod_update_no_update_available_force" : "Paksa Unduh",
65+
66+
"base_mod_download_downloading_mod" : "Mengunduh $mod_name",
67+
"base_mod_download_download_progress" : "Mengunduh $downloaded kb / $total kb",
68+
"base_mod_download_download_progress_extract" : "Mengekstrak Arsip...",
69+
"base_mod_download_download_progress_complete" : "Pengunduhan Selesai, Silahkan mulai ulang permainan Anda!",
70+
"base_mod_download_download_progress_failed" : "Pengunduhan Sagal, Silahkan coba lagi! :(",
71+
72+
"base_language_select" : "Bahasa",
73+
"base_language_select_desc" : "Pilih bahasa yang akan ditampilkan dalam BLT",
74+
"base_language_en" : "Inggris",
75+
"base_language_de" : "Jerman",
76+
"base_language_fr" : "Perancis",
77+
"base_language_id" : "Indonesia",
78+
"base_language_ru" : "Rusia",
79+
"base_language_tr" : "Turki",
80+
81+
}

0 commit comments

Comments
 (0)