Skip to content

Commit

Permalink
Merge pull request #1029 from MattJeanes/dev
Browse files Browse the repository at this point in the history
2023.8.1
  • Loading branch information
MattJeanes authored Dec 2, 2023
2 parents 3432980 + 8f27714 commit bf869d6
Show file tree
Hide file tree
Showing 36 changed files with 971 additions and 604 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,11 @@ jobs:

- name: Create gma file
run: |
docker run --rm \
--mount type=bind,source="$(pwd)",target=/addon \
mattjeanes/gmad \
create -folder /addon -out "/addon/addon.gma"
wget -O /tmp/fastgmad.zip "https://github.com/WilliamVenner/fastgmad/releases/download/v0.2.0/fastgmad_linux.zip"
unzip /tmp/fastgmad.zip -d /tmp/fastgmad
chmod +x /tmp/fastgmad/fastgmad
mkdir -p /tmp/addon
/tmp/fastgmad/fastgmad create -folder . -out /tmp/addon/addon.gma
- name: Set workshop addon id
if: (github.event_name == 'push' && contains(fromJSON('["refs/heads/dev", "refs/heads/alpha"]'), github.ref)) || github.event.inputs.publish == 'true'
Expand All @@ -56,7 +57,7 @@ jobs:
docker run --rm \
-e STEAM_USER="${{ vars.STEAM_USERNAME }}" \
-e STEAM_PASSWORD="${{ secrets.STEAM_PASSWORD }}" \
--mount type=bind,source="$(pwd)",target=/home/gmodws/upload \
--mount type=bind,source="/tmp/addon",target=/home/gmodws/upload \
aperturedevelopment/gmodws:latest \
upload ${{ env.WORKSHOP_ID }} addon.gma \
"${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }}"
6 changes: 3 additions & 3 deletions i18n/languages/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"Author": "TARDIS-Entwicklungsteam",
"Phrases": {
"Artron.Depleted": "Artronenergie aufgebraucht",
"ArtronInhibitor": "",
"ArtronInhibitor.Disabled": "",
"ArtronInhibitor.Enabled": "",
"ArtronInhibitor": "Artron-Inhibitor",
"ArtronInhibitor.Disabled": "Artron-Inhibitor deaktiviert",
"ArtronInhibitor.Enabled": "Artron-Inhibitor aktiviert",
"ArtronInhibitor.Instructions": "",
"ArtronInhibitor.Starting": "",
"Binds.AnyKey": "Drücke eine beliebige Taste",
Expand Down
228 changes: 114 additions & 114 deletions i18n/languages/es-ES.json

Large diffs are not rendered by default.

68 changes: 34 additions & 34 deletions i18n/languages/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
"Author": "Kirbe, Piquixel",
"Phrases": {
"Artron.Depleted": "Énergie artron épuisée",
"ArtronInhibitor": "",
"ArtronInhibitor.Disabled": "",
"ArtronInhibitor.Enabled": "",
"ArtronInhibitor.Instructions": "",
"ArtronInhibitor.Starting": "",
"ArtronInhibitor": "Inhibiteur Artron",
"ArtronInhibitor.Disabled": "Inhibiteur Artron désactivé",
"ArtronInhibitor.Enabled": "Inhibiteur Artron activé",
"ArtronInhibitor.Instructions": "Crée un champ inhibiteur Artron, qui draine l'énergie Artron des TARDIS à proximité",
"ArtronInhibitor.Starting": "Démarrage de l'inhibiteur Artron...",
"Binds.AnyKey": "Appuyez sur une touche",
"Binds.Invalid": "Invalide",
"Binds.Key": "Touche",
Expand Down Expand Up @@ -268,14 +268,14 @@
"Controls.VortexFlight.FailedToggle": "Échec de l'activation du vol dans le vortex",
"Controls.VortexFlight.Status": "Vol dans le vortex",
"Controls.VortexFlight.Tip": "Vol dans le Vortex",
"CustomControls.Default.ToggleScreen.1": "",
"CustomControls.Default.ToggleScreen.1.FailedToggle": "",
"CustomControls.Default.ToggleScreen.1.Status": "",
"CustomControls.Default.ToggleScreen.1.Tip": "",
"CustomControls.Default.ToggleScreen.2": "",
"CustomControls.Default.ToggleScreen.2.FailedToggle": "",
"CustomControls.Default.ToggleScreen.2.Status": "",
"CustomControls.Default.ToggleScreen.2.Tip": "",
"CustomControls.Default.ToggleScreen.1": "Allumer/Éteindre l'écran 1",
"CustomControls.Default.ToggleScreen.1.FailedToggle": "Échec de l'activation de l'écran 1",
"CustomControls.Default.ToggleScreen.1.Status": "Écran 1",
"CustomControls.Default.ToggleScreen.1.Tip": "Écran 1",
"CustomControls.Default.ToggleScreen.2": "Allumer/Éteindre l'écran 2",
"CustomControls.Default.ToggleScreen.2.FailedToggle": "Échec de l'activation de l'écran 2",
"CustomControls.Default.ToggleScreen.2.Status": "Écran 2",
"CustomControls.Default.ToggleScreen.2.Tip": "Écran 2",
"Destination.FailedDemat": "Échec de la dématérialisation",
"Destination.FailedSetDestination": "Échec de la définition d'une destination",
"Destination.FailedSetDestinationMaybeTransitioning": "Échec de la définition d'une destination, peut être en cours de transition",
Expand All @@ -289,7 +289,7 @@
"Exteriors.Categories.PoliceBoxes": "Cabines de Police",
"Exteriors.Categories.TTCapsules": "Capsules TT",
"Exteriors.DefaultPoliceBox": "Cabine de Police par Défaut",
"Exteriors.LegacyPoliceBox": "",
"Exteriors.LegacyPoliceBox": "Cabine de Police Héritage",
"Exteriors.SIDRAT": "SIDRAT",
"Exteriors.TTCapsuleType40": "Capsule TT Type 40",
"Exteriors.TTCapsuleType50": "Capsule TT Type 50",
Expand All @@ -313,20 +313,20 @@
"Interior.FindingPositionFailed.NoSpace": "ATTENTION: Impossible de localiser l'espace pour l'intérieur, vous pouvez réessayer ou utiliser une map différente",
"Interior.FoundPosition": "Terminé!",
"Interiors.Default": "Par défaut",
"Interiors.Default.CustomSettings.ClassicDoorsButton": "",
"Interiors.Default.CustomSettings.Color": "",
"Interiors.Default.CustomSettings.Color.Blue": "",
"Interiors.Default.CustomSettings.Color.Dynamic": "",
"Interiors.Default.CustomSettings.Color.Green": "",
"Interiors.Default.CustomSettings.Color.Random": "",
"Interiors.Default.CustomSettings.Color.Turquoise": "",
"Interiors.Default.CustomSettings.Lamps": "",
"Interiors.Default.CustomSettings.Lamps.Few": "",
"Interiors.Default.CustomSettings.Lamps.Many": "",
"Interiors.Default.CustomSettings.Lamps.Off": "",
"Interiors.Default.CustomSettings.ScreensOff": "",
"Interiors.Default.CustomSettings.SmallVersion": "",
"Interiors.Default.Versions.ClassicDoors": "",
"Interiors.Default.CustomSettings.ClassicDoorsButton": "Activer le bouton (version portes classiques)",
"Interiors.Default.CustomSettings.Color": "Couleur intérieure",
"Interiors.Default.CustomSettings.Color.Blue": "Bleu",
"Interiors.Default.CustomSettings.Color.Dynamic": "Dynamique (change lentement)",
"Interiors.Default.CustomSettings.Color.Green": "Vert",
"Interiors.Default.CustomSettings.Color.Random": "Aléatoire",
"Interiors.Default.CustomSettings.Color.Turquoise": "Turquoise",
"Interiors.Default.CustomSettings.Lamps": "Lampes",
"Interiors.Default.CustomSettings.Lamps.Few": "Peu (performances optimales)",
"Interiors.Default.CustomSettings.Lamps.Many": "Beaucoup (meilleurs visuels)",
"Interiors.Default.CustomSettings.Lamps.Off": "Désactivées",
"Interiors.Default.CustomSettings.ScreensOff": "Écran désactivé à l'apparition",
"Interiors.Default.CustomSettings.SmallVersion": "Petit intérieur (moins de couloirs)",
"Interiors.Default.Versions.ClassicDoors": "Version portes classiques",
"Interiors.Default.Versions.SIDRAT": "Extérieur SIDRAT",
"Interiors.Default.Versions.TTCapsuleType40": "Extérieur Capsule TT Type 40",
"Interiors.Default.Versions.TTCapsuleType50": "Extérieur Capsule TT Type 50",
Expand Down Expand Up @@ -366,7 +366,7 @@
"Screens.Chameleon.Apply": "Appliquer",
"Screens.Chameleon.Categories": "Catégories",
"Screens.Chameleon.Exteriors": "Extérieurs",
"Screens.Chameleon.Plan": "Plan",
"Screens.Chameleon.Plan": "Planifier",
"Screens.Chameleon.Reset": "Réinitialiser",
"Screens.Common.Back": "Retour",
"Screens.Common.CurrentPage": "Page %d sur %d",
Expand Down Expand Up @@ -476,7 +476,7 @@
"Settings.Sections.Global.BoostSpeed.Description": "L'augmentation de la vitesse que le TARDIS obtient avec la touche \"Accélération\" enfoncée",
"Settings.Sections.Global.EnableHealth": "Activer la santé",
"Settings.Sections.Global.EnableHealth.Description": "Le TARDIS devrait-il avoir de la santé et subir des dégâts ?",
"Settings.Sections.Global.HealthToShieldsRatio": "",
"Settings.Sections.Global.HealthToShieldsRatio": "Ratio santé à boucliers",
"Settings.Sections.Global.HealthToShieldsRatio.Description": "Des ratios plus élevés apportent plus santé mais moins de boucliers, la combinaison santé / boucliers reste la même",
"Settings.Sections.Global.MaxHealth": "Santé maximale",
"Settings.Sections.Global.MaxHealth.Description": "Quantité maximale de santé que le TARDIS a",
Expand Down Expand Up @@ -520,8 +520,8 @@
"Settings.Sections.Misc.NotificationType.Types.ConsoleLog": "Log de la console",
"Settings.Sections.Misc.NotificationType.Types.Disabled": "Désactivé",
"Settings.Sections.Misc.NotificationType.Types.Inbuilt": "Notifications intégrées",
"Settings.Sections.Misc.ShowReleaseNotes": "",
"Settings.Sections.Misc.ShowReleaseNotes.Description": "",
"Settings.Sections.Misc.ShowReleaseNotes": "Afficher les notes de version",
"Settings.Sections.Misc.ShowReleaseNotes.Description": "Les notes de version devraient-elles être affichées quand le TARDIS est mis à jour?",
"Settings.Sections.Misc.Spawning": "Faire apparaître le TARDIS",
"Settings.Sections.Misc.Spawning.LegacyDoorType": "Faire apparaitre avec les portes de type \"héritage\"",
"Settings.Sections.Misc.Spawning.LegacyDoorType.Description": "Les portes du TARDIS téléporteront le joueur à l'intérieur lors de l'interaction (au lieu de s'ouvrir)",
Expand Down Expand Up @@ -650,8 +650,8 @@
"TipStyles.WhiteOnBlue": "Blanc sur bleu",
"TipStyles.WhiteOnGrey": "Blanc sur gris",
"Update.NeverShow": "",
"Update.ShowReleaseNotes": "",
"Update.Updated": "",
"Update.ShowReleaseNotes": "Voudriez-vous en savoir plus?",
"Update.Updated": "Le TARDIS a été mis à jour à la version %s",
"Vortex.ModelMissing": "ATTENTION: modèle de vortex invalide - désactivation des vortex, vous manque-t-il une dépendance?",
"Wiremod.Inputs.Ang": "X,Y,Z: Angle de téléportation",
"Wiremod.Inputs.Demat": "Dématérialiser le TARDIS",
Expand Down
Loading

0 comments on commit bf869d6

Please sign in to comment.