From 289c653574562d7260790d321869ed5ecc6420ae Mon Sep 17 00:00:00 2001
From: Summet <55251897+Summet-V@users.noreply.github.com>
Date: Mon, 11 May 2020 04:35:25 +0300
Subject: [PATCH 1/3] Gradle shortcut (#2027)

---
 tests/build.gradle | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/tests/build.gradle b/tests/build.gradle
index 14b7dccb41..b501c8de32 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -2,10 +2,4 @@ apply plugin: "java"
 
 sourceCompatibility = 1.8
 
-sourceSets{
-    test{
-        resources{
-            srcDir "src/test/resources"
-        }
-    }
-}
+sourceSets.test.resources.srcDir = "src/test/resources"

From 1514f9f7ecd992c03ebc20a31ea0226541d5af26 Mon Sep 17 00:00:00 2001
From: Lapis <45414333+Lapis256@users.noreply.github.com>
Date: Mon, 11 May 2020 11:48:14 +0900
Subject: [PATCH 2/3] Update bundle_ja.properties (#2026)

* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* removed experimental tag

* Small fix

* fix typo

* bundle_ja.properties
---
 core/assets/bundles/bundle_ja.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties
index 59f9e576d8..cb78be37b8 100644
--- a/core/assets/bundles/bundle_ja.properties
+++ b/core/assets/bundles/bundle_ja.properties
@@ -678,6 +678,7 @@ setting.pixelate.name = ピクセル化[lightgray] (アニメーションが無
 setting.minimap.name = ミニマップを表示
 setting.position.name = プレイヤーの位置表示
 setting.musicvol.name = 音楽 音量
+setting.atmosphere.name = 惑星の雰囲気を表示
 setting.ambientvol.name = 環境音 音量
 setting.mutemusic.name = 音楽をミュート
 setting.sfxvol.name = 効果音 音量
@@ -1233,3 +1234,4 @@ block.crawler-factory.description = 高速の自爆型ユニットを製造し
 block.titan-factory.description = 高度な武装地上ユニットを製造します。
 block.fortress-factory.description = 地上重砲ユニットを製造します。
 block.repair-point.description = 近くの負傷したユニットを修復します。
+

From a5b235d829a4f2f707f0be45df370f43dc5b3fed Mon Sep 17 00:00:00 2001
From: TheMainOne <50847364+TheEvilSkeleton@users.noreply.github.com>
Date: Sun, 10 May 2020 22:56:24 -0400
Subject: [PATCH 3/3] Fixed "Restart required" (#2025)

---
 core/assets/bundles/bundle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index f49ffc9852..622c2fbc97 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -650,7 +650,7 @@ setting.touchscreen.name = Touchscreen Controls
 setting.fpscap.name = Max FPS
 setting.fpscap.none = None
 setting.fpscap.text = {0} FPS
-setting.uiscale.name = UI Scaling[lightgray] (require restart)[]
+setting.uiscale.name = UI Scaling[lightgray] (restart required)[]
 setting.swapdiagonal.name = Always Diagonal Placement
 setting.difficulty.training = Training
 setting.difficulty.easy = Easy
@@ -670,7 +670,7 @@ setting.seconds = {0} seconds
 setting.blockselecttimeout.name = Block Select Timeout
 setting.milliseconds = {0} milliseconds
 setting.fullscreen.name = Fullscreen
-setting.borderlesswindow.name = Borderless Window[lightgray] (may require restart)
+setting.borderlesswindow.name = Borderless Window[lightgray] (restart may be required)
 setting.fps.name = Show FPS & Ping
 setting.blockselectkeys.name = Show Block Select Keys
 setting.vsync.name = VSync