Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
# Conflicts:
#	gradle.properties
  • Loading branch information
Lortseam committed Dec 29, 2023
2 parents 39c2b13 + 4500e47 commit 0e51c27
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
14 changes: 7 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@ shadow_version=8.1.1

# Fabric Properties
# https://fabricmc.net/develop/
minecraft_version=1.20.3
yarn_mappings=1.20.3+build.1
loader_version=0.15.0
minecraft_version=1.20.4
yarn_mappings=1.20.4+build.3
loader_version=0.15.3

# Mod Properties
mod_version=2.5.2
mod_version=2.5.3
maven_group=com.github.Lortseam.completeconfig
archives_base_name=completeconfig

# Dependencies
cloth_config_version=12.0.111
cloth_config_version=13.0.121
configurate_version=4.1.2
junit_version=5.8.2
mockito_version=4.5.1
jimfs_version=1.2
modmenu_version=9.0.0-pre.1
modmenu_version=9.0.0
jetbrains_annotations_version=23.0.0
cloth_basic_math_version=0.6.1
yacl_version=3.3.0-beta.1+1.20.3
yacl_version=3.3.1+1.20.4
3 changes: 3 additions & 0 deletions src/main/resources/assets/completeconfig/lang/tt_ru.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"modmenu.descriptionTranslation.completeconfig": "Көйләүләр китапханәсе"
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"config.completeconfig-test-mod.dataTypes.anEnum.foo": "Foo",
"config.completeconfig-test-mod.dataTypes.anEnum.bar": "Bar",
"config.completeconfig-test-mod.dataTypes.anEnum.baz": "Baz",
"config.completeconfig-test-mod.dataTypes.enumDropdown": "Enum",
"config.completeconfig-test-mod.dataTypes.enumDropdown": "Enum (Dropdown)",
"config.completeconfig-test-mod.dataTypes.enumDropdown.foo": "Foo",
"config.completeconfig-test-mod.dataTypes.enumDropdown.bar": "Bar",
"config.completeconfig-test-mod.dataTypes.enumDropdown.baz": "Baz",
Expand Down

0 comments on commit 0e51c27

Please sign in to comment.