diff --git a/.github/workflows/stable.yml b/.github/workflows/build.yml similarity index 99% rename from .github/workflows/stable.yml rename to .github/workflows/build.yml index 6eead7e..c3d1aed 100644 --- a/.github/workflows/stable.yml +++ b/.github/workflows/build.yml @@ -138,7 +138,7 @@ jobs: - uses: dev-drprasad/delete-tag-and-release@v0.2.0 with: delete_release: true - tag_name: v3.0.7 + tag_name: v3.0.6 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Create Release @@ -193,4 +193,4 @@ jobs: }); } env: - releaseTag: ${{ steps.vars.outputs.releaseTag }} \ No newline at end of file + releaseTag: ${{ steps.vars.outputs.releaseTag }} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..82f010b --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "yaml.schemas": { + "https://json.schemastore.org/github-workflow.json": "file:///home/smartfridge/Documents/ArmCord/.github/workflows/build.yml" + } +} \ No newline at end of file diff --git a/assets/lang/en-US.json b/assets/lang/en_US.json similarity index 80% rename from assets/lang/en-US.json rename to assets/lang/en_US.json index 86d1b3c..03e21bc 100644 --- a/assets/lang/en-US.json +++ b/assets/lang/en_US.json @@ -12,19 +12,17 @@ "no": "No", "next": "Next", "setup_question4": "Select a client mod you want to install:", - "setup_question4_clientmodnotice": "Why not all of them? Having many client mods at the same time can cause issues. If you really want to do it though, check our Discord.", - "settings-theme": "ArmCord theme:", + "setup_question4_clientmodnotice": "Why not all of them? Having many client mods at the same time can cause issues. If you really want to do it though, check our documentation.", + "settings-theme": "ArmCord Theme:", + "settings-theme-glasstron": "Glasstron (experimental)", + "settings-theme-tabs": "Tabs (experimental)", "settings-theme-default": "Default", "settings-theme-native": "Native", "settings-tray": "Minimize to tray", "settings-patches": "Automatic Patches", "settings-channel": "Discord channel:", - "settings-invitewebsocket": "Invite Websocket", + "settings-invitewebsocket": "discord.gg support", "settings-mod": "Client mod:", - "settings-prfmMode": "Performance mode:", - "settings-prfmMode-performance": "Performance", - "settings-prfmMode-battery": "Battery", - "settings-none": "None", "settings-save": "Save settings", "settings-updater": "Check for updates" } diff --git a/assets/lang/es-419.json b/assets/lang/es-419.json deleted file mode 100644 index 194282e..0000000 --- a/assets/lang/es-419.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "loading_screen_start": "Cargando ArmCord…", - "loading_screen_offline": "Parece que no estás conectado a la Internet. Por favor conectate e intentalo de nuevo.", - "loading_screen_update": "Una nueva version de ArmCord está disponible. Por favor actualiza a la última version.", - "setup_question1": "Escoge que tipo de instalación quieres hacer:", - "yes": "Sí", - "setup_question2": "Escoge tu version de Discord:", - "setup_question3": "Dejar que ArmCord se encargue de la instalacion de modificaciones?", - "setup_question1_answer1": "Instalación rápida", - "setup_question1_answer2": "Instalación completa", - "setup_offline": "Parece que no estás conectado a la Internet. Por favor conectate a la Internet e reinicia el instalador de ArmCord.", - "no": "No", - "next": "Siguiente", - "setup_question4": "Selecciona una modificación que te gustaría instalar:", - "setup_question4_clientmodnotice": "Por qué no instalar todas las modificaciones? Tener varias modificaciones a la vez puede causar problemas. Si realmente quieres hacerlo, puedes unirte a nuestro Discord.", - "settings-theme": "Tema de ArmCord:", - "settings-theme-default": "Por Defecto", - "settings-theme-native": "Nativa", - "settings-tray": "Minimizar a la barra de tareas", - "settings-patches": "Automatizar Parches", - "settings-channel": "Version de Discord:", - "settings-invitewebsocket": "Websocket de Invitación", - "settings-mod": "Modificación:", - "settings-prfmMode": "Modo de Rendimiento:", - "settings-prfmMode-performance": "Rendimiento", - "settings-prfmMode-battery": "Batería", - "settings-none": "Ninguna", - "settings-save": "Guardar ajustes", - "settings-updater": "Buscar una actualización" -} diff --git a/assets/lang/fr-FR.json b/assets/lang/fr-FR.json index 774fd98..28dbdbd 100644 --- a/assets/lang/fr-FR.json +++ b/assets/lang/fr-FR.json @@ -1,6 +1,6 @@ { "loading_screen_start": "Démarrage d'ArmCord…", - "loading_screen_update": "Une nouvelle version d'ArmCord est disponible. Veuillez mettre à jour vers la dernière version.", + "loading_screen_update": "Une nouvelle version de ArmCord est disponible. Veuillez mettre à jour la dernière version.", "setup_question1": "Sélectionnez le type de configuration que vous souhaitez effectuer :", "setup_question1_answer1": "Configuration express", "setup_question1_answer2": "Configuration complète", @@ -10,21 +10,19 @@ "no": "Non", "next": "Suivant", "setup_question4": "Sélectionnez le mod client que vous souhaitez installer :", - "setup_question4_clientmodnotice": "Pourquoi pas tous ? Le fait d'avoir plusieurs clients mods en même temps peut causer des problèmes. Si vous voulez vraiment le faire, consultez notre Discord.", + "setup_question4_clientmodnotice": "Pourquoi pas tous ? Le fait d'avoir plusieurs mods clients en même temps peut causer des problèmes. Si vous voulez vraiment le faire, consultez notre documentation.", "loading_screen_offline": "Vous semblez être hors ligne. Veuillez vous connecter à internet et réessayer.", - "setup_offline": "Vous semblez être hors ligne. Veuillez vous connecter à internet et redémarrer l'installateur ArmCord.", + "setup_offline": "Vous semblez être hors ligne. Veuillez vous connecter à internet et redémarrer ArmCord Setup.", "settings-tray": "Minimize to tray", "settings-channel": "Discord channel:", "settings-mod": "Client mod:", "settings-save": "Save settings", "settings-updater": "Check for updates", - "settings-theme": "Thème ArmCord :", + "settings-theme": "ArmCord Theme:", + "settings-theme-tabs": "Tabs (experimental)", "settings-theme-default": "Default", + "settings-theme-glasstron": "Glasstron (experimental)", "settings-theme-native": "Native", "settings-patches": "Automatic Patches", - "settings-invitewebsocket": "Lien discord.gg", - "settings-prfmMode": "Mode performance :", - "settings-prfmMode-performance": "Performance", - "settings-prfmMode-battery": "Batterie", - "settings-none": "Aucun" + "settings-invitewebsocket": "discord.gg support" } diff --git a/assets/lang/id-ID.json b/assets/lang/id-ID.json deleted file mode 100644 index f0535d3..0000000 --- a/assets/lang/id-ID.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "loading_screen_start": "Starting ArmCord…", - "loading_screen_offline": "You appear to be offline. Please connect to the Internet and try again.", - "loading_screen_update": "A new version of ArmCord is available. Please update to the latest version.", - "setup_question1": "Select what kind of setup you want to perform:", - "setup_question1_answer1": "Express setup", - "setup_question1_answer2": "Full setup", - "setup_question2": "Choose your Discord channel/instance:", - "setup_offline": "You appear to be offline. Please connect to the Internet and restart the ArmCord setup.", - "setup_question3": "Should ArmCord handle client mods installation?", - "yes": "Yes", - "no": "No", - "next": "Next", - "setup_question4": "Select a client mod you want to install:", - "setup_question4_clientmodnotice": "Why not all of them? Having many client mods at the same time can cause issues. If you really want to do it though, check our documentation.", - "settings-theme": "ArmCord Theme:", - "settings-theme-default": "Default", - "settings-theme-native": "Native", - "settings-tray": "Minimize to tray", - "settings-patches": "Automatic Patches", - "settings-channel": "Discord channel:", - "settings-invitewebsocket": "discord.gg support", - "settings-mod": "Client mod:", - "settings-save": "Save settings", - "settings-updater": "Check for updates", - "settings-prfmMode": "Performance mode:", - "settings-prfmMode-performance": "Performance", - "settings-prfmMode-battery": "Battery", - "settings-none": "None" -} diff --git a/assets/lang/it-IT.json b/assets/lang/it-IT.json index f0c9675..144d221 100644 --- a/assets/lang/it-IT.json +++ b/assets/lang/it-IT.json @@ -19,12 +19,10 @@ "settings-updater": "Controlla gli aggiornamenti", "settings-mod": "Client mod:", "settings-theme": "ArmCord Theme:", + "settings-theme-glasstron": "Glasstron (experimental)", + "settings-theme-tabs": "Tabs (experimental)", "settings-theme-default": "Default", "settings-theme-native": "Native", "settings-patches": "Automatic Patches", - "settings-invitewebsocket": "discord.gg support", - "settings-prfmMode": "Performance mode:", - "settings-prfmMode-performance": "Performance", - "settings-prfmMode-battery": "Battery", - "settings-none": "None" + "settings-invitewebsocket": "discord.gg support" } diff --git a/assets/lang/nb-NO.json b/assets/lang/nb-NO.json index 00bdd19..41670f2 100644 --- a/assets/lang/nb-NO.json +++ b/assets/lang/nb-NO.json @@ -19,12 +19,10 @@ "settings-save": "Save settings", "settings-updater": "Check for updates", "settings-theme": "ArmCord Theme:", + "settings-theme-glasstron": "Glasstron (experimental)", + "settings-theme-tabs": "Tabs (experimental)", "settings-theme-default": "Default", "settings-theme-native": "Native", "settings-patches": "Automatic Patches", - "settings-invitewebsocket": "discord.gg support", - "settings-prfmMode": "Performance mode:", - "settings-prfmMode-performance": "Performance", - "settings-prfmMode-battery": "Battery", - "settings-none": "None" + "settings-invitewebsocket": "discord.gg support" } diff --git a/assets/lang/nl-NL.json b/assets/lang/nl-NL.json index ebac8bc..485d28f 100644 --- a/assets/lang/nl-NL.json +++ b/assets/lang/nl-NL.json @@ -20,11 +20,9 @@ "settings-updater": "Check voor updates", "settings-patches": "Automatische Patches", "settings-theme": "ArmCord Thema:", + "settings-theme-glasstron": "Glasstron (experimenteel)", + "settings-theme-tabs": "Tabs (experimenteel)", "settings-theme-default": "Standaard", "settings-theme-native": "Native", - "settings-invitewebsocket": "discord.gg support", - "settings-none": "None", - "settings-prfmMode": "Performance mode:", - "settings-prfmMode-performance": "Performance", - "settings-prfmMode-battery": "Battery" + "settings-invitewebsocket": "discord.gg support" } diff --git a/assets/lang/pl-PL.json b/assets/lang/pl-PL.json index 05f840e..979e56b 100644 --- a/assets/lang/pl-PL.json +++ b/assets/lang/pl-PL.json @@ -7,7 +7,7 @@ "no": "Nie", "next": "Dalej", "setup_question4": "Wybierz modyfikację klienta którą chcesz zainstalować:", - "setup_question4_clientmodnotice": "Dlaczego nie wszystkie na raz? Posiadanie wielu modyfikacji może spowodować wiele błędów. Jeśli jednak nalegasz możesz sprawdzić naszego Discorda.", + "setup_question4_clientmodnotice": "Dlaczego nie wszystkie na raz? Posiadanie wielu modyfikacji może spowodować wiele błędów. Jeśli jednak nalegasz możesz sprawdzić naszą dokumentację.", "loading_screen_start": "Ładowanie ArmCord…", "loading_screen_offline": "Wydaje nam się, że nie jesteś połączony z Internetem. Połącz się z internetem i spróbuj ponownie.", "setup_question1_answer1": "Ekspresowa konfiguracja", @@ -19,12 +19,10 @@ "settings-save": "Zapisz ustawienia", "settings-mod": "Modyfikacja klienta:", "settings-theme": "Motyw ArmCord:", + "settings-theme-glasstron": "Glasstron (eksperymentalne)", + "settings-theme-tabs": "Karty (eksperymentalne)", "settings-theme-default": "Domyślny", "settings-theme-native": "Natywny", "settings-patches": "Automatyczne łatki", - "settings-invitewebsocket": "Websocket dla zaproszeń", - "settings-prfmMode": "Tryb wydajności:", - "settings-prfmMode-performance": "Wydajny", - "settings-prfmMode-battery": "Bateria", - "settings-none": "Nic/Brak" + "settings-invitewebsocket": "Wsparcie linków discord.gg" } diff --git a/assets/lang/th-TH.json b/assets/lang/th-TH.json deleted file mode 100644 index 79db9f5..0000000 --- a/assets/lang/th-TH.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "loading_screen_start": "เริ่มต้น ArmCord…", - "loading_screen_offline": "ดูเหมือนว่าคุณออฟไลน์อยู่ โปรดเชื่อมต่ออินเทอร์เน็ตและลองใหม่อีกครั้ง", - "loading_screen_update": "ArmCord เวอร์ชันใหม่พร้อมใช้งานแล้ว โปรดอัปเดตเป็นเวอร์ชันล่าสุด", - "setup_question1": "เลือกประเภทการติดตั้งที่คุณต้องการ:", - "setup_question1_answer1": "ติดตั้งแบบรวดเร็ว", - "setup_question1_answer2": "การตั้งค่าเต็มรูปแบบ", - "setup_offline": "ดูเหมือนว่าคุณออฟไลน์อยู่ โปรดเชื่อมต่ออินเทอร์เน็ตและลองใหม่อีกครั้ง", - "setup_question2": "เลือกช่อง/อินสแตนส์ Discord:", - "setup_question3": "ต้องการให้ ArmCord จัดการการติดตั้งมอดของไคลเอนต์หรือไม่?", - "yes": "ใช่", - "no": "ไม่", - "next": "ถัดไป", - "setup_question4": "เลือกไคลเอนต์มอดที่ต้องการติดตั้ง:", - "settings-prfmMode-battery": "แบตเตอรี่", - "setup_question4_clientmodnotice": "ทำไมไม่ใช้ทั้งหมดล่ะ? การมีไคลเอนต์มอดหลายตัวพร้อมกันอาจทำให้เกิดปัญหาได้ หากต้องการที่จะทำจริงๆ ให้ไปดูใน Discord ของเรา", - "settings-theme": "ธีม ArmCord:", - "settings-theme-default": "ค่าเริ่มต้น", - "settings-theme-native": "ดั้งเดิม", - "settings-tray": "ย่อลงไปในถาดงาน", - "settings-patches": "แพทช์อัตโนมัติ", - "settings-channel": "ช่อง Discord:", - "settings-invitewebsocket": "ใช้ Websocket สำหรับการเชิญ", - "settings-prfmMode": "โหมดประสิทธิภาพ:", - "settings-prfmMode-performance": "ประสิทธิภาพ", - "settings-mod": "ไคลแอนต์มอด:", - "settings-none": "ไม่มี", - "settings-save": "บันทึกการตั้งค่า", - "settings-updater": "ตรวจหาการอัปเดต" -} diff --git a/assets/macos.png b/assets/macos.png deleted file mode 100644 index f43ff68..0000000 Binary files a/assets/macos.png and /dev/null differ diff --git a/package.json b/package.json index bfd886a..b48f782 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ArmCord", - "version": "3.0.7", + "version": "3.0.6", "description": "ArmCord is a custom client designed to enhance your Discord experience while keeping everything lightweight.", "main": "ts-out/main.js", "scripts": { @@ -23,20 +23,19 @@ }, "homepage": "https://github.com/armcord/armcord#readme", "devDependencies": { - "@types/node": "^17.0.42", + "@types/node": "^17.0.33", "@types/ws": "^8.5.3", "copyfiles": "^2.4.1", - "electron": "^19.0.4", + "electron": "^18.2.4", "electron-builder": "^23.0.3", "husky": "^8.0.1", - "prettier": "^2.7.0", - "typescript": "^4.7.3" + "prettier": "^2.5.1", + "typescript": "^4.6.3" }, "dependencies": { "electron-context-menu": "github:ArmCord/electron-context-menu", - "os-locale": "^6.0.2", "v8-compile-cache": "^2.3.0", - "ws": "^8.8.0" + "ws": "^8.6.0" }, "build": { "appId": "com.smartfridge.armcord", diff --git a/src/content/css/tabs.css b/src/content/css/tabs.css new file mode 100644 index 0000000..d8f10cb --- /dev/null +++ b/src/content/css/tabs.css @@ -0,0 +1,46 @@ +.tabs { + display: block; + top: 0; + left: 0; + right: 0; + flex-shrink: 0; + overflow: hidden; + zoom: 1; + box-sizing: border-box; + width: 100%; + clear: both; + height: 30px; + line-height: 30px; + background-color: #202225; + -webkit-app-region: drag; + width: 100%; + user-select: none; + -webkit-user-select: none; + position: fixed; + z-index: 99999; +} + +.tabs #tabs-controls-container { + float: left; + width: 150px; + height: 100%; + line-height: 30px; + background-color: #202225; + -webkit-app-region: no-drag; +} +.tabs-buttons { + color: white; + background-color: inherit; + float: left; + border: none; + outline: none; + cursor: pointer; + transition: 0.3s; + font-size: 20px; +} +.tabs-buttons:hover { + background-color: #4e515a; +} +.withFrame-haYltI { + height: 30px !important; +} diff --git a/src/content/setup.html b/src/content/setup.html index cdf790a..6ed4c94 100644 --- a/src/content/setup.html +++ b/src/content/setup.html @@ -12,14 +12,12 @@
- You appear to be offline. Please connect to the internet and restart ArmCord Setup. -
+You appear to be offline. Please connect to the internet and restart ArmCord Setup.
Select the type of setup you want to perform.
+Select the type of setup you want to perform.
Choose your Discord channel/instance:
+Choose your Discord channel/instance:
- Should ArmCord handle client mods installation? -
+Should ArmCord handle client mods installation?
Select a client mod you want to install:
+Select a client mod you want to install:
+
Why not all of them? Having many client mods at the same time can cause issues. If you really - want to do it though, check our Discord ;) + want to do it though, check our documentation ;)
ArmCord theme:
+ArmCord theme:
Discord channel:
+Discord channel:
Client mod:
+Client mod:
Performance mode:
-