Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified data/staticData.sqlite
Binary file not shown.
2 changes: 1 addition & 1 deletion src/commands/despawn.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module.exports = {
getData(client, guildId) {
return new Builder.SlashCommandBuilder()
.setName('despawn')
.setDescription(client.intlGet(guildId, 'commandsStackDesc'))
.setDescription(client.intlGet(guildId, 'commandsDespawnDesc'))
.addStringOption(option => option
.setName('name')
.setDescription(client.intlGet(guildId, 'theNameOfTheItem'))
Expand Down
13 changes: 9 additions & 4 deletions src/discordTools/discordButtons.js
Original file line number Diff line number Diff line change
Expand Up @@ -498,25 +498,30 @@ module.exports = {
new Discord.ActionRowBuilder().addComponents(
module.exports.getButton({
style: Discord.ButtonStyle.Link,
label: 'DEVELOPER',
label: 'ORIGINAL DEVELOPER',
url: 'https://github.com/alexemanuelol'
}),
module.exports.getButton({
style: Discord.ButtonStyle.Link,
label: 'FORK DEVELOPER',
url: 'https://github.com/faithix'
}),
module.exports.getButton({
style: Discord.ButtonStyle.Link,
label: 'REPOSITORY',
url: 'https://github.com/alexemanuelol/rustplusplus'
url: 'https://github.com/faithix/rustplusplus'
})
),
new Discord.ActionRowBuilder().addComponents(
module.exports.getButton({
style: Discord.ButtonStyle.Link,
label: 'DOCUMENTATION',
url: 'https://github.com/alexemanuelol/rustplusplus/blob/master/docs/documentation.md'
url: 'https://github.com/faithix/rustplusplus/blob/master/docs/documentation.md'
}),
module.exports.getButton({
style: Discord.ButtonStyle.Link,
label: 'CREDENTIALS',
url: 'https://github.com/alexemanuelol/rustplusplus-Credential-Application/releases/v1.4.0'
url: 'https://rustplusplus-credentials.netlify.app/'
})
)];
},
Expand Down
2 changes: 1 addition & 1 deletion src/discordTools/discordEmbeds.js
Original file line number Diff line number Diff line change
Expand Up @@ -1048,7 +1048,7 @@ module.exports = {
},

getHelpEmbed: function (guildId) {
const repository = 'https://github.com/alexemanuelol/rustplusplus';
const repository = 'https://github.com/faithix/rustplusplus';
const credentials = `${repository}/blob/master/docs/credentials.md`;
const pairServer = `${repository}/blob/master/docs/pair_and_connect_to_server.md`;
const commands = `${repository}/blob/master/docs/commands.md`;
Expand Down
3 changes: 2 additions & 1 deletion src/external/findUnusedPhrases.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ for (const phrase of phrasesKeys) {

counter += 1;
}

console.log('\n!!!"unhandledRejection" is in index.ts and is not indexed in this search!!!\n');
console.log('\n!!!"...Interaction" is used in a function in DiscordBot.js (logInteraction())!!!\n');
console.log('\nUnused Phrases:\n');
console.log(unusedPhrases);
5 changes: 0 additions & 5 deletions src/languages/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,6 @@
"deathCap": "DEATH",
"decay": "Decay",
"decayingCap": "DECAYING",
"decayTimeForItem": "Čas decaye pro {item} je {time}.",
"deepSea": "Hluboké moře",
"deepSeaCanRespawnNow": "Poslední Deep Sea bylo před {time}. Deep Sea se může znovu objevit nyní a nejpozději do {respawnMax}.",
"deepSeaDetected": "Na mapě bylo detekováno hluboké moře!",
Expand Down Expand Up @@ -449,10 +448,7 @@
"interactionUpdateFailed": "Interaction update failed: {error}",
"invalidBattlemetricsId": "Neplatný Battlemetrics ID.",
"invalidGuildOrChannel": "Invalid guild or channel.",
"invalidHpInterval": "Neplatný interval HP {hp}.",
"invalidId": "Invalid ID: {id}.",
"invalidStructureType": "Neplatný typ struktury {type}.",
"invalidSubcommand": "Invalid subcommand.",
"invalidTimeDistance": "Invalid time distance: {distance}, prev: {prevTime}, new: {newTime}",
"isDecaying": "{device} is decaying!",
"isNoLongerConnected": "{device} is no longer electrically connected!",
Expand Down Expand Up @@ -756,7 +752,6 @@
"timeTill": "Time till {event}",
"timeTillDaylight": "{time} before daylight.",
"timeTillNightfall": "{time} before nightfall.",
"timeTillStructureDecay": "{time} before {type} wall decay.",
"timeUntilUnlocksAt": "{time} until unlocks at {location}.",
"tokensDidNotReplenish": "Tokens did not replenish in time.",
"toolCupboard": "Bedna s nářadím",
Expand Down
5 changes: 0 additions & 5 deletions src/languages/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,6 @@
"deathCap": "TOT",
"decay": "Zerfall",
"decayingCap": "ZERFÄLLT",
"decayTimeForItem": "Dauer bis zum Zerfall von {item} ist {time}.",
"deepSea": "Tiefsee",
"deepSeaCanRespawnNow": "Das letzte Deep Sea war vor {time}. Deep Sea kann jetzt respawnen und wird spätestens innerhalb von {respawnMax} respawnen.",
"deepSeaDetected": "Tiefsee auf der Karte erkannt!",
Expand Down Expand Up @@ -450,10 +449,7 @@
"interactionUpdateFailed": "Interaction update failed: {error}",
"invalidBattlemetricsId": "Ungültige Battlemetrics-ID",
"invalidGuildOrChannel": "Ungültiger Discord-Server oder Kanal.",
"invalidHpInterval": "Ungültige HP-Angabe {hp}.",
"invalidId": "Ungültige ID: {id}.",
"invalidStructureType": "Ungültiges Baumaterial ({type}).",
"invalidSubcommand": "Ungültiger Unterbefehl.",
"invalidTimeDistance": "Invalid time distance: {distance}, prev: {prevTime}, new: {newTime}",
"isDecaying": "{device} zerfällt!",
"isNoLongerConnected": "{device} ist nicht mehr elektrisch verbunden!",
Expand Down Expand Up @@ -757,7 +753,6 @@
"timeTill": "Dauer bis {event}",
"timeTillDaylight": "{time} bis Tagesanbruch.",
"timeTillNightfall": "{time} bis Nachteinbruch.",
"timeTillStructureDecay": "{time} bis Wand ({type}) zerfällt.",
"timeUntilUnlocksAt": "{time} bis Entsperrung [{location}].",
"tokensDidNotReplenish": "Tokens did not replenish in time.",
"toolCupboard": "Werkzeugschrank",
Expand Down
5 changes: 0 additions & 5 deletions src/languages/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,6 @@
"dayOfWipe": "Day {day}",
"deathCap": "DEATH",
"decay": "Decay",
"decayTimeForItem": "Decay time for {item} is {time}.",
"decayingCap": "DECAYING",
"DeepSeaMinWipeCooldownTime": "Deep Sea minimum wipe cooldown time is {time}.",
"DeepSeaMaxWipeCooldownTime": "Deep Sea maximum wipe cooldown time is {time}.",
Expand Down Expand Up @@ -451,11 +450,8 @@
"interactionUpdateFailed": "Interaction update failed: {error}",
"invalidBattlemetricsId": "Invalid Battlemetrics ID.",
"invalidGuildOrChannel": "Invalid guild or channel.",
"invalidHpInterval": "Invalid HP interval {hp}.",
"invalidId": "Invalid ID: {id}.",
"trackerPlayerInputInvalid": "Invalid tracker player input. Use a SteamID64, BattleMetrics player ID, Steam profile URL (/profiles/), Steam vanity URL (/id/), or BattleMetrics player URL.",
"invalidStructureType": "Invalid Structure type {type}.",
"invalidSubcommand": "Invalid subcommand.",
"invalidTimeDistance": "Invalid time distance: {distance}, prev: {prevTime}, new: {newTime}",
"isDecaying": "{device} is decaying!",
"isNoLongerConnected": "{device} is no longer electrically connected!",
Expand Down Expand Up @@ -753,7 +749,6 @@
"timeTill": "Time till {event}",
"timeTillDaylight": "{time} before daylight.",
"timeTillNightfall": "{time} before nightfall.",
"timeTillStructureDecay": "{time} before {type} wall decay.",
"timeUntilUnlocksAt": "{time} until unlocks at {location}.",
"timer": "Timer: {message}.",
"timerIdDoesNotExist": "Timer ID: {id} does not exist.",
Expand Down
5 changes: 0 additions & 5 deletions src/languages/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,6 @@
"deathCap": "MUERTE",
"decay": "Decay",
"decayingCap": "EN DETERIORO",
"decayTimeForItem": "Decay time for {item} is {time}.",
"deepSea": "Deep Sea",
"deepSeaCanRespawnNow": "El último Deep Sea fue hace {time}. Deep Sea puede reaparecer ahora y reaparecerá en un máximo de {respawnMax}.",
"deepSeaDetected": "¡Se ha detectado Deep Sea en el mapa!",
Expand Down Expand Up @@ -449,10 +448,7 @@
"interactionUpdateFailed": "Error al actualizar la interacción: {error}",
"invalidBattlemetricsId": "Invalid Battlemetrics ID.",
"invalidGuildOrChannel": "Gremio o canal no válido.",
"invalidHpInterval": "Intervalo de HP {hp} no válido.",
"invalidId": "ID inválido: {id}.",
"invalidStructureType": "Tipo de estructura {type} no válido.",
"invalidSubcommand": "Subcomando inválido.",
"invalidTimeDistance": "Distancia de tiempo no válida: {distance}, anterior: {prevTime}, nuevo: {newTime}",
"isDecaying": "{device} está en deterioro!",
"isNoLongerConnected": "¡{device} ya no está conectado eléctricamente!",
Expand Down Expand Up @@ -756,7 +752,6 @@
"timeTill": "Tiempo para {event}",
"timeTillDaylight": "{time} para el día.",
"timeTillNightfall": "{time} para la noche.",
"timeTillStructureDecay": "{time} antes de la caída de la pared {type}.",
"timeUntilUnlocksAt": "{time} para que se desbloquee en {location}.",
"tokensDidNotReplenish": "Los Tokens no se repusieron a tiempo.",
"toolCupboard": "Armario de herramientas",
Expand Down
5 changes: 0 additions & 5 deletions src/languages/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,6 @@
"deathCap": "Mort",
"decay": "Decay",
"decayingCap": "DECAYING",
"decayTimeForItem": "Temps de decay pour {item} est {time}.",
"deepSea": "Deep Sea",
"deepSeaCanRespawnNow": "La dernière Deep Sea remonte à {time}. Deep Sea peut réapparaître maintenant et réapparaîtra au plus tard dans {respawnMax}.",
"deepSeaDetected": "Deep Sea détecté sur la carte !",
Expand Down Expand Up @@ -449,10 +448,7 @@
"interactionUpdateFailed": "Échec de la mise à jour de l'interaction : {error}",
"invalidBattlemetricsId": "ID Battlemetrics invalide.",
"invalidGuildOrChannel": "Guilde ou canal invalide.",
"invalidHpInterval": "Intervalle HP {hp} non valide.",
"invalidId": "ID invalide: {id}.",
"invalidStructureType": "Type de structure invalide {type}.",
"invalidSubcommand": "Sous-commande invalide.",
"invalidTimeDistance": "Distance temporelle non valide : {distance}, précédent : {prevTime}, nouveau : {newTime}",
"isDecaying": "{device} est en dégradation!",
"isNoLongerConnected": "{device} n'est plus connecté électriquement !",
Expand Down Expand Up @@ -756,7 +752,6 @@
"timeTill": "Temps pour {event}",
"timeTillDaylight": "{time} avant le jour.",
"timeTillNightfall": "{time} avant la tombée de la nuit.",
"timeTillStructureDecay": "{time} avant {type} mur qui perds de la dura.",
"timeUntilUnlocksAt": "{time} avant d'être débloquer en {location}.",
"tokensDidNotReplenish": "Tokens n'a pas été réapprovisionné à temps.",
"toolCupboard": "TC",
Expand Down
5 changes: 0 additions & 5 deletions src/languages/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,6 @@
"deathCap": "MORTI",
"decay": "Decay",
"decayingCap": "DECADIMENTO",
"decayTimeForItem": "Decay time for {item} is {time}.",
"deepSea": "Deep Sea",
"deepSeaCanRespawnNow": "L'ultimo Deep Sea risale a {time} fa. Deep Sea può riapparire ora e riapparirà al più tardi entro {respawnMax}.",
"deepSeaDetected": "Deep Sea rilevato sulla mappa!",
Expand Down Expand Up @@ -449,10 +448,7 @@
"interactionUpdateFailed": "Aggiornamento dell'interazione fallito: {error}",
"invalidBattlemetricsId": "Invalid Battlemetrics ID.",
"invalidGuildOrChannel": "Server o canale non valido.",
"invalidHpInterval": "Invalid HP interval {hp}.",
"invalidId": "ID non valido: {id}.",
"invalidStructureType": "Invalid Structure type {type}.",
"invalidSubcommand": "Sottocomando non valido.",
"invalidTimeDistance": "Distanza di tempo non valida: {distance}, precedente: {prevTime}, nuovo: {newTime}",
"isDecaying": "{device} sta decadendo!",
"isNoLongerConnected": "{device} non è più connesso elettricamente!",
Expand Down Expand Up @@ -756,7 +752,6 @@
"timeTill": "Tempo fino a {event}",
"timeTillDaylight": "{time} prima dell'alba.",
"timeTillNightfall": "{time} prima della notte.",
"timeTillStructureDecay": "{time} before {type} wall decay.",
"timeUntilUnlocksAt": "{time} prima dell'apertura a {location}.",
"tokensDidNotReplenish": "I token non si sono riforniti in tempo.",
"toolCupboard": "Armadio degli Attrezzi",
Expand Down
5 changes: 0 additions & 5 deletions src/languages/ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,6 @@
"deathCap": "사망",
"decay": "Decay",
"decayingCap": "부식 중",
"decayTimeForItem": "Decay time for {item} is {time}.",
"deepSea": "심해",
"deepSeaCanRespawnNow": "마지막 심해는 {time} 전에 있었습니다. 심해는 지금 다시 생성될 수 있으며, 늦어도 {respawnMax} 이내에 다시 생성될 것입니다.",
"deepSeaDetected": "지도에서 심해 탐사선이 감지되었습니다!",
Expand Down Expand Up @@ -449,10 +448,7 @@
"interactionUpdateFailed": "상호 작용 업데이트 실패: {error}",
"invalidBattlemetricsId": "Invalid Battlemetrics ID.",
"invalidGuildOrChannel": "길드 또는 채널이 잘못되었습니다.",
"invalidHpInterval": "Invalid HP interval {hp}.",
"invalidId": "잘못된 ID: {id}.",
"invalidStructureType": "Invalid Structure type {type}.",
"invalidSubcommand": "잘못된 하위 명령입니다.",
"invalidTimeDistance": "잘못된 시간 타입: {distance}, 이전 시간: {prevTime}, 새로운 시간: {newTime}",
"isDecaying": "{device}가 부식되고 있습니다!",
"isNoLongerConnected": "{device}이(가) 더 이상 연결되어 있지 않습니다!",
Expand Down Expand Up @@ -756,7 +752,6 @@
"timeTill": "{event}:남은시간",
"timeTillDaylight": "해가 뜨기 전까지 {time} 남았습니다.",
"timeTillNightfall": "해가 지기 전까지 {time} 남았습니다.",
"timeTillStructureDecay": "{time} before {type} wall decay.",
"timeUntilUnlocksAt": "{location}에서 잠금 해제될 때까지 {time} 남았습니다.",
"tokensDidNotReplenish": "토큰이 제 시간에 입력되지 않았습니다.",
"toolCupboard": "도구함",
Expand Down
5 changes: 0 additions & 5 deletions src/languages/pl.json
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,6 @@
"deathCap": "DEATH",
"decay": "Decay",
"decayingCap": "DECAYING",
"decayTimeForItem": "Decay time for {item} is {time}.",
"deepSea": "Głębokie morze",
"deepSeaCanRespawnNow": "Ostatnie Deep Sea miało miejsce {time} temu. Deep Sea może pojawić się ponownie teraz i pojawi się najpóźniej w ciągu {respawnMax}.",
"deepSeaDetected": "Na mapie wykryto Deep Sea!",
Expand Down Expand Up @@ -449,10 +448,7 @@
"interactionUpdateFailed": "Interaction update failed: {error}",
"invalidBattlemetricsId": "Invalid Battlemetrics ID.",
"invalidGuildOrChannel": "Invalid guild or channel.",
"invalidHpInterval": "Invalid HP interval {hp}.",
"invalidId": "Invalid ID: {id}.",
"invalidStructureType": "Invalid Structure type {type}.",
"invalidSubcommand": "Invalid subcommand.",
"invalidTimeDistance": "Invalid time distance: {distance}, prev: {prevTime}, new: {newTime}",
"isDecaying": "{device} is decaying!",
"isNoLongerConnected": "{device} is no longer electrically connected!",
Expand Down Expand Up @@ -756,7 +752,6 @@
"timeTill": "Time till {event}",
"timeTillDaylight": "{time} before daylight.",
"timeTillNightfall": "{time} before nightfall.",
"timeTillStructureDecay": "{time} before {type} wall decay.",
"timeUntilUnlocksAt": "{time} until unlocks at {location}.",
"tokensDidNotReplenish": "Tokens did not replenish in time.",
"toolCupboard": "Szafa z narzędziami (TC)",
Expand Down
5 changes: 0 additions & 5 deletions src/languages/pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,6 @@
"deathCap": "MORTE",
"decay": "Decomposição",
"decayingCap": "DECOMPONDO",
"decayTimeForItem": "Tempo de decomposição de {item} é {time}.",
"deepSea": "Deep Sea",
"deepSeaCanRespawnNow": "O último Deep Sea foi há {time}. O Deep Sea pode reaparecer agora e reaparecerá dentro de {respawnMax}, no máximo.",
"deepSeaDetected": "Deep Sea detectado no mapa!",
Expand Down Expand Up @@ -449,10 +448,7 @@
"interactionUpdateFailed": "Atualização da interação falhou: {error}",
"invalidBattlemetricsId": "ID da Battlemetrics invalido.",
"invalidGuildOrChannel": "Guilda ou canal inválido.",
"invalidHpInterval": "Intervalo de Vida {hp} inválido.",
"invalidId": "ID Inválido: {id}.",
"invalidStructureType": "Categoria de estrutura {type} inválido.",
"invalidSubcommand": "Subcomando inválido.",
"invalidTimeDistance": "Distância de tempo inválida: {distance}, anterior: {prevTime}, novo: {newTime}",
"isDecaying": "{device} está a decompor!",
"isNoLongerConnected": "{device} já não está conectado eletricamente!",
Expand Down Expand Up @@ -756,7 +752,6 @@
"timeTill": "Tempo até {event}",
"timeTillDaylight": "{time} antes do amanhecer.",
"timeTillNightfall": "{time} antes do anoitecer.",
"timeTillStructureDecay": "{time} antes da decomposição da parede de {type}.",
"timeUntilUnlocksAt": "{time} até desbloquear em {location}.",
"tokensDidNotReplenish": "Tokens não reabasteceram a tempo.",
"toolCupboard": "Armário de Ferramentas",
Expand Down
5 changes: 0 additions & 5 deletions src/languages/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,6 @@
"deathCap": "СМЕРТЬ",
"decay": "Гниение",
"decayingCap": "РАСПАДАЕТСЯ",
"decayTimeForItem": "Время исчезновения {item} - {time}. ",
"deepSea": "Глубокое море",
"deepSeaCanRespawnNow": "Последнее погружение в глубокое море было {time} назад. Deep Sea может появиться снова сейчас и появится не позднее чем через {respawnMax}.",
"deepSeaDetected": "На карте обнаружено глубокое море!",
Expand Down Expand Up @@ -449,10 +448,7 @@
"interactionUpdateFailed": "Взаимодействие с обновлением не удалось: {error}",
"invalidBattlemetricsId": "Неверный Battlemetrics ID.",
"invalidGuildOrChannel": "Неверная guild или канал.",
"invalidHpInterval": "Недопустимый HP интервал {hp}.",
"invalidId": "Неверный ID: {id}.",
"invalidStructureType": "Недопустимый тип структуры {type}.",
"invalidSubcommand": "Неверная подкоманда.",
"invalidTimeDistance": "Неверная разница во времени: {distance}, предыдущая: {prevTime}, нынешняя: {newTime}",
"isDecaying": "{device} начинает гнить!",
"isNoLongerConnected": "{device} больше не подключен к электричеству!",
Expand Down Expand Up @@ -756,7 +752,6 @@
"timeTill": "Время до {event}",
"timeTillDaylight": "Через {time} будет рассвет.",
"timeTillNightfall": "Через {time} будет закат.",
"timeTillStructureDecay": "{time} до распада стены {type}.",
"timeUntilUnlocksAt": "Ящик откроется через {time} на {location}.",
"tokensDidNotReplenish": "Tocens вовремя не пополнялся.",
"toolCupboard": "Шкаф c инструментами",
Expand Down
5 changes: 0 additions & 5 deletions src/languages/sv.json
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,6 @@
"deathCap": "DÖD",
"decay": "Decay",
"decayingCap": "FÖRFALLER",
"decayTimeForItem": "Decay time for {item} is {time}.",
"deepSea": "Deep Sea",
"deepSeaCanRespawnNow": "Den senaste Deep Sea var {time} sedan. Deep Sea kan återuppstå nu och kommer att återuppstå inom {respawnMax} senast.",
"deepSeaDetected": "Deep Sea upptäckt på kartan!",
Expand Down Expand Up @@ -449,10 +448,7 @@
"interactionUpdateFailed": "Misslyckades att uppdatera interaktionen: {error}.",
"invalidBattlemetricsId": "Invalid Battlemetrics ID.",
"invalidGuildOrChannel": "Ogiltig guild eller kanal.",
"invalidHpInterval": "Invalid HP interval {hp}.",
"invalidId": "Ogiltigt ID: {id}.",
"invalidStructureType": "Invalid Structure type {type}.",
"invalidSubcommand": "Ogiltigt underkommando.",
"invalidTimeDistance": "Ogiltigt tidsavstånd: {distance}, föregående: {prevTime}, ny: {newTime}",
"isDecaying": "{device} förfaller!",
"isNoLongerConnected": "{device} är inte längre elektroniskt kopplad!",
Expand Down Expand Up @@ -756,7 +752,6 @@
"timeTill": "Tid till {event}",
"timeTillDaylight": "{time} innan dag.",
"timeTillNightfall": "{time} innan natt.",
"timeTillStructureDecay": "{time} before {type} wall decay.",
"timeUntilUnlocksAt": "{time} tills låses upp vid {location}.",
"tokensDidNotReplenish": "Tokens fylldes inte på i tid.",
"toolCupboard": "Verktygsskåp",
Expand Down
Loading
Loading