Skip to content

Commit

Permalink
Merge pull request #58 from FTBTeam/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
desht authored Nov 6, 2024
2 parents a14b7f6 + c18ec78 commit 2f5a725
Show file tree
Hide file tree
Showing 19 changed files with 117 additions and 36 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
name: Java CI - Build Release

on:
release:
types: [ published ]
push:
tags:
- 'v[0-9]+\.[0-9]+\.[0-9]+'
- 'v[0-9]+\.[0-9]+\.[0-9]+-[a-z]+'
- 'v[0-9]+\.[0-9]+\.[0-9]+-[a-z]+\.[0-9]+'

jobs:
build:
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [2101.1.1]

### Added
* Added a `tr_tr` translation, thanks @RuyaSavascisi

### Changed
* Overhauled and cleaned up many icon textures

### Fixed
* Fixed the `/ftbteams party settings_for ...` command not functioning correctly

## [2101.1.0]

### Changed
Expand Down
4 changes: 3 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ plugins {
id "me.modmuss50.mod-publish-plugin" version "0.5.1"
}

apply from: 'https://raw.githubusercontent.com/FTBTeam/mods-meta/main/gradle/changelog.gradle'

architectury {
minecraft = rootProject.minecraft_version
}
Expand Down Expand Up @@ -101,7 +103,7 @@ allprojects {

publishMods {
dryRun = providers.environmentVariable("CURSEFORGE_KEY").getOrNull() == null
changelog = providers.environmentVariable("CHANGELOG").getOrElse("No changelog provided")
changelog = createChangelog(project)
version = mod_version

// TODO: Migrate to something else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,9 @@ public void register(CommandDispatcher<CommandSourceStack> dispatcher) {
.then(teamArg()
.then(Commands.argument("key", TeamPropertyArgument.create())
.then(Commands.argument("value", StringArgumentType.greedyString())
.executes(ctx -> partyTeamArg(ctx, TeamRank.OFFICER).settings(ctx.getSource(), TeamPropertyArgument.get(ctx, "key"), string(ctx, "value")))
.executes(ctx -> partyTeamArg(ctx, TeamRank.NONE).settings(ctx.getSource(), TeamPropertyArgument.get(ctx, "key"), string(ctx, "value")))
)
.executes(ctx -> partyTeamArg(ctx, TeamRank.OFFICER).settings(ctx.getSource(), TeamPropertyArgument.get(ctx, "key"), ""))
.executes(ctx -> partyTeamArg(ctx, TeamRank.NONE).settings(ctx.getSource(), TeamPropertyArgument.get(ctx, "key"), ""))
)
)
)
Expand Down
95 changes: 95 additions & 0 deletions common/src/main/resources/assets/ftbteams/lang/tr_tr.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
{
"ftbteams.already_in_party": "Zaten bir gruptasın!",
"ftbteams.player_already_in_party": "Oyuncu '%s' zaten bir grupta!",
"ftbteams.not_in_party": "Bir grup oluşturmadınız ya da gruba katılmadınız!",
"ftbteams.team_not_found": "Takım '%s' bulunamadı!",
"ftbteams.cant_edit": "%s düzenleyemezsin!",
"ftbteams.not_member": "%s, %s grubunun bir mensubu değil!",
"ftbteams.not_officer": "%s, %s grubunun bir yetkilisi değil!",
"ftbteams.not_invited": "Siz %s katılmaya davet edilmediniz!",
"ftbteams.name_too_short": "Takım adı çok kısa! (>=3 karakter olmalı)",
"ftbteams.server_permissions_prevent": "Sunucu izinleri bunu yapmanı engelliyor.",
"ftbteams.info.id": "Uzun Takım Kimliği: %s",
"ftbteams.info.short_id": "Kısa Takım Kimliği: %s",
"ftbteams.info.owner": "Sahip: %s",
"ftbteams.info.owner.none": "Yok",
"ftbteams.info.members": "Mensuplar:",
"ftbteams.info.members.none": "Mensup yok",
"ftbteams.list": "Tüm FTB Takımları: %s",
"ftbteams.property_not_found": "Mülk kimliği bulunamadı!",
"ftbteams.owner_cant_leave": "Ayrılmadan önce takımın sahipliğini devretmelisiniz!",
"ftbteams.cant_kick_owner": "Sahibi atamazsın!",
"ftbteams.party_api_only": "Bu mod paketinde doğrudan grup takımları oluşturamazsınız!",
"ftbteams.api_override": "Bu mod paketinde sadece envanterdeki 'Takımım' butonundan grup oluşturabilirsiniz!",
"ftbteams.missing_data": "Takım verileri sunucudan alınamadı!\nFTB Takımları düzgün çalışmayacak.\nHatalar için sunucu günlüğünü kontrol edin ve sunucunuzun çevrimiçi modda olduğundan emin olun.",

"sidebar_button.ftbteams.my_team": "Takımım",

"ftbteamsconfig": "Takım Özellikleri",
"ftbteamsconfig.ftbteams": "Temel Takım Özellikleri",
"ftbteamsconfig.ftbteams.display_name": "Görünen Ad",
"ftbteamsconfig.ftbteams.description": "Açıklama",
"ftbteamsconfig.ftbteams.color": "Renk",
"ftbteamsconfig.ftbteams.free_to_join": "Katılmak Serbest",
"ftbteamsconfig.ftbteams.max_msg_history_size": "Mesaj Geçmişi Maksimum Boyutu",
"ftbteams.privacy_mode.allies": "Müttefikler",
"ftbteams.privacy_mode.private": "Özel",
"ftbteams.privacy_mode.public": "Herkese Açık",
"ftbteams.create_party": "Grup Oluştur",
"ftbteams.create_party.info": "Mensupları davet etmek ve birlikte ilerlemek için bir Grup takımı oluştur",
"ftbteams.gui.kick": "%s At",
"ftbteams.gui.kick.confirm": "%s adlı oyuncuyu atmak istiyor musun?",
"ftbteams.gui.promote": "%s Terfi Et",
"ftbteams.gui.promote.confirm": "%s adlı oyuncuyu terfi ettirmek istiyor musun?",
"ftbteams.gui.demote": "%s Rütbesini İndir",
"ftbteams.gui.demote.confirm": "%s adlı oyuncunun rütbesini düşürmek istiyor musun?",
"ftbteams.gui.leave": "Gruptan Ayrıl",
"ftbteams.gui.leave.confirm": "Gruptan ayrılmak istiyor musun?",
"ftbteams.gui.disband": "Grubu Dağıt",
"ftbteams.gui.disband.confirm": "Grubu dağıtmak istiyor musun?",
"ftbteams.gui.transfer_ownership": "%s Grup Sahibi Yap",
"ftbteams.gui.transfer_ownership.confirm": "Grup sahibini %s yapmak istiyor musun?",
"ftbteams.gui.party_name": "Grup Adı",
"ftbteams.gui.party_description": "Açıklama",
"ftbteams.gui.create_party": "Açıklama",
"ftbteams.gui.add_members": "Mensup Ekle",
"ftbteams.gui.invite": "Oyuncu(ları) Davet Et",
"ftbteams.gui.manage_allies": "Müttefikleri Yönet",
"ftbteams.gui.no_players": "Müsait oyuncu yok",
"ftbteams.gui.send_invite": "Davet Et",
"ftbteams.gui.add_ally": "Müttefik",
"ftbteams.gui.remove_ally": "%s ile Müteffikliğini Bitir",
"ftbteams.gui.remove_ally.confirm": "%s grubunu müttefiklikten çıkarmak istiyor musunuz?",
"ftbteams.ranks.enemy": "Düşman",
"ftbteams.ranks.none": "Hiçbiri",
"ftbteams.ranks.ally": "Müttefik",
"ftbteams.ranks.invited": "Davet Edildi",
"ftbteams.ranks.member": "Mensup",
"ftbteams.ranks.officer": "Yetkili",
"ftbteams.ranks.owner": "Sahip",
"ftbteams.team_type.player": "Oyuncu Takımı",
"ftbteams.team_type.party": "Grup Takımı",
"ftbteams.team_type.server": "Sunucu Takımı",

"key.ftbteams.open_gui": "Ekipler GUI'sini Aç",
"key.categories.ftbteams": "FTB Takımları",

"ftbteams.message.invited": "%s davet edildi",
"ftbteams.message.invite_sent": "%s sizi grubuna katılmanız için davet etti!",
"ftbteams.message.joined": "%s grubunuza katıldı!",
"ftbteams.message.declined": "Daveti reddettin",
"ftbteams.message.kicked": "%s, %s atıldı!",
"ftbteams.message.promoted": "%s adlı oyuncu Yetkili rütbesine terfi ettirildi!",
"ftbteams.message.demoted": "%s adlı oyuncunun rütbesi Mensup'luğa düşürüldü!",
"ftbteams.message.transfer_owner": "Sahiplik %s adlı oyuncuya devredildi!",
"ftbteams.message.left_party": "Oyuncu %s grubunuzdan ayrıldı!",
"ftbteams.message.add_ally": "Oyuncu %s artık takımınızın bir müttefiki!",
"ftbteams.message.now_allied": "Artık '%s' ile müttefikisiniz!",
"ftbteams.message.remove_ally": "Oyuncu %s artık takımınızın bir müttefiki değil!",
"ftbteams.message.no_longer_allied": "Artık '%s' ile müttefik değilsiniz!",
"ftbteams.message.created_server_team": "Yeni sunucu takımı '%s' oluşturuldu!",
"ftbteams.message.deleted_server_team": "Sunucu takımı '%s' silindi!",
"ftbteams.message.team_disbanded": "Zorla dağıtılan parti ekibi '%s' (%s) !",
"ftbteams.accept": "Kabul et ✔",
"ftbteams.decline": "Reddet ✘"
}
Binary file modified common/src/main/resources/assets/ftbteams/textures/accept.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

Binary file modified common/src/main/resources/assets/ftbteams/textures/add.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified common/src/main/resources/assets/ftbteams/textures/cancel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

Binary file modified common/src/main/resources/assets/ftbteams/textures/chat.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

Binary file modified common/src/main/resources/assets/ftbteams/textures/members.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

Binary file modified common/src/main/resources/assets/ftbteams/textures/settings.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

Binary file modified common/src/main/resources/assets/ftbteams/textures/teams.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ maven_group=dev.ftb.mods
readable_name=FTB Teams
mod_author=FTB Team

mod_version=2101.1.0
mod_version=2101.1.1
minecraft_version=1.21.1

# Deps
Expand Down

0 comments on commit 2f5a725

Please sign in to comment.